Merge "Fix switching running/cached apps with memory bar"
diff --git a/Android.mk b/Android.mk
index 9c9a23a..8b6532c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,18 +1,23 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_JAVA_LIBRARIES := bouncycastle telephony-common
-LOCAL_STATIC_JAVA_LIBRARIES := guava android-support-v4
+LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt telephony-common
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := \
+        $(call all-java-files-under, src) \
+        src/com/android/settings/EventLogTags.logtags
 
 LOCAL_PACKAGE_NAME := Settings
 LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := true
 
 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 cf1f888..b730ba7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <original-package android:name="com.android.settings" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
     <uses-permission android:name="android.permission.DEVICE_POWER" />
@@ -14,6 +15,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_PRIVILEGED" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.HARDWARE_TEST" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
@@ -28,6 +30,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" />
@@ -55,13 +58,23 @@
     <uses-permission android:name="android.permission.MANAGE_USB" />
     <uses-permission android:name="android.permission.SET_POINTER_SPEED" />
     <uses-permission android:name="android.permission.SET_KEYBOARD_LAYOUT" />
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
+    <uses-permission android:name="android.permission.COPY_PROTECTED_DATA" />
+    <uses-permission android:name="android.permission.MANAGE_USERS" />
+    <uses-permission android:name="android.permission.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" />
+    <uses-permission android:name="android.permission.REBOOT" />
+    <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
 
     <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:theme="@style/Theme.Settings"
+            android:hardwareAccelerated="true"
+            android:requiredForAllUsers="true"
+            android:supportsRtl="true">
 
         <!-- Settings -->
 
@@ -93,6 +106,7 @@
         <!-- Wireless Controls -->
 
         <activity android:name="Settings$WirelessSettingsActivity"
+                android:taskAffinity="com.android.settings"
                 android:label="@string/wireless_networks_settings_title"
                 android:parentActivityName="Settings">
             <intent-filter>
@@ -113,10 +127,11 @@
         <!-- Top-level settings -->
 
         <activity android:name="Settings$WifiSettingsActivity"
+                android:uiOptions="splitActionBarWhenNarrow"
+                android:taskAffinity=""
                 android:label="@string/wifi_settings"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true"
-                android:parentActivityName="Settings">
+                android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.WIFI_SETTINGS" />
@@ -132,11 +147,12 @@
 
         <!-- 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"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:exported="true"
-                android:clearTaskOnLaunch="true">
+                android:exported="true">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.wifi.WifiSettings" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
@@ -144,8 +160,9 @@
         </activity-alias>
 
         <activity android:name=".wifi.WifiPickerActivity"
-                android:parentActivityName="Settings"
-                android:clearTaskOnLaunch="true">
+                android:uiOptions="splitActionBarWhenNarrow"
+                android:taskAffinity="com.android.settings"
+                android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
@@ -154,10 +171,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/SetupWizardWifiTheme"
+                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" />
@@ -166,16 +184,17 @@
         </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"
                 android:label="@string/wifi_advanced_settings_label"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true"
                 android:parentActivityName="Settings$WifiSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -195,6 +214,7 @@
 
         <activity android:name=".wifi.WifiInfo"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$WifiSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -205,6 +225,7 @@
 
         <activity android:name=".wifi.WifiConfigInfo"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$WifiSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -241,10 +262,11 @@
             </intent-filter>
         </activity-alias>
 
-        <activity android:name="ApnSettings" android:label="@string/apn_settings"
-                  android:configChanges="orientation|keyboardHidden|screenSize"
-                  android:launchMode="singleTask"
-                  android:parentActivityName="Settings$WirelessSettingsActivity">
+        <activity android:name="ApnSettings"
+                android:label="@string/apn_settings"
+                android:configChanges="orientation|keyboardHidden|screenSize"
+                android:launchMode="singleTask"
+                android:parentActivityName="Settings$WirelessSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.APN_SETTINGS" />
@@ -254,9 +276,10 @@
         </activity>
 
         <activity android:name="Settings$BluetoothSettingsActivity"
+                android:uiOptions="splitActionBarWhenNarrow"
                 android:label="@string/bluetooth_settings_title"
-                android:clearTaskOnLaunch="true"
-                android:parentActivityName="Settings">
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.BLUETOOTH_SETTINGS" />
@@ -272,6 +295,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"
@@ -283,10 +307,10 @@
         </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"
-                android:parentActivityName="Settings">
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.bluetooth.devicepicker.action.LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -295,8 +319,8 @@
 
         <activity android:name="Settings$TetherSettingsActivity"
                 android:label="@string/tether_settings_title_all"
-                android:clearTaskOnLaunch="true"
-                android:parentActivityName="Settings$WirelessSettingsActivity">
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -330,7 +354,8 @@
         </activity-alias>
 
         <activity android:name="Settings$WifiP2pSettingsActivity"
-                android:clearTaskOnLaunch="true"
+                android:uiOptions="splitActionBarWhenNarrow"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$WifiSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -350,8 +375,8 @@
 
         <activity android:name="Settings$VpnSettingsActivity"
                 android:label="@string/vpn_settings_title"
-                android:clearTaskOnLaunch="true"
-                android:parentActivityName="Settings$WirelessSettingsActivity">
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.net.vpn.SETTINGS" />
@@ -371,10 +396,12 @@
 
         <activity android:name="Settings$DateTimeSettingsActivity"
                 android:label="@string/date_and_time"
-                android:parentActivityName="Settings">
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.DATE_SETTINGS" />
+                <action android:name="android.intent.action.QUICK_CLOCK" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -395,7 +422,7 @@
 
         <activity android:name="Settings$LocalePickerActivity"
                 android:label="@string/language_picker_title"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -411,7 +438,7 @@
 
         <activity android:name="Settings$InputMethodAndLanguageSettingsActivity"
                 android:label="@string/language_keyboard_settings_title"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -452,7 +479,7 @@
 
         <activity android:name="Settings$SpellCheckersSettingsActivity"
                 android:label="@string/spellcheckers_settings_title"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -488,9 +515,8 @@
         </receiver>
 
         <activity android:name="Settings$UserDictionarySettingsActivity"
-                android:label="@string/user_dict_settings_titlebar"
-                android:clearTaskOnLaunch="true"
-                android:uiOptions="none"
+                android:label="@string/user_dict_settings_title"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -499,7 +525,7 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.UserDictionarySettings" />
+                android:value="com.android.settings.inputmethod.UserDictionaryList" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/language_settings" />
             <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
@@ -509,7 +535,7 @@
         </activity>
 
         <activity android:name=".inputmethod.UserDictionaryAddWordActivity"
-                  android:label="@string/user_dict_settings_titlebar"
+                  android:label="@string/user_dict_settings_title"
                   android:theme="@android:style/Theme.Holo.Dialog.NoActionBar"
                   android:windowSoftInputMode="stateVisible"
                   android:noHistory="true"
@@ -524,8 +550,7 @@
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="UserDictionarySettings"
-                android:label="@string/user_dict_settings_titlebar"
-                android:clearTaskOnLaunch="true"
+                android:label="@string/user_dict_settings_title"
                 android:exported="true"
                 android:targetActivity="Settings$UserDictionarySettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -540,8 +565,8 @@
 
         <activity android:name="Settings$SoundSettingsActivity"
                 android:label="@string/sound_settings"
-                android:clearTaskOnLaunch="true"
-                android:parentActivityName="Settings">
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.settings.SOUND_SETTINGS" />
@@ -559,7 +584,6 @@
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="SoundSettings"
                 android:label="@string/sound_settings"
-                android:clearTaskOnLaunch="true"
                 android:exported="true"
                 android:targetActivity="Settings$SoundSettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -570,8 +594,8 @@
 
         <activity android:name="Settings$DisplaySettingsActivity"
                 android:label="@string/display_settings"
-                android:clearTaskOnLaunch="true"
-                android:parentActivityName="Settings">
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.settings.DISPLAY_SETTINGS" />
@@ -589,7 +613,6 @@
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="DisplaySettings"
                 android:label="@string/display_settings"
-                android:clearTaskOnLaunch="true"
                 android:exported="true"
                 android:targetActivity="Settings$DisplaySettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -598,39 +621,10 @@
                 android:resource="@id/display_settings" />
         </activity-alias>
 
-        <activity android:name="Settings$DockSettingsActivity"
-                android:label="@string/dock_settings_title"
-                android:enabled="@bool/has_dock_settings"
-                android:clearTaskOnLaunch="true"
-                android:parentActivityName="Settings">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="com.android.settings.DOCK_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.VOICE_LAUNCH" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.DockSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/dock_settings" />
-        </activity>
-
-        <!-- Keep compatibility with old shortcuts. -->
-        <activity-alias android:name="DockSettings"
-                android:label="@string/dock_settings_title"
-                android:enabled="@bool/has_dock_settings"
-                android:clearTaskOnLaunch="true"
-                android:exported="true"
-                android:targetActivity="Settings$DockSettingsActivity">
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.DockSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                android:resource="@id/dock_settings" />
-        </activity-alias>
-
         <activity android:name="Settings$DeviceInfoSettingsActivity"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"
                 android:label="@string/device_info_settings"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -665,9 +659,8 @@
 
         <activity android:name="Settings$ManageApplicationsActivity"
                 android:label="@string/applications_settings"
-                android:clearTaskOnLaunch="true"
-                android:parentActivityName="Settings"
-                android:uiOptions="none">
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.APPLICATION_SETTINGS" />
@@ -686,7 +679,6 @@
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name=".applications.ManageApplications"
                 android:label="@string/applications_settings"
-                android:clearTaskOnLaunch="true"
                 android:exported="true"
                 android:targetActivity="Settings$ManageApplicationsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -698,7 +690,6 @@
         <!-- Keep compatibility with old shortcuts. Pre-gingerbread. -->
         <activity-alias android:name=".ManageApplications"
                   android:label="@string/manageapplications_settings_title"
-                  android:clearTaskOnLaunch="true"
                   android:exported="true"
                   android:targetActivity="Settings$ManageApplicationsActivity">
         </activity-alias>
@@ -707,7 +698,6 @@
              This is for compatibility with old shortcuts. -->
         <activity-alias android:name=".RunningServices"
                 android:label="@string/runningservices_settings_title"
-                android:clearTaskOnLaunch="true"
                 android:exported="true"
                 android:targetActivity="Settings$ManageApplicationsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -715,12 +705,11 @@
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/application_settings" />
         </activity-alias>
-        
+
         <!-- Provide direct entry into manage apps showing storage usage for apps.
              This is for compatibility with old shortcuts. -->
         <activity-alias android:name=".applications.StorageUse"
                 android:label="@string/storageuse_settings_title"
-                android:clearTaskOnLaunch="true"
                 android:exported="true"
                 android:targetActivity="Settings$ManageApplicationsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -735,6 +724,7 @@
         <activity android:name=".applications.InstalledAppDetailsTop"
                   android:label="@string/application_info_label"
                   android:exported="true"
+                  android:taskAffinity=""
                   android:parentActivityName="Settings$ManageApplicationsActivity">
         </activity>
 
@@ -750,9 +740,20 @@
             </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"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -769,6 +770,7 @@
         <!-- Provide direct entry into manage apps showing storage usage of apps. -->
         <activity android:name="Settings$StorageUseActivity"
                 android:label="@string/storageuse_settings_title"
+                android:taskAffinity=""
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -783,21 +785,54 @@
                 android:resource="@id/application_settings" />
         </activity>
 
-        <activity android:name="Settings$LocationSettingsActivity"
-                android:label="@string/location_settings_title"
-                android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true"
-                android:parentActivityName="Settings">
+        <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" />
-                <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
-                <action android:name="android.credentials.UNLOCK" />
+                <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"
+                android:enabled="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.APP_OPS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.LocationSettings" />
+                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:uiOptions="splitActionBarWhenNarrow"
+                android:label="@string/location_settings_title"
+                android:configChanges="orientation|keyboardHidden|screenSize"
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.location.LocationSettings" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/location_settings" />
         </activity>
@@ -805,7 +840,7 @@
         <activity android:name="Settings$SecuritySettingsActivity"
                 android:label="@string/security_settings_title"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity=""
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -820,11 +855,39 @@
                 android:resource="@id/security_settings" />
         </activity>
 
+        <activity android:name="MonitoringCertInfoActivity"
+                android:label="@string/ssl_ca_cert_dialog_title"
+                android:theme="@style/Transparent"
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="com.android.settings.MONITORING_CERT_INFO" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="Settings$TrustedCredentialsSettingsActivity"
+                android:label="@string/trusted_credentials"
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="com.android.settings.TRUSTED_CREDENTIALS" />
+                <action android:name="com.android.settings.TRUSTED_CREDENTIALS_USER" />
+                <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.TrustedCredentialsSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/security_settings" />
+        </activity>
+
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="SecuritySettings"
                 android:label="@string/security_settings_title"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true"
                 android:exported="true"
                 android:targetActivity="Settings$SecuritySettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -836,7 +899,7 @@
         <activity android:name="Settings$PrivacySettingsActivity"
                 android:label="@string/privacy_settings_title"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -870,7 +933,7 @@
 
         <activity android:name="Settings$DeviceAdminSettingsActivity"
                 android:label="@string/device_admin_settings_title"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$SecuritySettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -890,7 +953,6 @@
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="DeviceAdminSettings"
                 android:label="@string/device_admin_settings_title"
-                android:clearTaskOnLaunch="true"
                 android:exported="true"
                 android:targetActivity="Settings$DeviceAdminSettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -916,8 +978,7 @@
         <activity android:name="IccLockSettings"
                 android:label="@string/sim_lock_settings"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"
-                android:process="com.android.phone"
-                android:parentActivityName="Settings$SecuritySettingsActivity">
+                android:process="com.android.phone">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -928,8 +989,8 @@
         <activity android:name="Settings$AccessibilitySettingsActivity"
                 android:label="@string/accessibility_settings"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:clearTaskOnLaunch="true"
-                android:parentActivityName="Settings">
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.ACCESSIBILITY_SETTINGS" />
@@ -938,13 +999,29 @@
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.AccessibilitySettings" />
+                android:value="com.android.settings.accessibility.AccessibilitySettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/accessibility_settings" />
+        </activity>
+
+        <activity android:name="Settings$CaptioningSettingsActivity"
+                android:label="@string/accessibility_captioning_title"
+                android:taskAffinity="com.android.settings"
+                android:parentActivityName="Settings$AccessibilitySettingsActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.CAPTIONING_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.accessibility.ToggleCaptioningPreferenceFragment" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/accessibility_settings" />
         </activity>
 
         <activity android:name="Settings$TextToSpeechSettingsActivity"
                 android:label="@string/tts_settings"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -959,7 +1036,6 @@
 
         <!-- Second and third-level settings -->
 
-
         <!-- Lock screen settings -->
         <activity android:name="ConfirmLockPattern"/>
 
@@ -975,19 +1051,21 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="ChooseLockGeneric$InternalActivity" android:exported="false"
+            android:label="@string/lockpassword_choose_lock_generic_header"
+            android:excludeFromRecents="true"
+        />
+
         <activity android:name="ChooseLockPattern" android:exported="false"/>
 
         <activity android:name="ChooseLockPassword" android:exported="false"
             android:windowSoftInputMode="stateVisible|adjustResize"/>
 
-        <activity android:name="ChooseLockPatternTutorial" android:exported="false"/>
-
         <!-- Runs in the phone process since it needs access to the Phone object -->
         <activity android:name=".deviceinfo.Status"
                 android:label="@string/device_status_activity_title"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"
-                android:process="com.android.phone"
-                android:parentActivityName="Settings$DeviceInfoSettingsActivity">
+                android:process="com.android.phone">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -997,7 +1075,7 @@
 
         <activity android:name="Settings$StorageSettingsActivity"
                 android:label="@string/storage_settings_title"
-                android:uiOptions="none"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1016,8 +1094,7 @@
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
 
         <activity android:name="ApnEditor"
-                android:label="@string/apn_edit"
-                android:theme="@android:style/Theme.Holo.DialogWhenLarge">
+                android:label="@string/apn_edit">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.EDIT" />
@@ -1058,7 +1135,7 @@
 
         <activity android:name="Settings$DevelopmentSettingsActivity"
                 android:label="@string/development_settings_title"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1072,9 +1149,39 @@
                 android:resource="@id/development_settings" />
         </activity>
 
+        <activity android:name="Settings$PrintSettingsActivity"
+                android:label="@string/print_settings"
+                android:taskAffinity="com.android.settings"
+                android:parentActivityName="Settings">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.ACTION_PRINT_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.print.PrintSettingsFragment" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/print_settings" />
+        </activity>
+
+        <activity android:name="Settings$PrintJobSettingsActivity"
+                android:label="@string/print_print_job"
+                android:taskAffinity="com.android.settings"
+                android:parentActivityName="Settings$PrintSettingsActivity">
+            <intent-filter>
+                <action android:name="android.settings.ACTION_PRINT_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="printjob" android:pathPattern="*" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.print.PrintJobSettingsFragment" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/print_settings" />
+        </activity>
+
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="DevelopmentSettings"
-                  android:clearTaskOnLaunch="true"
                   android:exported="true"
                   android:label="@string/development_settings_title"
                   android:targetActivity="Settings$DevelopmentSettingsActivity">
@@ -1089,7 +1196,7 @@
 
         <activity android:name="Settings$UsbSettingsActivity"
                 android:label="@string/storage_title_usb"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$StorageSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1109,7 +1216,6 @@
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="UsbSettings"
-                  android:clearTaskOnLaunch="true"
                   android:exported="true"
                   android:label="@string/storage_title_usb"
                   android:targetActivity="Settings$DevelopmentSettingsActivity">
@@ -1169,6 +1275,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"
@@ -1205,7 +1320,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" />
@@ -1216,7 +1331,7 @@
         <!-- NFC settings -->
         <activity android:name="Settings$AndroidBeamSettingsActivity"
                 android:label="@string/android_beam_settings_title"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$WirelessSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1227,7 +1342,19 @@
                 android:value="com.android.settings.nfc.AndroidBeam" />
         </activity>
 
-
+        <activity android:name="Settings$WifiDisplaySettingsActivity"
+                android:uiOptions="splitActionBarWhenNarrow"
+                android:label="@string/wifi_display_settings_title"
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.WIFI_DISPLAY_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.wfd.WifiDisplaySettings" />
+        </activity>
 
 
         <!-- Development settings -->
@@ -1247,6 +1374,7 @@
         </receiver>
 
         <activity android:name="BatteryInfo" android:label="@string/battery_info_label"
+                  android:taskAffinity="com.android.settings"
                   android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1257,6 +1385,7 @@
 
         <activity android:name="Display" android:label="@string/display_label"
                 android:configChanges="fontScale"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1329,7 +1458,20 @@
             </intent-filter>
         </activity>
 
+        <!-- Special picker for keyguard widgets -->
+        <activity android:name="KeyguardAppWidgetPickActivity"
+                android:label="@string/widget_picker_title"
+                android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar"
+                android:permission="android.permission.BIND_KEYGUARD_APPWIDGET"
+                android:finishOnCloseSystemDialogs="true">
+            <intent-filter>
+                <action android:name="android.appwidget.action.KEYGUARD_APPWIDGET_PICK" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="UsageStats" android:label="@string/usage_stats_label"
+                  android:taskAffinity="com.android.settings"
                   android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1339,8 +1481,8 @@
 
         <activity android:name="Settings$PowerUsageSummaryActivity"
                 android:label="@string/power_usage_summary_title"
-                android:uiOptions="none"
-                android:parentActivityName="Settings">
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
@@ -1366,8 +1508,8 @@
 
         <activity android:name="Settings$AccountSyncSettingsActivity"
             android:label="@string/account_sync_settings_title"
-            android:parentActivityName="Settings"
-            android:uiOptions="none">
+            android:taskAffinity=""
+            android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" />
@@ -1393,6 +1535,7 @@
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/header_add_an_account"
+            android:taskAffinity="com.android.settings"
             android:parentActivityName="Settings$ManageAccountsSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1448,8 +1591,8 @@
 
         <activity android:name="Settings$DataUsageSummaryActivity"
                 android:label="@string/data_usage_summary_title"
-                android:uiOptions="none"
-                android:parentActivityName="Settings">
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1461,6 +1604,100 @@
                 android:resource="@id/wireless_settings" />
         </activity>
 
+        <activity android:name="Settings$DreamSettingsActivity"
+                android:uiOptions="splitActionBarWhenNarrow"
+                android:label="@string/screensaver_settings_title"
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.DREAM_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.DreamSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                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$PaymentSettingsActivity"
+                android:uiOptions="splitActionBarWhenNarrow"
+                android:label="@string/nfc_payment_settings_title"
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.NFC_PAYMENT_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.nfc.PaymentSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/nfc_payment_settings" />
+        </activity>
+        <activity android:name=".nfc.PaymentDefaultDialog"
+                  android:label="@string/nfc_payment_set_default_label"
+                  android:excludeFromRecents="true"
+                  android:theme="@*android:style/Theme.Holo.Light.Dialog.Alert">
+            <intent-filter>
+                <action android:name="android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".SmsDefaultDialog"
+                  android:label="@string/sms_application_title"
+                  android:excludeFromRecents="true"
+                  android:theme="@*android:style/Theme.Holo.Light.Dialog.Alert">
+            <intent-filter>
+                <action android:name="android.provider.Telephony.ACTION_CHANGE_DEFAULT" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </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="false"
@@ -1472,11 +1709,33 @@
                 <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
                 <action android:name="android.net.conn.BACKGROUND_DATA_SETTING_CHANGED" />
                 <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
-                <action android:name="android.location.PROVIDERS_CHANGED" />
+                <action android:name="android.location.MODE_CHANGED" />
                 <action android:name="com.android.sync.SYNC_CONN_STATUS_CHANGED" />
             </intent-filter>
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />
         </receiver>
 
+        <receiver android:name=".bluetooth.BluetoothDiscoverableTimeoutReceiver">
+            <intent-filter>
+                <action android:name="android.bluetooth.intent.DISCOVERABLE_TIMEOUT" />
+            </intent-filter>
+        </receiver>
+
+        <!-- Watch for ContactsContract.Profile changes and update the user's photo.  -->
+        <receiver android:name=".users.ProfileUpdateReceiver">
+            <intent-filter>
+                <action android:name="android.provider.Contacts.PROFILE_CHANGED" />
+            </intent-filter>
+        </receiver>
+
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="com.android.settings.files"
+            android:grantUriPermissions="true"
+            android:exported="false">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
     </application>
 </manifest>
diff --git a/proguard.flags b/proguard.flags
index 0805d68..211a5a4 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -12,6 +12,8 @@
 -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 class com.android.settings.nfc.*
 
 # Keep click responders
 -keepclassmembers class com.android.settings.inputmethod.UserDictionaryAddWordActivity {
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png
index 470f5c0..de40bd0 100644
--- a/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png
+++ b/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png
index e3aa8db..73ebdb8 100644
--- a/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png
+++ b/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png
index 9e27d2f..e1d6138 100644
--- a/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png
+++ b/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_item_bg_normal.9.png b/res/drawable-hdpi/appwidget_item_bg_normal.9.png
new file mode 100644
index 0000000..36552d4
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_item_bg_normal.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_item_bg_pressed.9.png b/res/drawable-hdpi/appwidget_item_bg_pressed.9.png
new file mode 100644
index 0000000..785dbaa
--- /dev/null
+++ b/res/drawable-hdpi/appwidget_item_bg_pressed.9.png
Binary files differ
diff --git a/res/drawable-hdpi/avatar_default_1.png b/res/drawable-hdpi/avatar_default_1.png
new file mode 100644
index 0000000..39ffd73
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_1.png
Binary files differ
diff --git a/res/drawable-hdpi/avatar_default_2.png b/res/drawable-hdpi/avatar_default_2.png
new file mode 100644
index 0000000..79203c5
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_2.png
Binary files differ
diff --git a/res/drawable-hdpi/avatar_default_3.png b/res/drawable-hdpi/avatar_default_3.png
new file mode 100644
index 0000000..4d179b3
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_3.png
Binary files differ
diff --git a/res/drawable-hdpi/avatar_default_4.png b/res/drawable-hdpi/avatar_default_4.png
new file mode 100644
index 0000000..1a0332f
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_4.png
Binary files differ
diff --git a/res/drawable-hdpi/avatar_default_5.png b/res/drawable-hdpi/avatar_default_5.png
new file mode 100644
index 0000000..2487e66
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_5.png
Binary files differ
diff --git a/res/drawable-hdpi/avatar_default_6.png b/res/drawable-hdpi/avatar_default_6.png
new file mode 100644
index 0000000..f57e1eb
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_6.png
Binary files differ
diff --git a/res/drawable-hdpi/avatar_default_7.png b/res/drawable-hdpi/avatar_default_7.png
new file mode 100644
index 0000000..dc4b2ce
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_7.png
Binary files differ
diff --git a/res/drawable-hdpi/avatar_default_8.png b/res/drawable-hdpi/avatar_default_8.png
new file mode 100644
index 0000000..64e7936
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_8.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_gps_off_holo.png b/res/drawable-hdpi/ic_appwidget_settings_gps_off_holo.png
deleted file mode 100644
index cd3c61e..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_gps_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_gps_on_holo.png b/res/drawable-hdpi/ic_appwidget_settings_gps_on_holo.png
deleted file mode 100644
index 5138b70..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_gps_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_location_off_holo.png b/res/drawable-hdpi/ic_appwidget_settings_location_off_holo.png
new file mode 100644
index 0000000..831c87a
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_location_off_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_location_on_holo.png b/res/drawable-hdpi/ic_appwidget_settings_location_on_holo.png
new file mode 100644
index 0000000..5ece231
--- /dev/null
+++ b/res/drawable-hdpi/ic_appwidget_settings_location_on_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_grayedout_printer.png b/res/drawable-hdpi/ic_grayedout_printer.png
new file mode 100644
index 0000000..5e54970
--- /dev/null
+++ b/res/drawable-hdpi/ic_grayedout_printer.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_settings.png b/res/drawable-hdpi/ic_launcher_settings.png
deleted file mode 100644
index 32da776..0000000
--- a/res/drawable-hdpi/ic_launcher_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_add.png b/res/drawable-hdpi/ic_menu_add.png
deleted file mode 100644
index 4b68f52..0000000
--- a/res/drawable-hdpi/ic_menu_add.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_add_dark.png b/res/drawable-hdpi/ic_menu_add_dark.png
new file mode 100644
index 0000000..b45001e
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_add_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_add_light.png b/res/drawable-hdpi/ic_menu_add_light.png
new file mode 100644
index 0000000..91b0354
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_add_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_home.png b/res/drawable-hdpi/ic_settings_home.png
new file mode 100644
index 0000000..ce1a06c
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_home.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_location.png b/res/drawable-hdpi/ic_settings_location.png
index dcd0f4e..22d2dea 100644
--- a/res/drawable-hdpi/ic_settings_location.png
+++ b/res/drawable-hdpi/ic_settings_location.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_multiuser.png b/res/drawable-hdpi/ic_settings_multiuser.png
new file mode 100644
index 0000000..74af8ae0
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_multiuser.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_nfc_payment.png b/res/drawable-hdpi/ic_settings_nfc_payment.png
new file mode 100644
index 0000000..7b63e53
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_nfc_payment.png
Binary files differ
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-hdpi/ic_wifi_lock_signal_1.png b/res/drawable-hdpi/ic_wifi_lock_signal_1.png
deleted file mode 100644
index 60857b3..0000000
--- a/res/drawable-hdpi/ic_wifi_lock_signal_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png
new file mode 100644
index 0000000..2ec38ae
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png
new file mode 100644
index 0000000..8b0009b
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2.png b/res/drawable-hdpi/ic_wifi_lock_signal_2.png
deleted file mode 100644
index 5e1f118..0000000
--- a/res/drawable-hdpi/ic_wifi_lock_signal_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png
new file mode 100644
index 0000000..a3383a8
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png
new file mode 100644
index 0000000..b79d3e5
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3.png b/res/drawable-hdpi/ic_wifi_lock_signal_3.png
deleted file mode 100644
index 490bd58..0000000
--- a/res/drawable-hdpi/ic_wifi_lock_signal_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png
new file mode 100644
index 0000000..e2cb17e
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png
new file mode 100644
index 0000000..053c7af
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4.png b/res/drawable-hdpi/ic_wifi_lock_signal_4.png
deleted file mode 100644
index e5fa8d1..0000000
--- a/res/drawable-hdpi/ic_wifi_lock_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png
new file mode 100644
index 0000000..65b02dd
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png
new file mode 100644
index 0000000..0516bd4
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_1.png b/res/drawable-hdpi/ic_wifi_signal_1.png
deleted file mode 100644
index de9162b..0000000
--- a/res/drawable-hdpi/ic_wifi_signal_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_1_dark.png b/res/drawable-hdpi/ic_wifi_signal_1_dark.png
new file mode 100644
index 0000000..f3f0208
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_1_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_1_light.png b/res/drawable-hdpi/ic_wifi_signal_1_light.png
new file mode 100644
index 0000000..d9968b9
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_1_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_2.png b/res/drawable-hdpi/ic_wifi_signal_2.png
deleted file mode 100644
index 4c7559c..0000000
--- a/res/drawable-hdpi/ic_wifi_signal_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_2_dark.png b/res/drawable-hdpi/ic_wifi_signal_2_dark.png
new file mode 100644
index 0000000..9541c38
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_2_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_2_light.png b/res/drawable-hdpi/ic_wifi_signal_2_light.png
new file mode 100644
index 0000000..d3065de
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_2_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_3.png b/res/drawable-hdpi/ic_wifi_signal_3.png
deleted file mode 100644
index 2d76324..0000000
--- a/res/drawable-hdpi/ic_wifi_signal_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_3_dark.png b/res/drawable-hdpi/ic_wifi_signal_3_dark.png
new file mode 100644
index 0000000..be1ba37
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_3_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_3_light.png b/res/drawable-hdpi/ic_wifi_signal_3_light.png
new file mode 100644
index 0000000..4a6407f
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_3_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_4.png b/res/drawable-hdpi/ic_wifi_signal_4.png
deleted file mode 100644
index bd50fd7..0000000
--- a/res/drawable-hdpi/ic_wifi_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_4_dark.png b/res/drawable-hdpi/ic_wifi_signal_4_dark.png
new file mode 100644
index 0000000..3fed8e6
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_4_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_4_light.png b/res/drawable-hdpi/ic_wifi_signal_4_light.png
new file mode 100644
index 0000000..e52acd6
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_4_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wps.png b/res/drawable-hdpi/ic_wps.png
deleted file mode 100644
index 36c2a32..0000000
--- a/res/drawable-hdpi/ic_wps.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_wps_dark.png b/res/drawable-hdpi/ic_wps_dark.png
new file mode 100644
index 0000000..918b0cc
--- /dev/null
+++ b/res/drawable-hdpi/ic_wps_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wps_light.png b/res/drawable-hdpi/ic_wps_light.png
new file mode 100644
index 0000000..5ad9f3e
--- /dev/null
+++ b/res/drawable-hdpi/ic_wps_light.png
Binary files differ
diff --git a/res/drawable-hdpi/nfc_payment_empty_state.png b/res/drawable-hdpi/nfc_payment_empty_state.png
new file mode 100644
index 0000000..300a053
--- /dev/null
+++ b/res/drawable-hdpi/nfc_payment_empty_state.png
Binary files differ
diff --git a/res/drawable-hdpi/transparency.png b/res/drawable-hdpi/transparency.png
new file mode 100644
index 0000000..990c411
--- /dev/null
+++ b/res/drawable-hdpi/transparency.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/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/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/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/appwidget_inner_pressed_c_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png
index aa80a7c..79636c0 100644
--- a/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png
+++ b/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png
index e49e8a9..ac2c80a 100644
--- a/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png
+++ b/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png
index a54ecd0..87e21cc 100644
--- a/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png
+++ b/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_item_bg_normal.9.png b/res/drawable-mdpi/appwidget_item_bg_normal.9.png
new file mode 100644
index 0000000..08a94f5
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_item_bg_normal.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_item_bg_pressed.9.png b/res/drawable-mdpi/appwidget_item_bg_pressed.9.png
new file mode 100644
index 0000000..df1be8d
--- /dev/null
+++ b/res/drawable-mdpi/appwidget_item_bg_pressed.9.png
Binary files differ
diff --git a/res/drawable-mdpi/avatar_default_1.png b/res/drawable-mdpi/avatar_default_1.png
new file mode 100644
index 0000000..0d8e3a2
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_1.png
Binary files differ
diff --git a/res/drawable-mdpi/avatar_default_2.png b/res/drawable-mdpi/avatar_default_2.png
new file mode 100644
index 0000000..0cc4c3d
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_2.png
Binary files differ
diff --git a/res/drawable-mdpi/avatar_default_3.png b/res/drawable-mdpi/avatar_default_3.png
new file mode 100644
index 0000000..c43ad6f
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_3.png
Binary files differ
diff --git a/res/drawable-mdpi/avatar_default_4.png b/res/drawable-mdpi/avatar_default_4.png
new file mode 100644
index 0000000..6906489
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_4.png
Binary files differ
diff --git a/res/drawable-mdpi/avatar_default_5.png b/res/drawable-mdpi/avatar_default_5.png
new file mode 100644
index 0000000..857f277
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_5.png
Binary files differ
diff --git a/res/drawable-mdpi/avatar_default_6.png b/res/drawable-mdpi/avatar_default_6.png
new file mode 100644
index 0000000..9d0f968
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_6.png
Binary files differ
diff --git a/res/drawable-mdpi/avatar_default_7.png b/res/drawable-mdpi/avatar_default_7.png
new file mode 100644
index 0000000..7db8864
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_7.png
Binary files differ
diff --git a/res/drawable-mdpi/avatar_default_8.png b/res/drawable-mdpi/avatar_default_8.png
new file mode 100644
index 0000000..98d67d9
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_8.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_gps_off_holo.png b/res/drawable-mdpi/ic_appwidget_settings_gps_off_holo.png
deleted file mode 100644
index 6442720..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_gps_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_gps_on_holo.png b/res/drawable-mdpi/ic_appwidget_settings_gps_on_holo.png
deleted file mode 100644
index 9e98ad9..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_gps_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_location_off_holo.png b/res/drawable-mdpi/ic_appwidget_settings_location_off_holo.png
new file mode 100644
index 0000000..c590611
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_location_off_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_location_on_holo.png b/res/drawable-mdpi/ic_appwidget_settings_location_on_holo.png
new file mode 100644
index 0000000..dbdb9eb
--- /dev/null
+++ b/res/drawable-mdpi/ic_appwidget_settings_location_on_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_grayedout_printer.png b/res/drawable-mdpi/ic_grayedout_printer.png
new file mode 100644
index 0000000..5e54970
--- /dev/null
+++ b/res/drawable-mdpi/ic_grayedout_printer.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_settings.png b/res/drawable-mdpi/ic_launcher_settings.png
deleted file mode 100644
index 32a22ac..0000000
--- a/res/drawable-mdpi/ic_launcher_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_add.png b/res/drawable-mdpi/ic_menu_add.png
deleted file mode 100644
index 15ffadd..0000000
--- a/res/drawable-mdpi/ic_menu_add.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_add_dark.png b/res/drawable-mdpi/ic_menu_add_dark.png
new file mode 100644
index 0000000..e6add2b
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_add_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_add_light.png b/res/drawable-mdpi/ic_menu_add_light.png
new file mode 100644
index 0000000..8b55810
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_add_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_home.png b/res/drawable-mdpi/ic_settings_home.png
new file mode 100644
index 0000000..05b5e4d
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_home.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_location.png b/res/drawable-mdpi/ic_settings_location.png
index 07b9f27..3e16033 100644
--- a/res/drawable-mdpi/ic_settings_location.png
+++ b/res/drawable-mdpi/ic_settings_location.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_multiuser.png b/res/drawable-mdpi/ic_settings_multiuser.png
new file mode 100644
index 0000000..758c9ec
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_multiuser.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_nfc_payment.png b/res/drawable-mdpi/ic_settings_nfc_payment.png
new file mode 100644
index 0000000..c3101bc
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_nfc_payment.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-mdpi/ic_wifi_lock_signal_1.png b/res/drawable-mdpi/ic_wifi_lock_signal_1.png
deleted file mode 100644
index e8ac823..0000000
--- a/res/drawable-mdpi/ic_wifi_lock_signal_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png
new file mode 100644
index 0000000..d6868aa
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png
new file mode 100644
index 0000000..eb41a10
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2.png b/res/drawable-mdpi/ic_wifi_lock_signal_2.png
deleted file mode 100644
index 6034a89..0000000
--- a/res/drawable-mdpi/ic_wifi_lock_signal_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png
new file mode 100644
index 0000000..ada9739
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png
new file mode 100644
index 0000000..ff041c4
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3.png b/res/drawable-mdpi/ic_wifi_lock_signal_3.png
deleted file mode 100644
index 0089a55..0000000
--- a/res/drawable-mdpi/ic_wifi_lock_signal_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png
new file mode 100644
index 0000000..0a294ff
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png
new file mode 100644
index 0000000..98cf1ff
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4.png b/res/drawable-mdpi/ic_wifi_lock_signal_4.png
deleted file mode 100644
index ae02f24..0000000
--- a/res/drawable-mdpi/ic_wifi_lock_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png
new file mode 100644
index 0000000..ccda2c7
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png
new file mode 100644
index 0000000..83af4de
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_1.png b/res/drawable-mdpi/ic_wifi_signal_1.png
deleted file mode 100644
index e99a47d..0000000
--- a/res/drawable-mdpi/ic_wifi_signal_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_1_dark.png b/res/drawable-mdpi/ic_wifi_signal_1_dark.png
new file mode 100644
index 0000000..6715c5d
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_1_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_1_light.png b/res/drawable-mdpi/ic_wifi_signal_1_light.png
new file mode 100644
index 0000000..eec60c0
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_1_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_2.png b/res/drawable-mdpi/ic_wifi_signal_2.png
deleted file mode 100644
index 79516ea..0000000
--- a/res/drawable-mdpi/ic_wifi_signal_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_2_dark.png b/res/drawable-mdpi/ic_wifi_signal_2_dark.png
new file mode 100644
index 0000000..e31d19f
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_2_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_2_light.png b/res/drawable-mdpi/ic_wifi_signal_2_light.png
new file mode 100644
index 0000000..7caa144
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_2_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_3.png b/res/drawable-mdpi/ic_wifi_signal_3.png
deleted file mode 100644
index f2af11d..0000000
--- a/res/drawable-mdpi/ic_wifi_signal_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_3_dark.png b/res/drawable-mdpi/ic_wifi_signal_3_dark.png
new file mode 100644
index 0000000..bd6a1e8
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_3_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_3_light.png b/res/drawable-mdpi/ic_wifi_signal_3_light.png
new file mode 100644
index 0000000..7be2515
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_3_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_4.png b/res/drawable-mdpi/ic_wifi_signal_4.png
deleted file mode 100644
index 3d4288e..0000000
--- a/res/drawable-mdpi/ic_wifi_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_4_dark.png b/res/drawable-mdpi/ic_wifi_signal_4_dark.png
new file mode 100644
index 0000000..af125c2
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_4_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_4_light.png b/res/drawable-mdpi/ic_wifi_signal_4_light.png
new file mode 100644
index 0000000..658761a
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_4_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wps.png b/res/drawable-mdpi/ic_wps.png
deleted file mode 100644
index e522e97..0000000
--- a/res/drawable-mdpi/ic_wps.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_wps_dark.png b/res/drawable-mdpi/ic_wps_dark.png
new file mode 100644
index 0000000..77d73a8
--- /dev/null
+++ b/res/drawable-mdpi/ic_wps_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wps_light.png b/res/drawable-mdpi/ic_wps_light.png
new file mode 100644
index 0000000..ef560fa
--- /dev/null
+++ b/res/drawable-mdpi/ic_wps_light.png
Binary files differ
diff --git a/res/drawable-mdpi/nfc_payment_empty_state.png b/res/drawable-mdpi/nfc_payment_empty_state.png
new file mode 100644
index 0000000..28a1e31
--- /dev/null
+++ b/res/drawable-mdpi/nfc_payment_empty_state.png
Binary files differ
diff --git a/res/drawable-mdpi/transparency.png b/res/drawable-mdpi/transparency.png
new file mode 100644
index 0000000..a915df3
--- /dev/null
+++ b/res/drawable-mdpi/transparency.png
Binary files differ
diff --git a/res/drawable-nodpi/caption_background.jpg b/res/drawable-nodpi/caption_background.jpg
new file mode 100644
index 0000000..0c5503a
--- /dev/null
+++ b/res/drawable-nodpi/caption_background.jpg
Binary files differ
diff --git a/res/drawable-nodpi/preview.png b/res/drawable-nodpi/preview.png
index 10a7c90..d06adc1 100644
--- a/res/drawable-nodpi/preview.png
+++ b/res/drawable-nodpi/preview.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png
index defdbb9..45d9301 100644
--- a/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png
+++ b/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png
index 582d0e1..35ae2c8 100644
--- a/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png
+++ b/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png
index 9732dd7..06419a1 100644
--- a/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png
+++ b/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_item_bg_normal.9.png b/res/drawable-xhdpi/appwidget_item_bg_normal.9.png
new file mode 100644
index 0000000..cbbd8f6
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_item_bg_normal.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_item_bg_pressed.9.png b/res/drawable-xhdpi/appwidget_item_bg_pressed.9.png
new file mode 100644
index 0000000..80d9bfb
--- /dev/null
+++ b/res/drawable-xhdpi/appwidget_item_bg_pressed.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/avatar_default_1.png b/res/drawable-xhdpi/avatar_default_1.png
new file mode 100644
index 0000000..6caa06a
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_1.png
Binary files differ
diff --git a/res/drawable-xhdpi/avatar_default_2.png b/res/drawable-xhdpi/avatar_default_2.png
new file mode 100644
index 0000000..faf3b15
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_2.png
Binary files differ
diff --git a/res/drawable-xhdpi/avatar_default_3.png b/res/drawable-xhdpi/avatar_default_3.png
new file mode 100644
index 0000000..63a80ff
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_3.png
Binary files differ
diff --git a/res/drawable-xhdpi/avatar_default_4.png b/res/drawable-xhdpi/avatar_default_4.png
new file mode 100644
index 0000000..d743dc6
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_4.png
Binary files differ
diff --git a/res/drawable-xhdpi/avatar_default_5.png b/res/drawable-xhdpi/avatar_default_5.png
new file mode 100644
index 0000000..b7b822b
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_5.png
Binary files differ
diff --git a/res/drawable-xhdpi/avatar_default_6.png b/res/drawable-xhdpi/avatar_default_6.png
new file mode 100644
index 0000000..f5b5e84
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_6.png
Binary files differ
diff --git a/res/drawable-xhdpi/avatar_default_7.png b/res/drawable-xhdpi/avatar_default_7.png
new file mode 100644
index 0000000..4271c0d
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_7.png
Binary files differ
diff --git a/res/drawable-xhdpi/avatar_default_8.png b/res/drawable-xhdpi/avatar_default_8.png
new file mode 100644
index 0000000..27261a5
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_8.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_gps_off_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_gps_off_holo.png
deleted file mode 100644
index 0548274..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_gps_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_gps_on_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_gps_on_holo.png
deleted file mode 100644
index d1d9768..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_gps_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_location_off_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_location_off_holo.png
new file mode 100644
index 0000000..dfaa6c3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_location_off_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_location_on_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_location_on_holo.png
new file mode 100644
index 0000000..bb00da6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_appwidget_settings_location_on_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_grayedout_printer.png b/res/drawable-xhdpi/ic_grayedout_printer.png
new file mode 100644
index 0000000..5e54970
--- /dev/null
+++ b/res/drawable-xhdpi/ic_grayedout_printer.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_launcher_settings.png b/res/drawable-xhdpi/ic_launcher_settings.png
deleted file mode 100644
index 9bfdd78..0000000
--- a/res/drawable-xhdpi/ic_launcher_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_add.png b/res/drawable-xhdpi/ic_menu_add.png
deleted file mode 100644
index 420510e..0000000
--- a/res/drawable-xhdpi/ic_menu_add.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_add_dark.png b/res/drawable-xhdpi/ic_menu_add_dark.png
new file mode 100644
index 0000000..6e2e18a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_add_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_add_light.png b/res/drawable-xhdpi/ic_menu_add_light.png
new file mode 100644
index 0000000..4109b2c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_add_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_home.png b/res/drawable-xhdpi/ic_settings_home.png
new file mode 100644
index 0000000..6a4d84a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_home.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_location.png b/res/drawable-xhdpi/ic_settings_location.png
index 29ed43c..a3912a3 100644
--- a/res/drawable-xhdpi/ic_settings_location.png
+++ b/res/drawable-xhdpi/ic_settings_location.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_multiuser.png b/res/drawable-xhdpi/ic_settings_multiuser.png
new file mode 100644
index 0000000..dbf8cd4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_multiuser.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_nfc_payment.png b/res/drawable-xhdpi/ic_settings_nfc_payment.png
new file mode 100644
index 0000000..e4d8173
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_nfc_payment.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/drawable-xhdpi/ic_wifi_lock_signal_1.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1.png
deleted file mode 100644
index 8b8cb03..0000000
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png
new file mode 100644
index 0000000..c2be32f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png
new file mode 100644
index 0000000..57c8fb2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2.png
deleted file mode 100644
index 411269c..0000000
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png
new file mode 100644
index 0000000..9e65730
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png
new file mode 100644
index 0000000..db783f8
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3.png
deleted file mode 100644
index f0d92a0..0000000
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png
new file mode 100644
index 0000000..5a12175
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png
new file mode 100644
index 0000000..8b7df74
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4.png
deleted file mode 100644
index d26694d..0000000
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png
new file mode 100644
index 0000000..4d2942c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png
new file mode 100644
index 0000000..bf26501
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_1.png b/res/drawable-xhdpi/ic_wifi_signal_1.png
deleted file mode 100644
index 3fded08..0000000
--- a/res/drawable-xhdpi/ic_wifi_signal_1.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_1_dark.png b/res/drawable-xhdpi/ic_wifi_signal_1_dark.png
new file mode 100644
index 0000000..bf1634c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_1_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_1_light.png b/res/drawable-xhdpi/ic_wifi_signal_1_light.png
new file mode 100644
index 0000000..0f58f3d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_1_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_2.png b/res/drawable-xhdpi/ic_wifi_signal_2.png
deleted file mode 100644
index 3a32026..0000000
--- a/res/drawable-xhdpi/ic_wifi_signal_2.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_2_dark.png b/res/drawable-xhdpi/ic_wifi_signal_2_dark.png
new file mode 100644
index 0000000..5345ff3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_2_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_2_light.png b/res/drawable-xhdpi/ic_wifi_signal_2_light.png
new file mode 100644
index 0000000..c5bcc7e
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_2_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_3.png b/res/drawable-xhdpi/ic_wifi_signal_3.png
deleted file mode 100644
index 1616940..0000000
--- a/res/drawable-xhdpi/ic_wifi_signal_3.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_3_dark.png b/res/drawable-xhdpi/ic_wifi_signal_3_dark.png
new file mode 100644
index 0000000..8cc3a6e
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_3_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_3_light.png b/res/drawable-xhdpi/ic_wifi_signal_3_light.png
new file mode 100644
index 0000000..1cdacc5
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_3_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_4.png b/res/drawable-xhdpi/ic_wifi_signal_4.png
deleted file mode 100644
index 8b256c3..0000000
--- a/res/drawable-xhdpi/ic_wifi_signal_4.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_4_dark.png b/res/drawable-xhdpi/ic_wifi_signal_4_dark.png
new file mode 100644
index 0000000..c9aa4e5
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_4_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_4_light.png b/res/drawable-xhdpi/ic_wifi_signal_4_light.png
new file mode 100644
index 0000000..3cf1c8d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_4_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wps.png b/res/drawable-xhdpi/ic_wps.png
deleted file mode 100644
index 71308f2..0000000
--- a/res/drawable-xhdpi/ic_wps.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wps_dark.png b/res/drawable-xhdpi/ic_wps_dark.png
new file mode 100644
index 0000000..3ea4a3b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wps_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wps_light.png b/res/drawable-xhdpi/ic_wps_light.png
new file mode 100644
index 0000000..f913d2c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wps_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/nfc_payment_empty_state.png b/res/drawable-xhdpi/nfc_payment_empty_state.png
new file mode 100644
index 0000000..e664090
--- /dev/null
+++ b/res/drawable-xhdpi/nfc_payment_empty_state.png
Binary files differ
diff --git a/res/drawable-xhdpi/transparency.png b/res/drawable-xhdpi/transparency.png
new file mode 100644
index 0000000..0808625
--- /dev/null
+++ b/res/drawable-xhdpi/transparency.png
Binary files differ
diff --git a/res/drawable-xxhdpi/appwidget_item_bg_pressed.9.png b/res/drawable-xxhdpi/appwidget_item_bg_pressed.9.png
new file mode 100644
index 0000000..a3427e8
--- /dev/null
+++ b/res/drawable-xxhdpi/appwidget_item_bg_pressed.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_appwidget_settings_location_off_holo.png b/res/drawable-xxhdpi/ic_appwidget_settings_location_off_holo.png
new file mode 100644
index 0000000..d2fc839
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_appwidget_settings_location_off_holo.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_appwidget_settings_location_on_holo.png b/res/drawable-xxhdpi/ic_appwidget_settings_location_on_holo.png
new file mode 100644
index 0000000..893eb82
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_appwidget_settings_location_on_holo.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_add_dark.png b/res/drawable-xxhdpi/ic_menu_add_dark.png
new file mode 100644
index 0000000..5b4923f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_add_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_add_light.png b/res/drawable-xxhdpi/ic_menu_add_light.png
new file mode 100644
index 0000000..767b808
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_add_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_about.png b/res/drawable-xxhdpi/ic_settings_about.png
new file mode 100644
index 0000000..924d962
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_about.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_home.png b/res/drawable-xxhdpi/ic_settings_home.png
new file mode 100644
index 0000000..aac8773
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_home.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_location.png b/res/drawable-xxhdpi/ic_settings_location.png
new file mode 100644
index 0000000..72499ef
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_location.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_nfc_payment.png b/res/drawable-xxhdpi/ic_settings_nfc_payment.png
new file mode 100644
index 0000000..cdb495e
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_nfc_payment.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png
new file mode 100644
index 0000000..20739fa
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png
new file mode 100644
index 0000000..c13edff
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png
new file mode 100644
index 0000000..9cd652a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png
new file mode 100644
index 0000000..cb7f0c2
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png
new file mode 100644
index 0000000..99097df
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png
new file mode 100644
index 0000000..a0961f4
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png
new file mode 100644
index 0000000..6c00a9c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png
new file mode 100644
index 0000000..74e1a40
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png
new file mode 100644
index 0000000..b50fda5
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_1_light.png b/res/drawable-xxhdpi/ic_wifi_signal_1_light.png
new file mode 100644
index 0000000..f6fad9d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_1_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png
new file mode 100644
index 0000000..f906023
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_2_light.png b/res/drawable-xxhdpi/ic_wifi_signal_2_light.png
new file mode 100644
index 0000000..7f5859b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_2_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png
new file mode 100644
index 0000000..ef40952
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_3_light.png b/res/drawable-xxhdpi/ic_wifi_signal_3_light.png
new file mode 100644
index 0000000..e3151b3
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_3_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png
new file mode 100644
index 0000000..13f9425
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_4_light.png b/res/drawable-xxhdpi/ic_wifi_signal_4_light.png
new file mode 100644
index 0000000..96e25e5
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_4_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wps_dark.png b/res/drawable-xxhdpi/ic_wps_dark.png
new file mode 100644
index 0000000..8b38db8
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wps_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wps_light.png b/res/drawable-xxhdpi/ic_wps_light.png
new file mode 100644
index 0000000..0084175
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wps_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/nfc_payment_empty_state.png b/res/drawable-xxhdpi/nfc_payment_empty_state.png
new file mode 100644
index 0000000..a861b79
--- /dev/null
+++ b/res/drawable-xxhdpi/nfc_payment_empty_state.png
Binary files differ
diff --git a/res/drawable-xxhdpi/transparency.png b/res/drawable-xxhdpi/transparency.png
new file mode 100644
index 0000000..5b61bac
--- /dev/null
+++ b/res/drawable-xxhdpi/transparency.png
Binary files differ
diff --git a/res/drawable/wifi_signal.xml b/res/drawable/appwidget_item_bg.xml
similarity index 67%
copy from res/drawable/wifi_signal.xml
copy to res/drawable/appwidget_item_bg.xml
index 86c1ab0..b9de6d4 100644
--- a/res/drawable/wifi_signal.xml
+++ b/res/drawable/appwidget_item_bg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- 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.
@@ -14,9 +14,10 @@
      limitations under the License.
 -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock" />
-    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open" />
-</selector>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <item android:state_pressed="true"
+          android:drawable="@drawable/appwidget_item_bg_pressed" />
+
+    <item android:drawable="@drawable/appwidget_item_bg_normal" />
+</selector>
diff --git a/res/drawable/ic_default_user.png b/res/drawable/ic_default_user.png
new file mode 100644
index 0000000..ddf797f
--- /dev/null
+++ b/res/drawable/ic_default_user.png
Binary files differ
diff --git a/res/drawable/regulatory_info.png b/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..65de26c
--- /dev/null
+++ b/res/drawable/regulatory_info.png
Binary files differ
diff --git a/res/drawable/wifi_signal.xml b/res/drawable/transparency_tileable.xml
similarity index 60%
copy from res/drawable/wifi_signal.xml
copy to res/drawable/transparency_tileable.xml
index 86c1ab0..0f676b1 100644
--- a/res/drawable/wifi_signal.xml
+++ b/res/drawable/transparency_tileable.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!--
+     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.
@@ -14,9 +15,7 @@
      limitations under the License.
 -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock" />
-    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open" />
-</selector>
-
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/transparency"
+    android:tileMode="repeat"
+    android:dither="true" />
diff --git a/res/drawable/wifi_signal.xml b/res/drawable/wifi_signal_dark.xml
similarity index 93%
rename from res/drawable/wifi_signal.xml
rename to res/drawable/wifi_signal_dark.xml
index 86c1ab0..b578f47 100644
--- a/res/drawable/wifi_signal.xml
+++ b/res/drawable/wifi_signal_dark.xml
@@ -16,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock" />
-    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open" />
+    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock_dark" />
+    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open_dark" />
 </selector>
 
diff --git a/res/drawable/wifi_signal.xml b/res/drawable/wifi_signal_light.xml
similarity index 93%
copy from res/drawable/wifi_signal.xml
copy to res/drawable/wifi_signal_light.xml
index 86c1ab0..f1f74e3 100644
--- a/res/drawable/wifi_signal.xml
+++ b/res/drawable/wifi_signal_light.xml
@@ -16,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock" />
-    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open" />
+    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock_light" />
+    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open_light" />
 </selector>
 
diff --git a/res/drawable/wifi_signal_open.xml b/res/drawable/wifi_signal_lock_dark.xml
similarity index 90%
copy from res/drawable/wifi_signal_open.xml
copy to res/drawable/wifi_signal_lock_dark.xml
index b506dd3..37226a8 100644
--- a/res/drawable/wifi_signal_open.xml
+++ b/res/drawable/wifi_signal_lock_dark.xml
@@ -15,9 +15,9 @@
 -->
 
 <level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1" />
-    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2" />
-    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3" />
-    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4" />
+    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_lock_signal_1_dark" />
+    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_lock_signal_2_dark" />
+    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_lock_signal_3_dark" />
+    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_lock_signal_4_dark" />
 </level-list>
 
diff --git a/res/drawable/wifi_signal_open.xml b/res/drawable/wifi_signal_lock_light.xml
similarity index 90%
copy from res/drawable/wifi_signal_open.xml
copy to res/drawable/wifi_signal_lock_light.xml
index b506dd3..bf2d360 100644
--- a/res/drawable/wifi_signal_open.xml
+++ b/res/drawable/wifi_signal_lock_light.xml
@@ -15,9 +15,9 @@
 -->
 
 <level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1" />
-    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2" />
-    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3" />
-    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4" />
+    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_lock_signal_1_light" />
+    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_lock_signal_2_light" />
+    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_lock_signal_3_light" />
+    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_lock_signal_4_light" />
 </level-list>
 
diff --git a/res/drawable/wifi_signal_lock.xml b/res/drawable/wifi_signal_open_dark.xml
similarity index 92%
rename from res/drawable/wifi_signal_lock.xml
rename to res/drawable/wifi_signal_open_dark.xml
index 2ad6d91..d696983 100644
--- a/res/drawable/wifi_signal_lock.xml
+++ b/res/drawable/wifi_signal_open_dark.xml
@@ -15,9 +15,9 @@
 -->
 
 <level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_lock_signal_1" />
-    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_lock_signal_2" />
-    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_lock_signal_3" />
-    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_lock_signal_4" />
+    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1_dark" />
+    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2_dark" />
+    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3_dark" />
+    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4_dark" />
 </level-list>
 
diff --git a/res/drawable/wifi_signal_open.xml b/res/drawable/wifi_signal_open_light.xml
similarity index 91%
rename from res/drawable/wifi_signal_open.xml
rename to res/drawable/wifi_signal_open_light.xml
index b506dd3..c54e9e9 100644
--- a/res/drawable/wifi_signal_open.xml
+++ b/res/drawable/wifi_signal_open_light.xml
@@ -15,9 +15,9 @@
 -->
 
 <level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1" />
-    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2" />
-    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3" />
-    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4" />
+    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1_light" />
+    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2_light" />
+    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3_light" />
+    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4_light" />
 </level-list>
 
diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml
index ade6f25..08dcf64 100644
--- a/res/layout-land/choose_lock_password.xml
+++ b/res/layout-land/choose_lock_password.xml
@@ -33,11 +33,11 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="horizontal"
-            android:layout_marginRight="6dip"
-            android:layout_marginLeft="6dip"
+            android:layout_marginEnd="6dip"
+            android:layout_marginStart="6dip"
             android:layout_marginTop="10dip"
             android:layout_marginBottom="10dip"
-            android:gravity="left"
+            android:gravity="start"
             android:ellipsize="marquee"
             android:textAppearance="?android:attr/textAppearanceMedium"
         />
@@ -79,7 +79,7 @@
         <LinearLayout
             style="@style/SecurityPreferenceButtonContainer"
             android:orientation="horizontal"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true">
 
             <!-- left : cancel -->
diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index e178e7c..6d3d6da 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -47,7 +47,7 @@
                 style="@style/SecurityPreferenceButtonContainer"
                 android:layout_centerHorizontal="true"
                 android:layout_alignParentBottom="true"
-                android:orientation="vertical">
+                android:orientation="horizontal">
 
                 <!-- left / top button: skip, or re-try -->
                 <Button android:id="@+id/footerLeftButton"
diff --git a/res/layout-land/choose_lock_pattern_tutorial.xml b/res/layout-land/choose_lock_pattern_tutorial.xml
deleted file mode 100644
index ac693cc..0000000
--- a/res/layout-land/choose_lock_pattern_tutorial.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/topLayout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!-- Top: pattern and information -->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:orientation="horizontal">
-
-        <!-- left side: lock pattern. Given the square aspect, this will be the smaller of the
-             two dimensions (height) -->
-        <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"/>
-
-        <!-- right side: instructions and buttons -->
-        <!-- header message -->
-        <ScrollView
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_marginLeft="25dip">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="5dip">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
-                    android:text="@string/lock_title"
-                    android:paddingBottom="10dip"
-                    style="?android:attr/textAppearanceLarge"
-                />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textSize="18sp"
-                    android:text="@string/lock_intro_message"
-                />
-
-            </LinearLayout>
-
-        </ScrollView>
-
-    </LinearLayout>
-
-    <!-- Bottom: cancel/next buttons -->
-    <LinearLayout
-        style="@style/SecurityPreferenceButtonContainer"
-        android:orientation="horizontal">
-
-        <!-- left / top button: skip, or re-try -->
-        <Button android:id="@+id/skip_button"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpattern_tutorial_cancel_label"/>
-
-        <!-- right / bottom button: confirm or ok -->
-        <Button android:id="@+id/next_button"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpattern_tutorial_continue_label"/>
-
-    </LinearLayout>
-
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
-
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index a9b5640..4130a48 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -34,11 +34,11 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="horizontal"
-            android:layout_marginRight="6dip"
-            android:layout_marginLeft="6dip"
+            android:layout_marginEnd="6dip"
+            android:layout_marginStart="6dip"
             android:layout_marginTop="10dip"
             android:layout_marginBottom="10dip"
-            android:gravity="left"
+            android:gravity="start"
             android:ellipsize="marquee"
             android:textAppearance="?android:attr/textAppearanceMedium"
         />
@@ -89,7 +89,7 @@
             android:layout_width="150dip"
             android:layout_height="wrap_content"
             android:layout_margin="5dip"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:text="@string/lockpassword_cancel_label"
         />
 
@@ -97,8 +97,8 @@
             android:layout_width="150dip"
             android:layout_height="wrap_content"
             android:layout_margin="5dip"
-            android:layout_alignParentRight="true"
-            android:drawableRight="@drawable/ic_btn_next"
+            android:layout_alignParentEnd="true"
+            android:drawableEnd="@drawable/ic_btn_next"
             android:drawablePadding="10dip"
             android:text="@string/lockpassword_continue_label"
         />
diff --git a/res/layout-land/confirm_lock_pattern.xml b/res/layout-land/confirm_lock_pattern.xml
index 8c4e912..87343c8 100644
--- a/res/layout-land/confirm_lock_pattern.xml
+++ b/res/layout-land/confirm_lock_pattern.xml
@@ -19,8 +19,7 @@
     android:id="@+id/topLayout"
     android:orientation="horizontal"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black">
+    android:layout_height="match_parent">
 
     <!-- left side: instructions and messages -->
     <LinearLayout
diff --git a/res/layout-land/crypt_keeper_password_entry.xml b/res/layout-land/crypt_keeper_password_entry.xml
index 094434e..57cfbed 100644
--- a/res/layout-land/crypt_keeper_password_entry.xml
+++ b/res/layout-land/crypt_keeper_password_entry.xml
@@ -50,8 +50,8 @@
         <LinearLayout
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:layout_marginLeft="8dip"
-            android:layout_marginRight="8dip"
+            android:layout_marginStart="8dip"
+            android:layout_marginEnd="8dip"
             android:orientation="horizontal"
         >
             <include layout="@layout/crypt_keeper_password_field" />
diff --git a/res/layout-land/crypt_keeper_progress.xml b/res/layout-land/crypt_keeper_progress.xml
index f8a939f..c2fe2f7 100644
--- a/res/layout-land/crypt_keeper_progress.xml
+++ b/res/layout-land/crypt_keeper_progress.xml
@@ -27,7 +27,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:minHeight="48dip"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
         android:textSize="30dip"
         android:textColor="@color/title_color"
diff --git a/res/layout-sw600dp-land/choose_lock_password.xml b/res/layout-sw600dp-land/choose_lock_password.xml
index 3895529..05d4a24 100644
--- a/res/layout-sw600dp-land/choose_lock_password.xml
+++ b/res/layout-sw600dp-land/choose_lock_password.xml
@@ -34,11 +34,11 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="horizontal"
-            android:layout_marginRight="6dip"
-            android:layout_marginLeft="6dip"
+            android:layout_marginEnd="6dip"
+            android:layout_marginStart="6dip"
             android:layout_marginTop="10dip"
             android:layout_marginBottom="10dip"
-            android:gravity="left"
+            android:gravity="start"
             android:ellipsize="marquee"
             android:textAppearance="?android:attr/textAppearanceLarge"
         />
@@ -66,7 +66,7 @@
     <!-- confirm / restart buttons -->
     <LinearLayout
         style="@style/SecurityPreferenceButtonContainer"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:orientation="horizontal">
 
diff --git a/res/layout-sw600dp-land/choose_lock_pattern.xml b/res/layout-sw600dp-land/choose_lock_pattern.xml
index a32a5fb..8fa1cee 100644
--- a/res/layout-sw600dp-land/choose_lock_pattern.xml
+++ b/res/layout-sw600dp-land/choose_lock_pattern.xml
@@ -17,81 +17,71 @@
 <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/topLayout"
-    android:orientation="horizontal"
+    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal">
 
-    <!-- left side: lock pattern widget -->
-    <RelativeLayout
-        android:layout_width="0dip"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center_horizontal|center_vertical"
-        android:orientation="horizontal">
+    <!-- header message -->
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_marginTop="14dip">
 
-        <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-             android:layout_width="354dip"
-             android:layout_height="354dip"
-             aspect="square"/>
-
-     </RelativeLayout>
-
-    <!-- right side: instructions and buttons -->
-    <RelativeLayout
-        android:layout_width="0dip"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center_horizontal">
-
-        <!-- footer message -->
-        <TextView android:id="@+id/footerText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/headerText"
-            android:layout_marginTop="16dip"
-            android:layout_toRightOf="@id/lockPattern"
-            android:layout_marginLeft="100dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:visibility="gone"/>
-
-        <!-- confirm / restart buttons -->
-        <LinearLayout android:id="@+id/buttonContainer"
-            style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentBottom="true"
-            android:orientation="horizontal">
-
-            <!-- left / top button: skip, or re-try -->
-            <Button android:id="@+id/footerLeftButton"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpattern_restart_button_text"/>
-
-            <!-- right / bottom button: confirm or ok -->
-            <Button android:id="@+id/footerRightButton"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpattern_confirm_button_text"/>
-
-        </LinearLayout>
-
-        <!-- header message -->
-        <ScrollView
+        <TextView android:id="@+id/headerText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_marginTop="20dip"
-            android:layout_marginLeft="20dip"
-            android:layout_above="@id/buttonContainer"
-            android:gravity="center_vertical|center_horizontal">
+            android:gravity="center"
+            android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-            <TextView android:id="@+id/headerText"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceLarge"/>
+    </ScrollView>
 
-        </ScrollView>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="0.6"/>
 
+    <!-- lock pattern widget -->
+    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+        android:layout_width="354dip"
+        android:layout_height="354dip"
+        aspect="square"/>
 
-    </RelativeLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"/>
+
+    <!-- footer message -->
+    <TextView android:id="@+id/footerText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/headerText"
+        android:layout_marginTop="16dip"
+        android:layout_toEndOf="@id/lockPattern"
+        android:layout_marginStart="100dip"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:visibility="gone"/>
+
+    <!-- confirm / restart buttons -->
+    <LinearLayout android:id="@+id/buttonContainer"
+        style="@style/SecurityPreferenceButtonContainer"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
+
+        <!-- left / top button: skip, or re-try -->
+        <Button android:id="@+id/footerLeftButton"
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpattern_restart_button_text"/>
+
+        <!-- right / bottom button: confirm or ok -->
+        <Button android:id="@+id/footerRightButton"
+            style="@style/SecurityPreferenceButton"
+            android:text="@string/lockpattern_confirm_button_text"/>
+
+    </LinearLayout>
 
 </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
 
diff --git a/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml b/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml
deleted file mode 100644
index 1320ba0..0000000
--- a/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/topLayout"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!-- left side: lock pattern example widget -->
-    <RelativeLayout
-        android:layout_width="0dip"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center_horizontal|center_vertical"
-        android:orientation="horizontal">
-
-        <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-             android:layout_width="354dip"
-             android:layout_height="354dip"
-             aspect="square"/>
-
-     </RelativeLayout>
-
-    <!-- right side: instructions and buttons -->
-    <RelativeLayout
-        android:layout_width="0dip"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center_horizontal">
-
-        <!-- navigation buttons -->
-        <LinearLayout android:id="@+id/buttonContainer"
-            style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentBottom="true"
-            android:orientation="horizontal">
-
-            <!-- left / top button: skip, or re-try -->
-            <Button android:id="@+id/skip_button"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpattern_tutorial_cancel_label"/>
-
-            <!-- right / bottom button: confirm or ok -->
-            <Button android:id="@+id/next_button"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpattern_tutorial_continue_label"/>
-
-        </LinearLayout>
-
-        <!-- header message -->
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_marginTop="20dip"
-            android:layout_marginLeft="20dip"
-            android:gravity="center_vertical|center_horizontal"
-            android:layout_above="@id/buttonContainer">
-
-            <TextView android:id="@+id/headerText"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/lock_intro_message"
-                android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-        </ScrollView>
-
-    </RelativeLayout>>
-
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
-
diff --git a/res/layout-sw600dp-land/confirm_lock_password.xml b/res/layout-sw600dp-land/confirm_lock_password.xml
index c4472db..5844a60 100644
--- a/res/layout-sw600dp-land/confirm_lock_password.xml
+++ b/res/layout-sw600dp-land/confirm_lock_password.xml
@@ -35,11 +35,11 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="horizontal"
-            android:layout_marginRight="6dip"
-            android:layout_marginLeft="6dip"
+            android:layout_marginEnd="6dip"
+            android:layout_marginStart="6dip"
             android:layout_marginTop="10dip"
             android:layout_marginBottom="10dip"
-            android:gravity="left"
+            android:gravity="start"
             android:ellipsize="marquee"
             android:textAppearance="?android:attr/textAppearanceLarge"
         />
@@ -67,7 +67,7 @@
     <!-- confirm / restart buttons -->
     <LinearLayout
         style="@style/SecurityPreferenceButtonContainer"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:orientation="horizontal">
 
diff --git a/res/layout-sw600dp-land/confirm_lock_pattern.xml b/res/layout-sw600dp-land/confirm_lock_pattern.xml
index 3e642d5..b9dd27a 100644
--- a/res/layout-sw600dp-land/confirm_lock_pattern.xml
+++ b/res/layout-sw600dp-land/confirm_lock_pattern.xml
@@ -16,78 +16,48 @@
 <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/topLayout"
-    android:orientation="horizontal"
+    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal">
 
-    <!-- left side: lock pattern widget -->
-    <RelativeLayout
-        android:layout_width="0dip"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center_horizontal|center_vertical"
-        android:orientation="horizontal">
+    <!-- header message -->
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_marginTop="40dip">
 
-        <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-             android:layout_width="354dip"
-             android:layout_height="354dip"
-             aspect="square"/>
-
-     </RelativeLayout>
-
-    <!-- right side: instructions and buttons -->
-    <RelativeLayout
-        android:layout_width="0dip"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center_horizontal">
-
-        <!-- confirm / restart buttons -->
-        <LinearLayout android:id="@+id/buttonContainer"
-            style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentBottom="true"
-            android:orientation="horizontal"
-            android:visibility="invisible">
-
-            <!-- left / top button: skip, or re-try -->
-            <Button android:id="@+id/footerLeftButton"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpattern_restart_button_text"/>
-
-            <!-- right / bottom button: confirm or ok -->
-            <Button android:id="@+id/footerRightButton"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpattern_confirm_button_text"/>
-
-        </LinearLayout>
-
-        <!-- footer message -->
-        <TextView android:id="@+id/footerText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_above="@id/buttonContainer"
-            android:layout_marginTop="16dip"
-            android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-        <!-- header message -->
-        <ScrollView
+        <TextView android:id="@+id/headerText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_marginTop="20dip"
-            android:layout_marginLeft="20dip"
-            android:layout_above="@id/footerText"
-            android:gravity="center_vertical|center_horizontal">
+            android:gravity="center"
+            android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-            <TextView android:id="@+id/headerText"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="22sp"/>
+    </ScrollView>
 
-        </ScrollView>
+    <!-- footer message -->
+    <TextView android:id="@+id/footerText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dip"
+        android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-    </RelativeLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="0.6"/>
+
+    <!-- lock pattern widget -->
+    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
+        android:layout_width="354dip"
+        android:layout_height="354dip"
+        aspect="square"/>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"/>
 
 </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
 
diff --git a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
deleted file mode 100644
index a8f5651..0000000
--- a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 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.
-*/
--->
-<!-- Layout containing two panes and a keyboard entry. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
->
-
-    <include layout="@layout/crypt_keeper_status" />
-
-    <!-- The right pane contains the encdroid image, a string, and an edit field. -->
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:layout_gravity="center_horizontal"
-    >
-        <ImageView android:id="@+id/encroid"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:src="@drawable/encroid_resignin"
-            android:contentDescription="@null"
-        />
-
-        <TextView android:id="@+id/passwordLabel"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:layout_toRightOf="@+id/encroid"
-            android:layout_centerVertical="true"
-            android:paddingRight="17dip"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/crypt_keeper_enter_password"
-        />
-
-        <!-- Password entry field -->
-        <LinearLayout
-            android:layout_height="wrap_content"
-            android:layout_width="320dip"
-            android:layout_toRightOf="@+id/passwordLabel"
-            android:layout_centerVertical="true"
-            android:orientation="horizontal"
-        >
-            <include layout="@layout/crypt_keeper_password_field" />
-        </LinearLayout>
-
-    </RelativeLayout>
-<!-- And this is the keyboard. -->
-    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
-        android:visibility="visible"
-    />
-
-</LinearLayout>
diff --git a/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml b/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml
index 8094b74..70d868a 100644
--- a/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml
@@ -21,8 +21,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:paddingTop="60dip"
-    android:paddingLeft="@dimen/screen_margin_sides"
-    android:paddingRight="@dimen/screen_margin_sides"
+    android:paddingStart="@dimen/screen_margin_sides"
+    android:paddingEnd="@dimen/screen_margin_sides"
     android:paddingBottom="0dip" >
 
     <FrameLayout
@@ -42,9 +42,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:minHeight="48dip"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="16dip"
+        android:layout_marginStart="16dip"
         android:layout_below="@id/top_padding_layout"
         android:textSize="32dip"
         android:textColor="@color/title_color"
@@ -88,7 +88,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/top_divider"
-        android:layout_alignLeft="@id/dummy_for_left_edge"
+        android:layout_alignStart="@id/dummy_for_left_edge"
         android:layout_centerHorizontal="true">
 
         <!-- Padding for @id/content shown when keyboard isn't available -->
@@ -115,7 +115,7 @@
             android:layout_height="wrap_content"
             android:minHeight="160dip"
             android:layout_marginTop="10dip"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:visibility="gone" />
         <LinearLayout
             android:id="@+id/connecting_status_layout"
@@ -174,7 +174,7 @@
         android:layout_height="3dip"
         android:layout_marginBottom="16dip"
         android:layout_below="@id/bottom_padding_layout"
-        android:layout_alignLeft="@id/content"
+        android:layout_alignStart="@id/content"
         android:background="@color/divider_color" />  <!-- TODO: fix this -->
 
     <RelativeLayout
@@ -182,21 +182,21 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/bottom_divider"
-        android:layout_alignLeft="@id/bottom_divider"
-        android:layout_alignParentRight="true"
+        android:layout_alignStart="@id/bottom_divider"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true">
 
         <Button
             android:id="@+id/wifi_setup_add_network"
             style="@style/setup_wizard_button"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:text="@string/wifi_setup_add_network"
             android:enabled="false" />
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:orientation="horizontal">
 
             <!-- This misleading name is for keeping consistency between non-XL
@@ -208,20 +208,20 @@
 
             <Button android:id="@+id/wifi_setup_connect"
                     style="@style/setup_wizard_button"
-                    android:layout_marginLeft="16dip"
+                    android:layout_marginStart="16dip"
                     android:text="@string/wifi_setup_connect"
                     android:enabled="false"
                     android:visibility="gone" />
 
             <Button android:id="@+id/wifi_setup_refresh_list"
                     style="@style/setup_wizard_button"
-                    android:layout_marginLeft="16dip"
+                    android:layout_marginStart="16dip"
                     android:text="@string/wifi_setup_refresh_list"
                     android:enabled="false" />
 
             <Button android:id="@+id/wifi_setup_skip_or_next"
                     style="@style/setup_wizard_button"
-                    android:layout_marginLeft="16dip"
+                    android:layout_marginStart="16dip"
                     android:text="@string/wifi_setup_skip" />
         </LinearLayout>
     </RelativeLayout>
diff --git a/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml b/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml
index 4d52deb..1777eda 100644
--- a/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml
+++ b/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml
@@ -18,7 +18,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <LinearLayout android:id="@+android:id/widget_frame"
         android:layout_width="wrap_content"
diff --git a/res/layout-sw600dp/choose_lock_password.xml b/res/layout-sw600dp/choose_lock_password.xml
index df53f68..43be032 100644
--- a/res/layout-sw600dp/choose_lock_password.xml
+++ b/res/layout-sw600dp/choose_lock_password.xml
@@ -51,8 +51,8 @@
         android:layout_gravity="center"
         android:textSize="32sp"
         android:layout_marginTop="15dip"
-        android:layout_marginLeft="30dip"
-        android:layout_marginRight="30dip"
+        android:layout_marginStart="30dip"
+        android:layout_marginEnd="30dip"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:background="@drawable/password_field_default"
         android:textColor="#ffffffff"
@@ -86,7 +86,7 @@
 
         <LinearLayout
             style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:orientation="horizontal">
 
             <Button android:id="@+id/cancel_button"
diff --git a/res/layout-sw600dp/choose_lock_pattern.xml b/res/layout-sw600dp/choose_lock_pattern.xml
index d8f85cc..dec8244 100644
--- a/res/layout-sw600dp/choose_lock_pattern.xml
+++ b/res/layout-sw600dp/choose_lock_pattern.xml
@@ -27,12 +27,14 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:gravity="center"
         android:layout_marginTop="96dip">
 
         <TextView android:id="@+id/headerText"
-            android:layout_width="wrap_content"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"/>
+            android:gravity="center"
+            android:textAppearance="?android:attr/textAppearanceMedium"/>
 
     </ScrollView>
 
@@ -41,7 +43,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dip"
-        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textAppearance="?android:attr/textAppearanceMedium"
         android:visibility="gone"/>
 
     <!-- bottom: lock pattern -->
@@ -62,7 +64,7 @@
 
         <LinearLayout
             style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:orientation="horizontal">
 
             <!-- left / top button: skip, or re-try -->
diff --git a/res/layout-sw600dp/choose_lock_pattern_tutorial.xml b/res/layout-sw600dp/choose_lock_pattern_tutorial.xml
deleted file mode 100644
index 2a61666..0000000
--- a/res/layout-sw600dp/choose_lock_pattern_tutorial.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/topLayout"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal">
-
-    <!-- top: instructions and buttons -->
-    <!-- header message -->
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="96dip">
-
-        <TextView android:id="@+id/headerText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="@string/lock_intro_message"/>
-
-    </ScrollView>
-
-    <!-- bottom: lock pattern -->
-    <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-         android:layout_width="354dip"
-         android:layout_height="354dip"
-         android:layout_marginTop="80dip"
-         aspect="square"/>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"/>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentRight="true"
-            android:orientation="horizontal">
-
-            <!-- left / top button: skip, or re-try -->
-            <Button android:id="@+id/skip_button"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpattern_tutorial_cancel_label"/>
-
-            <!-- right / bottom button: confirm or ok -->
-            <Button android:id="@+id/next_button"
-                style="@style/SecurityPreferenceButton"
-                android:text="@string/lockpattern_tutorial_continue_label"/>
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout-sw600dp/confirm_lock_password.xml b/res/layout-sw600dp/confirm_lock_password.xml
index 722153d..cb6fafd 100644
--- a/res/layout-sw600dp/confirm_lock_password.xml
+++ b/res/layout-sw600dp/confirm_lock_password.xml
@@ -54,8 +54,8 @@
         android:layout_gravity="center"
         android:textSize="32sp"
         android:layout_marginTop="15dip"
-        android:layout_marginLeft="30dip"
-        android:layout_marginRight="30dip"
+        android:layout_marginStart="30dip"
+        android:layout_marginEnd="30dip"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:background="@drawable/password_field_default"
         android:textColor="#ffffffff"
@@ -89,7 +89,7 @@
 
         <LinearLayout
             style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:orientation="horizontal">
 
             <Button android:id="@+id/cancel_button"
diff --git a/res/layout-sw600dp/confirm_lock_pattern.xml b/res/layout-sw600dp/confirm_lock_pattern.xml
index d41525a..c32422e 100644
--- a/res/layout-sw600dp/confirm_lock_pattern.xml
+++ b/res/layout-sw600dp/confirm_lock_pattern.xml
@@ -26,12 +26,14 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:gravity="center"
         android:layout_marginTop="96dip">
 
         <TextView android:id="@+id/headerText"
-            android:layout_width="wrap_content"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"/>
+            android:gravity="center"
+            android:textAppearance="?android:attr/textAppearanceMedium"/>
 
     </ScrollView>
 
@@ -40,7 +42,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dip"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
+        android:textAppearance="?android:attr/textAppearanceMedium"/>
 
     <!-- bottom: lock pattern -->
     <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
diff --git a/res/layout-sw600dp/crypt_keeper_password_entry.xml b/res/layout-sw600dp/crypt_keeper_password_entry.xml
index 1e33230c..f0a7cd0 100644
--- a/res/layout-sw600dp/crypt_keeper_password_entry.xml
+++ b/res/layout-sw600dp/crypt_keeper_password_entry.xml
@@ -16,23 +16,25 @@
 ** limitations under the License.
 */
 -->
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
 >
+
     <include layout="@layout/crypt_keeper_status" />
 
     <RelativeLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="0dip"
+        android:layout_weight="1"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="318dip"
     >
         <ImageView android:id="@+id/encroid"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
+            android:layout_centerVertical="true"
             android:src="@drawable/encroid_resignin"
             android:contentDescription="@null"
         />
@@ -40,10 +42,9 @@
         <TextView android:id="@+id/passwordLabel"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:layout_toRightOf="@+id/encroid"
-            android:layout_marginTop="37dip"
-            android:paddingLeft="17dip"
-            android:paddingRight="17dip"
+            android:layout_toEndOf="@+id/encroid"
+            android:layout_centerVertical="true"
+            android:paddingEnd="17dip"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/crypt_keeper_enter_password"
@@ -53,13 +54,12 @@
         <LinearLayout
             android:layout_height="wrap_content"
             android:layout_width="320dip"
-            android:layout_toRightOf="@+id/passwordLabel"
-            android:layout_marginTop="26dip"
+            android:layout_toEndOf="@+id/passwordLabel"
             android:layout_centerVertical="true"
             android:orientation="horizontal"
         >
             <include layout="@layout/crypt_keeper_password_field" />
         </LinearLayout>
-    </RelativeLayout>
 
+    </RelativeLayout>
 </LinearLayout>
diff --git a/res/layout-sw600dp/crypt_keeper_progress.xml b/res/layout-sw600dp/crypt_keeper_progress.xml
index 176c9fb..a2e32d7 100644
--- a/res/layout-sw600dp/crypt_keeper_progress.xml
+++ b/res/layout-sw600dp/crypt_keeper_progress.xml
@@ -29,9 +29,9 @@
             android:id="@+id/encroid"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
-            android:paddingRight="65dip"
+            android:paddingEnd="65dip"
             android:src="@drawable/encroid_waiting"
             android:contentDescription="@null"
         />
@@ -42,9 +42,9 @@
             android:layout_height="wrap_content"
             android:minHeight="48dip"
             android:layout_alignParentTop="true"
-            android:layout_alignParentLeft="true"
-            android:layout_marginLeft="16dip"
-            android:layout_marginRight="16dip"
+            android:layout_alignParentStart="true"
+            android:layout_marginStart="16dip"
+            android:layout_marginEnd="16dip"
             android:textSize="30dip"
             android:textColor="@color/title_color"
             android:text="@string/crypt_keeper_setup_title"
@@ -72,8 +72,8 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/top_divider"
             android:paddingTop="21dip"
-            android:layout_marginLeft="16dip"
-            android:layout_marginRight="16dip"
+            android:layout_marginStart="16dip"
+            android:layout_marginEnd="16dip"
             android:textAppearance="?android:attr/textAppearanceMedium"
         />
 
@@ -96,10 +96,10 @@
             android:id="@+id/factory_reset"
             android:layout_width="208dip"
             android:layout_height="48dip"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="80dip"
-            android:layout_marginRight="16dip"
+            android:layout_marginEnd="16dip"
             android:text="@string/master_clear_button_text"
             android:visibility="gone"
         />
diff --git a/res/layout-sw600dp/date_time_settings_setupwizard.xml b/res/layout-sw600dp/date_time_settings_setupwizard.xml
index e37a4a6..41e3021 100644
--- a/res/layout-sw600dp/date_time_settings_setupwizard.xml
+++ b/res/layout-sw600dp/date_time_settings_setupwizard.xml
@@ -19,16 +19,16 @@
         android:layout_height="match_parent"
         android:layout_width="match_parent"
         android:paddingTop="96dip"
-        android:paddingLeft="40dip"
-        android:paddingRight="40dip"
+        android:paddingStart="40dip"
+        android:paddingEnd="40dip"
         android:paddingBottom="96dip"
         android:orientation="vertical">
 
     <FrameLayout android:id="@+id/timezone_dropdown_anchor"
             android:layout_height="0px"
             android:layout_width="match_parent"
-            android:layout_marginLeft="40dip"
-            android:layout_marginRight="40dip"/>
+            android:layout_marginStart="40dip"
+            android:layout_marginEnd="40dip"/>
 
     <LinearLayout android:layout_height="0px"
                   android:layout_weight="1"
@@ -60,7 +60,7 @@
             android:minWidth="208dip"
             android:layout_height="48dip"
             android:layout_marginTop="10dip"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:text="@string/next_label"/>
 
     </RelativeLayout>
diff --git a/res/layout-sw600dp/preference_inputmethod.xml b/res/layout-sw600dp/preference_inputmethod.xml
index 326e2af..f44a50e 100644
--- a/res/layout-sw600dp/preference_inputmethod.xml
+++ b/res/layout-sw600dp/preference_inputmethod.xml
@@ -33,14 +33,13 @@
             android:id="@android:id/widget_frame"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dip"
-            android:gravity="center_vertical"
-            android:orientation="vertical" />
+            android:gravity="center"
+            android:minWidth="@*android:dimen/preference_icon_minWidth"
+            android:layout_marginEnd="@*android:dimen/preference_item_padding_inner" />
         <RelativeLayout
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="15dip"
-            android:layout_marginRight="6dip"
+            android:layout_marginEnd="6dip"
             android:layout_marginTop="6dip"
             android:layout_marginBottom="6dip"
             android:layout_weight="1">
@@ -57,7 +56,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@android:id/title"
-                android:layout_alignLeft="@android:id/title"
+                android:layout_alignStart="@android:id/title"
                 android:paddingBottom="3dip"
                 android:visibility="gone"
                 android:textAppearance="?android:attr/textAppearanceSmall"
@@ -77,8 +76,8 @@
         android:id="@+id/inputmethod_settings"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
-        android:paddingLeft="15dip"
-        android:paddingRight="?android:attr/scrollbarSize"
+        android:paddingStart="15dip"
+        android:paddingEnd="?android:attr/scrollbarSize"
         android:src="@drawable/ic_sysbar_quicksettings"
         android:contentDescription="@string/input_method_settings_button"
         android:layout_gravity="center"
diff --git a/res/layout-sw600dp/settings_top_level.xml b/res/layout-sw600dp/settings_top_level.xml
index 09590b1..ff53c1b 100644
--- a/res/layout-sw600dp/settings_top_level.xml
+++ b/res/layout-sw600dp/settings_top_level.xml
@@ -25,7 +25,7 @@
             android:layout_width="0px"
             android:layout_height="match_parent"
             android:layout_weight=".4" 
-            android:layout_marginRight="10dp"/>
+            android:layout_marginEnd="10dp"/>
     <FrameLayout android:id="@+id/prefs"
             android:layout_width="0px"
             android:layout_height="match_parent"
diff --git a/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml b/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
index 20f5784..94833e8 100644
--- a/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
@@ -21,8 +21,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:paddingTop="60dip"
-    android:paddingLeft="@dimen/screen_margin_sides"
-    android:paddingRight="@dimen/screen_margin_sides"
+    android:paddingStart="@dimen/screen_margin_sides"
+    android:paddingEnd="@dimen/screen_margin_sides"
     android:paddingBottom="0dip" >
 
     <FrameLayout
@@ -42,9 +42,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:minHeight="48dip"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="16dip"
+        android:layout_marginStart="16dip"
         android:layout_below="@id/top_padding_layout"
         android:textSize="32dip"
         android:textColor="@color/title_color"
@@ -88,7 +88,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/top_divider"
-        android:layout_alignLeft="@id/dummy_for_left_edge"
+        android:layout_alignStart="@id/dummy_for_left_edge"
         android:layout_centerHorizontal="true">
 
         <!-- Padding for @id/content shown when keyboard isn't available -->
@@ -115,7 +115,7 @@
             android:layout_height="wrap_content"
             android:minHeight="160dip"
             android:layout_marginTop="10dip"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:visibility="gone" />
         <LinearLayout
             android:id="@+id/connecting_status_layout"
@@ -174,7 +174,7 @@
         android:layout_height="3dip"
         android:layout_marginBottom="16dip"
         android:layout_below="@id/bottom_padding_layout"
-        android:layout_alignLeft="@id/content"
+        android:layout_alignStart="@id/content"
         android:background="@color/divider_color" />  <!-- TODO: fix this -->
 
     <LinearLayout
@@ -183,27 +183,27 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/bottom_divider"
-        android:layout_alignLeft="@id/bottom_divider">
+        android:layout_alignStart="@id/bottom_divider">
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/bottom_divider"
-            android:layout_alignLeft="@id/bottom_divider"
-            android:layout_alignParentRight="true"
+            android:layout_alignStart="@id/bottom_divider"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true">
 
             <Button
                 android:id="@+id/wifi_setup_add_network"
                 style="@style/setup_wizard_button"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:text="@string/wifi_setup_add_network"
                 android:enabled="false" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
                 android:orientation="horizontal">
 
                 <!-- This misleading name is for keeping consistency between non-XL
@@ -215,14 +215,14 @@
 
                 <Button android:id="@+id/wifi_setup_connect"
                         style="@style/setup_wizard_button"
-                        android:layout_marginLeft="16dip"
+                        android:layout_marginStart="16dip"
                         android:text="@string/wifi_setup_connect"
                         android:enabled="false"
                         android:visibility="gone" />
 
                 <Button android:id="@+id/wifi_setup_skip_or_next"
                         style="@style/setup_wizard_button"
-                        android:layout_marginLeft="16dip"
+                        android:layout_marginStart="16dip"
                         android:text="@string/wifi_setup_skip" />
             </LinearLayout>
 
@@ -230,7 +230,7 @@
 
         <Button android:id="@+id/wifi_setup_refresh_list"
                 style="@style/setup_wizard_button"
-                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
                 android:text="@string/wifi_setup_refresh_list"
                 android:enabled="false" />
 
diff --git a/res/layout-sw720dp/date_time_settings_setupwizard.xml b/res/layout-sw720dp/date_time_settings_setupwizard.xml
index b484472..32c4d93 100644
--- a/res/layout-sw720dp/date_time_settings_setupwizard.xml
+++ b/res/layout-sw720dp/date_time_settings_setupwizard.xml
@@ -20,8 +20,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingTop="@dimen/datetime_margin_top"
-    android:paddingLeft="@dimen/screen_margin_sides"
-    android:paddingRight="@dimen/screen_margin_sides"
+    android:paddingStart="@dimen/screen_margin_sides"
+    android:paddingEnd="@dimen/screen_margin_sides"
     android:paddingBottom="@dimen/datetime_margin_bottom">
 
     <!-- Title: Set date & time-->
@@ -30,8 +30,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:minHeight="48dip"
-        android:layout_alignParentLeft="true"
-        android:layout_marginLeft="16dip"
+        android:layout_alignParentStart="true"
+        android:layout_marginStart="16dip"
         android:layout_alignParentTop="true"
         android:textSize="32dip"
         android:textColor="@color/title_color"
@@ -60,9 +60,9 @@
             style="?android:attr/dropDownSpinnerStyle"
             android:layout_width="304dip"
             android:layout_height="48dip"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:layout_alignBottom="@+id/date_time_auto"
-            android:gravity="left|center_vertical"
+            android:gravity="start|center_vertical"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textSize="20dip" />
 
@@ -71,16 +71,16 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:layout_toRightOf="@id/time_zone_button"
-            android:layout_marginLeft="32dip"
-            android:layout_alignParentRight="true">
+            android:layout_toEndOf="@id/time_zone_button"
+            android:layout_marginStart="32dip"
+            android:layout_alignParentEnd="true">
 
             <Switch
                 android:id="@+id/date_time_auto_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:minHeight="?android:attr/listPreferredItemHeight"
-                android:layout_marginLeft="16dip"
+                android:layout_marginStart="16dip"
                 android:text="@string/date_time_auto"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textSize="20dip" />
@@ -154,7 +154,7 @@
         android:id="@+id/bottom_divider"
         android:layout_width="match_parent"
         android:layout_height="3dip"
-        android:layout_alignLeft="@id/timezone_auto_time"
+        android:layout_alignStart="@id/timezone_auto_time"
         android:layout_above="@+id/next_button"
         android:layout_marginBottom="16dip"
         android:background="@color/divider_color" />
@@ -163,6 +163,6 @@
         android:id="@+id/next_button"
         style="@style/setup_wizard_button"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:text="@string/next_label" />
 </RelativeLayout>
diff --git a/res/layout-sw720dp/tab_widget.xml b/res/layout-sw720dp/tab_widget.xml
index 4cd4547..80910c7 100644
--- a/res/layout-sw720dp/tab_widget.xml
+++ b/res/layout-sw720dp/tab_widget.xml
@@ -25,8 +25,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingLeft="@*android:dimen/preference_fragment_padding_side"
-        android:paddingRight="@*android:dimen/preference_fragment_padding_side"
-        style="?android:attr/tabWidgetStyle" />
-
+        style="?android:attr/tabWidgetStyle"
+        android:paddingStart="@dimen/settings_side_margin"
+        android:paddingEnd="@dimen/settings_side_margin"
+    />
 </HorizontalScrollView>
diff --git a/res/layout/account_sync_screen.xml b/res/layout/account_sync_screen.xml
index 117b58a..6469779 100644
--- a/res/layout/account_sync_screen.xml
+++ b/res/layout/account_sync_screen.xml
@@ -22,23 +22,23 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <include layout="@layout/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+    <include layout="@layout/title" />
 
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/settings_side_margin"
+        android:layout_marginEnd="@dimen/settings_side_margin"
         android:scaleType="fitXY"
         android:src="?android:attr/listDivider" />
 
-    <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list"
+    <ListView
+        android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1"
-        android:drawSelectorOnTop="false"
-        android:scrollbarAlwaysDrawVerticalTrack="true"
-    />
+        android:clipToPadding="false"
+        android:scrollbarStyle="outsideOverlay" />
 
     <TextView android:id="@+id/sync_settings_error_info"
         android:layout_width="match_parent"
@@ -48,32 +48,6 @@
         android:drawablePadding="8dip"
         android:drawableLeft="@drawable/ic_sync_error_holo" />
 
-    <!--
-    <LinearLayout android:id="@+id/remove_account_area"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:background="@android:drawable/bottom_bar">
-
-        <View
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1"/>
-
-        <Button android:id="@+id/remove_account_button"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="2"
-            android:layout_marginTop="5dip"
-            android:text="@string/remove_account_label" />
-
-        <View
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1"/>
-    </LinearLayout>
-    -->
-
     <RelativeLayout android:id="@+id/finish_button_area"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
@@ -84,8 +58,8 @@
             android:layout_width="150dip"
             android:layout_height="wrap_content"
             android:layout_margin="5dip"
-            android:layout_alignParentRight="true"
-            android:drawableRight="@drawable/ic_btn_next"
+            android:layout_alignParentEnd="true"
+            android:drawableEnd="@drawable/ic_btn_next"
             android:drawablePadding="3dip"
             android:text="@string/finish_button_label"
         />
diff --git a/res/layout/add_account_screen.xml b/res/layout/add_account_screen.xml
index b6305a0..7e1564c 100644
--- a/res/layout/add_account_screen.xml
+++ b/res/layout/add_account_screen.xml
@@ -21,8 +21,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingLeft="16dip"
-    android:paddingRight="16dip">
+    android:paddingStart="16dip"
+    android:paddingEnd="16dip">
 
     <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list"
         android:layout_width="match_parent"
diff --git a/res/layout/android_beam.xml b/res/layout/android_beam.xml
index 8ce90d7..4c9acc2 100644
--- a/res/layout/android_beam.xml
+++ b/res/layout/android_beam.xml
@@ -15,8 +15,8 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:paddingLeft="6dip"
-    android:paddingRight="6dip"
+    android:paddingStart="6dip"
+    android:paddingEnd="6dip"
     android:layout_width="match_parent" android:layout_height="wrap_content"
     android:scrollbars="vertical" >
 
diff --git a/res/layout/apn_preference_layout.xml b/res/layout/apn_preference_layout.xml
index 1694a93..b79b0b9 100644
--- a/res/layout/apn_preference_layout.xml
+++ b/res/layout/apn_preference_layout.xml
@@ -23,15 +23,14 @@
 
     <RelativeLayout
         android:id="@+android:id/text_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16sp"
-        android:layout_marginRight="6sp"
-        android:layout_marginTop="6sp"
-        android:layout_marginBottom="6sp"
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:paddingStart="8dip"
+        android:paddingEnd="8dip"
+        android:gravity="center_vertical"
         android:layout_weight="1"
         android:focusable="true"
-        android:background="@android:drawable/menuitem_background">
+        android:background="?android:attr/selectableItemBackground">
 
         <TextView
             android:id="@+android:id/title"
@@ -39,14 +38,14 @@
             android:layout_height="wrap_content"
             android:focusable="true"
             android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <TextView
             android:id="@+android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
+            android:layout_alignStart="@android:id/title"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:maxLines="2" />
 
@@ -57,8 +56,8 @@
         android:id="@+android:id/apn_radiobutton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="4dip"
-        android:layout_marginRight="4dip"
+        android:layout_marginStart="8dip"
+        android:layout_marginEnd="8dip"
         android:layout_gravity="center_vertical"
         android:clickable="true" />
 
diff --git a/res/layout/app_ops_details.xml b/res/layout/app_ops_details.xml
new file mode 100644
index 0000000..e3209ca
--- /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="@integer/preference_scrollbar_style">
+
+    <LinearLayout
+        android:id="@+id/all_details"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingBottom="5dip"
+        android:orientation="vertical">
+
+        <!-- App snippet -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+            android:orientation="vertical">
+
+            <!-- Application snippet label, version and icon -->
+            <include
+                layout="@layout/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 eee6165..03226ca 100644
--- a/res/layout/app_percentage_item.xml
+++ b/res/layout/app_percentage_item.xml
@@ -18,18 +18,18 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:paddingTop="8dip"
     android:paddingBottom="8dip"
     android:columnCount="3">
 
     <ImageView
         android:id="@android:id/icon"
-        android:layout_width="48dip"
-        android:layout_height="48dip"
+        android:layout_width="@android:dimen/app_icon_size"
+        android:layout_height="@android:dimen/app_icon_size"
         android:layout_rowSpan="3"
-        android:layout_marginRight="8dip"
+        android:layout_marginEnd="8dip"
         android:scaleType="centerInside"
         android:contentDescription="@null" />
 
@@ -37,20 +37,23 @@
         android:id="@android:id/title"
         android:layout_width="0dip"
         android:layout_gravity="fill_horizontal"
+        android:layout_marginTop="2dip"
         android:singleLine="true"
         android:ellipsize="marquee"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textAlignment="viewStart" />
 
     <TextView
         android:id="@android:id/text1"
-        android:layout_marginLeft="8dip"
+        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"
@@ -59,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/bluetooth_connection_access.xml b/res/layout/bluetooth_access.xml
similarity index 92%
rename from res/layout/bluetooth_connection_access.xml
rename to res/layout/bluetooth_access.xml
index 1e74162..7f42177 100644
--- a/res/layout/bluetooth_connection_access.xml
+++ b/res/layout/bluetooth_access.xml
@@ -31,8 +31,8 @@
             android:id="@+id/message"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:gravity="center_horizontal"
             android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>
diff --git a/res/layout/bluetooth_discoverable.xml b/res/layout/bluetooth_discoverable.xml
deleted file mode 100644
index fb65453..0000000
--- a/res/layout/bluetooth_discoverable.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent">
-
-    <TextView
-        android:id="@+id/message"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="20dip"
-        android:paddingRight="20dip"
-        android:gravity="center_horizontal"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-</ScrollView>
diff --git a/res/layout/bluetooth_pb_access.xml b/res/layout/bluetooth_pb_access.xml
deleted file mode 100644
index 24f0df2..0000000
--- a/res/layout/bluetooth_pb_access.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent">
-
-    <LinearLayout
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/message"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
-            android:gravity="center_horizontal"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <CheckBox android:id="@+id/bluetooth_pb_remember_choice"
-            style="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="2dip"
-            android:text="@string/bluetooth_pb_remember_choice" />
-
-    </LinearLayout>
-
-</ScrollView>
diff --git a/res/layout/bluetooth_pin_confirm.xml b/res/layout/bluetooth_pin_confirm.xml
index 5a1b41b..a768908 100644
--- a/res/layout/bluetooth_pin_confirm.xml
+++ b/res/layout/bluetooth_pin_confirm.xml
@@ -32,8 +32,8 @@
             android:id="@+id/message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:layout_marginTop="20dip"
             android:layout_marginBottom="20dip"
             android:gravity="center_vertical"
diff --git a/res/layout/bluetooth_pin_entry.xml b/res/layout/bluetooth_pin_entry.xml
index ef73a79..44d9dde 100644
--- a/res/layout/bluetooth_pin_entry.xml
+++ b/res/layout/bluetooth_pin_entry.xml
@@ -32,8 +32,8 @@
             android:id="@+id/message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:layout_marginTop="20dip"
             android:layout_marginBottom="20dip"
             android:gravity="center_vertical"
@@ -43,8 +43,8 @@
             android:id="@+id/text"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:inputType="textPassword"
             android:singleLine="true" />
 
@@ -53,8 +53,8 @@
             android:text="@string/bluetooth_pin_values_hint"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:gravity="center_vertical"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -63,8 +63,8 @@
             android:text="@string/bluetooth_enable_alphanumeric_pin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:gravity="center"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -72,8 +72,8 @@
             android:id="@+id/message_below_pin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
+            android:layout_marginStart="20dip"
+            android:layout_marginEnd="20dip"
             android:gravity="center_vertical"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
diff --git a/res/layout/bookmark_picker_item.xml b/res/layout/bookmark_picker_item.xml
index b4ffe73..113e83a 100644
--- a/res/layout/bookmark_picker_item.xml
+++ b/res/layout/bookmark_picker_item.xml
@@ -20,7 +20,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingLeft="2dip"
+    android:paddingStart="2dip"
     android:gravity="center_vertical">
 
     <ImageView android:id="@+id/icon"
@@ -33,7 +33,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:paddingLeft="6dip" />
+        android:paddingStart="6dip" />
         
 </LinearLayout>
 
diff --git a/res/layout/captioning_preview.xml b/res/layout/captioning_preview.xml
new file mode 100644
index 0000000..00d94a0
--- /dev/null
+++ b/res/layout/captioning_preview.xml
@@ -0,0 +1,49 @@
+<?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="@dimen/captioning_preview_height" >
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:contentDescription="@null"
+            android:scaleType="centerCrop"
+            android:src="@drawable/caption_background" />
+
+        <com.android.internal.widget.SubtitleView
+            android:id="@+id/preview_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|start"
+            android:layout_margin="16dp"
+            android:text="@string/captioning_preview_text" />
+    </FrameLayout>
+
+    <fragment
+        android:id="@+id/properties_fragment"
+        android:name="com.android.settings.accessibility.CaptionPropertiesFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index e979413..0c7c11b 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -49,8 +49,8 @@
         android:gravity="center"
         android:layout_gravity="center"
         android:textSize="24sp"
-        android:layout_marginLeft="30dip"
-        android:layout_marginRight="30dip"
+        android:layout_marginStart="30dip"
+        android:layout_marginEnd="30dip"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:background="@drawable/password_field_default"
         android:textColor="#ffffffff"
diff --git a/res/layout/choose_lock_pattern_tutorial.xml b/res/layout/choose_lock_pattern_tutorial.xml
deleted file mode 100644
index 742cef8..0000000
--- a/res/layout/choose_lock_pattern_tutorial.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    android:gravity="center_horizontal">
-
-    <!-- top: instructions and buttons -->
-    <!-- header message -->
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="5dip">
-
-            <!-- Top: instructions -->
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
-                android:text="@string/lock_title"
-                android:paddingBottom="10dip"
-                style="?android:attr/textAppearanceLarge"
-                android:visibility="visible"
-            />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/lock_intro_message"
-            />
-
-            <!-- bottom: lock pattern -->
-            <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
-                 android:layout_width="200dip"
-                 android:layout_height="200dip"
-                 android:layout_marginTop="10dip"
-                 android:layout_gravity="left"/>
-
-        </LinearLayout>
-
-    </ScrollView>
-
-    <LinearLayout
-        style="@style/SecurityPreferenceButtonContainer"
-        android:orientation="horizontal">
-
-        <!-- left / top button: skip, or re-try -->
-        <Button android:id="@+id/skip_button"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpattern_tutorial_cancel_label"/>
-
-        <!-- right / bottom button: confirm or ok -->
-        <Button android:id="@+id/next_button"
-            style="@style/SecurityPreferenceButton"
-            android:text="@string/lockpattern_tutorial_continue_label"/>
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/color_picker_item.xml b/res/layout/color_picker_item.xml
new file mode 100644
index 0000000..5599eb4
--- /dev/null
+++ b/res/layout/color_picker_item.xml
@@ -0,0 +1,39 @@
+<?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:gravity="center"
+    android:orientation="vertical"
+    android:paddingLeft="4dp"
+    android:paddingRight="4dp"
+    android:paddingTop="16dp" >
+
+    <ImageView
+        android:id="@+id/color_swatch"
+        android:layout_width="96dp"
+        android:layout_height="96dp"
+        android:contentDescription="@null" />
+
+    <TextView
+        android:id="@+id/summary"
+        android:layout_width="96dp"
+        android:layout_height="wrap_content"
+        android:gravity="center" />
+
+</LinearLayout>
diff --git a/res/layout/confirm_lock_password.xml b/res/layout/confirm_lock_password.xml
index c952139..b6c60c3 100644
--- a/res/layout/confirm_lock_password.xml
+++ b/res/layout/confirm_lock_password.xml
@@ -53,8 +53,8 @@
         android:gravity="center"
         android:layout_gravity="center"
         android:textSize="24sp"
-        android:layout_marginLeft="30dip"
-        android:layout_marginRight="30dip"
+        android:layout_marginStart="30dip"
+        android:layout_marginEnd="30dip"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:background="@drawable/password_field_default"
         android:textColor="#ffffffff"
@@ -83,7 +83,7 @@
 
     <LinearLayout
         style="@style/SecurityPreferenceButtonContainer"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:orientation="horizontal">
 
diff --git a/res/layout/crypt_keeper_confirm.xml b/res/layout/crypt_keeper_confirm.xml
index b197aa6..1b64909 100644
--- a/res/layout/crypt_keeper_confirm.xml
+++ b/res/layout/crypt_keeper_confirm.xml
@@ -22,8 +22,8 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dip"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginTop="16dp"
         android:layout_weight="1"
     >
diff --git a/res/layout/crypt_keeper_password_entry.xml b/res/layout/crypt_keeper_password_entry.xml
index 1278327..b26f542 100644
--- a/res/layout/crypt_keeper_password_entry.xml
+++ b/res/layout/crypt_keeper_password_entry.xml
@@ -27,8 +27,8 @@
     <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:layout_marginLeft="8dip"
-        android:layout_marginRight="8dip"
+        android:layout_marginStart="8dip"
+        android:layout_marginEnd="8dip"
         android:orientation="horizontal"
     >
         <include layout="@layout/crypt_keeper_password_field" />
diff --git a/res/layout/crypt_keeper_progress.xml b/res/layout/crypt_keeper_progress.xml
index 0d408c2..6b8e65f 100644
--- a/res/layout/crypt_keeper_progress.xml
+++ b/res/layout/crypt_keeper_progress.xml
@@ -27,7 +27,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:minHeight="48dip"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
         android:textSize="30dip"
         android:textColor="@color/title_color"
@@ -62,7 +62,7 @@
         android:layout_width="wrap_content"
         android:layout_height="0dip"
         android:layout_weight="1"
-        android:layout_gravity="bottom|right"
+        android:layout_gravity="bottom|end"
         android:src="@drawable/encroid_waiting"
         android:contentDescription="@null"
     />
diff --git a/res/layout/crypt_keeper_settings.xml b/res/layout/crypt_keeper_settings.xml
index 3239aa9..b54e0a5 100644
--- a/res/layout/crypt_keeper_settings.xml
+++ b/res/layout/crypt_keeper_settings.xml
@@ -23,8 +23,8 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dip"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginTop="16dp"
         android:layout_weight="1"
     >
diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml
index 80da437..c7264be 100644
--- a/res/layout/crypt_keeper_status.xml
+++ b/res/layout/crypt_keeper_status.xml
@@ -25,51 +25,13 @@
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
 >
-
-    <com.android.internal.widget.DigitalClock android:id="@+id/time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="8dip"
-        android:layout_gravity="center"
-        android:layout_marginBottom="8dip"
-        >
-
-        <!-- Because we can't have multi-tone fonts, we render two TextViews, one on
-        top of the other. Hence the redundant layout... -->
-        <TextView android:id="@*android:id/timeDisplayBackground"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="none"
-            android:textSize="@dimen/crypt_clock_size"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/crypt_keeper_clock_background"
-            android:layout_marginBottom="6dip"
-            />
-
-        <TextView android:id="@*android:id/timeDisplayForeground"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="none"
-            android:textSize="@dimen/crypt_clock_size"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/crypt_keeper_clock_foreground"
-            android:layout_alignLeft="@*android:id/timeDisplayBackground"
-            android:layout_alignTop="@*android:id/timeDisplayBackground"
-            android:layout_marginBottom="6dip"
-            />
-
-    </com.android.internal.widget.DigitalClock>
-
     <TextView
         android:id="@+id/status"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dip"
-        android:layout_marginLeft="8dip"
-        android:layout_marginRight="8dip"
+        android:layout_marginStart="8dip"
+        android:layout_marginEnd="8dip"
         android:textSize="18sp"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:text="@string/enter_password"
diff --git a/res/layout/custom_preference.xml b/res/layout/custom_preference.xml
index fcdc9f5..087a37c 100644
--- a/res/layout/custom_preference.xml
+++ b/res/layout/custom_preference.xml
@@ -22,7 +22,7 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <!-- <View
         android:layout_width="@dimen/preference_widget_width"
@@ -31,8 +31,8 @@
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="6dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="6dip"
+        android:layout_marginEnd="6dip"
         android:layout_marginTop="6dip"
         android:layout_marginBottom="6dip"
         android:layout_weight="1">
@@ -49,7 +49,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
+            android:layout_alignStart="@android:id/title"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorSecondary"
             android:maxLines="4" />
diff --git a/res/layout/data_usage_app_title.xml b/res/layout/data_usage_app_title.xml
index baaa685..272d8f2 100644
--- a/res/layout/data_usage_app_title.xml
+++ b/res/layout/data_usage_app_title.xml
@@ -19,4 +19,5 @@
     android:layout_height="wrap_content"
     android:singleLine="true"
     android:ellipsize="marquee"
-    android:textAppearance="?android:attr/textAppearanceMedium" />
+    android:textAppearance="?android:attr/textAppearanceMedium"
+    android:textAlignment="viewStart" />
diff --git a/res/layout/data_usage_bytes_editor.xml b/res/layout/data_usage_bytes_editor.xml
index ec6e64f..8de7450 100644
--- a/res/layout/data_usage_bytes_editor.xml
+++ b/res/layout/data_usage_bytes_editor.xml
@@ -26,8 +26,8 @@
         android:minWidth="48dip"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
+        android:layout_marginStart="16dip"
+        android:layout_marginEnd="16dip"
         android:focusable="true"
         android:focusableInTouchMode="true" />
 
diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml
index 2501e9d..cec2af2 100644
--- a/res/layout/data_usage_chart.xml
+++ b/res/layout/data_usage_chart.xml
@@ -20,11 +20,11 @@
     android:id="@+id/chart"
     android:layout_width="match_parent"
     android:layout_height="@dimen/data_usage_chart_height"
-    android:layout_marginLeft="-16dip"
-    android:layout_marginRight="-16dip"
+    android:layout_marginStart="-16dip"
+    android:layout_marginEnd="-16dip"
     android:layout_marginBottom="-32dip"
-    android:paddingLeft="24dip"
-    android:paddingRight="24dip"
+    android:paddingStart="24dip"
+    android:paddingEnd="24dip"
     android:paddingTop="16dip"
     android:paddingBottom="48dip"
     settings:optimalWidth="@dimen/data_usage_chart_optimalWidth"
@@ -34,7 +34,7 @@
         android:id="@+id/grid"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="left|bottom"
+        android:layout_gravity="start|bottom"
         settings:primaryDrawable="@drawable/data_grid_primary"
         settings:secondaryDrawable="@drawable/data_grid_secondary"
         settings:borderDrawable="@drawable/data_grid_border"
@@ -44,7 +44,7 @@
         android:id="@+id/series"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="left|bottom"
+        android:layout_gravity="start|bottom"
         settings:strokeColor="@android:color/holo_blue_light"
         settings:fillColor="#c033b5e5"
         settings:fillColorSecondary="#6633b5e5" />
@@ -53,7 +53,7 @@
         android:id="@+id/detail_series"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="left|bottom"
+        android:layout_gravity="start|bottom"
         settings:strokeColor="#d88d3a"
         settings:fillColor="#c0ba7f3e"
         settings:fillColorSecondary="#60ba7f3e" />
diff --git a/res/layout/data_usage_cycle_editor.xml b/res/layout/data_usage_cycle_editor.xml
index dffbe18..ff5fceb 100644
--- a/res/layout/data_usage_cycle_editor.xml
+++ b/res/layout/data_usage_cycle_editor.xml
@@ -32,8 +32,8 @@
         android:layout_width="48dip"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
+        android:layout_marginStart="16dip"
+        android:layout_marginEnd="16dip"
         android:focusable="true"
         android:focusableInTouchMode="true" />
 
diff --git a/res/layout/data_usage_cycles.xml b/res/layout/data_usage_cycles.xml
index c9647c8..2a67d6b 100644
--- a/res/layout/data_usage_cycles.xml
+++ b/res/layout/data_usage_cycles.xml
@@ -20,8 +20,8 @@
     android:layout_height="40dip"
     android:orientation="horizontal"
     android:gravity="center_vertical"
-    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-    android:paddingRight="?android:attr/listPreferredItemPaddingRight">
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/res/layout/data_usage_detail.xml b/res/layout/data_usage_detail.xml
index 6c09d09..6826764 100644
--- a/res/layout/data_usage_detail.xml
+++ b/res/layout/data_usage_detail.xml
@@ -24,8 +24,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft"
-        android:layout_marginRight="?android:attr/listPreferredItemPaddingRight"
+        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
         android:orientation="horizontal">
 
         <LinearLayout
@@ -33,7 +33,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_marginTop="8dip"
-            android:layout_marginRight="8dip"
+            android:layout_marginEnd="8dip"
             android:orientation="vertical">
 
             <ImageView
@@ -48,29 +48,36 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dip"
-                android:orientation="vertical" />
+                android:orientation="vertical"
+                android:textAlignment="viewStart" />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dip"
                 android:textColor="#d88d3a"
-                android:text="@string/data_usage_label_foreground" />
+                android:text="@string/data_usage_label_foreground"
+                android:textAlignment="viewStart" />
+
             <TextView
                 android:id="@+id/app_foreground"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="#d88d3a" />
+                android:textColor="#d88d3a"
+                android:textAlignment="viewStart" />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dip"
-                android:text="@string/data_usage_label_background" />
+                android:text="@string/data_usage_label_background"
+                android:textAlignment="viewStart" />
+
             <TextView
                 android:id="@+id/app_background"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:textAlignment="viewStart" />
 
         </LinearLayout>
 
@@ -85,8 +92,8 @@
         android:id="@+id/app_settings"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft"
-        android:layout_marginRight="?android:attr/listPreferredItemPaddingRight"
+        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+        android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
         android:layout_marginTop="16dip"
         android:layout_marginBottom="16dip"
         android:text="@string/data_usage_app_settings" />
diff --git a/res/layout/data_usage_header.xml b/res/layout/data_usage_header.xml
index 619956d..0a8006b 100644
--- a/res/layout/data_usage_header.xml
+++ b/res/layout/data_usage_header.xml
@@ -41,8 +41,8 @@
         android:id="@+id/usage_summary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
         android:paddingTop="8dip"
         android:paddingBottom="8dip"
         android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -52,8 +52,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
         android:paddingBottom="8dip"
         android:text="@string/data_usage_empty"
         android:textAppearance="?android:attr/textAppearanceSmall" />
diff --git a/res/layout/data_usage_summary.xml b/res/layout/data_usage_summary.xml
index b754d0c..1cad648 100644
--- a/res/layout/data_usage_summary.xml
+++ b/res/layout/data_usage_summary.xml
@@ -29,16 +29,17 @@
 
         <!-- give an empty content area to make tabhost happy -->
         <FrameLayout
+            style="@style/PreferenceFragmentListSinglePane"
             android:id="@android:id/tabcontent"
             android:layout_width="0dip"
             android:layout_height="0dip" />
 
         <ListView
             android:id="@android:id/list"
+            style="@style/PreferenceFragmentListSinglePane"
             android:layout_width="match_parent"
             android:layout_height="0dip"
             android:layout_weight="1"
-            android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle"
             android:clipChildren="false"
             android:clipToPadding="false"
             android:smoothScrollbar="false" />
diff --git a/res/layout/date_time_settings_setupwizard.xml b/res/layout/date_time_settings_setupwizard.xml
index d05098a..7227f2b 100644
--- a/res/layout/date_time_settings_setupwizard.xml
+++ b/res/layout/date_time_settings_setupwizard.xml
@@ -23,8 +23,8 @@
     <View
         android:id="@+id/timezone_dropdown_anchor"
         android:layout_width="match_parent"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip"
+        android:layout_marginStart="20dip"
+        android:layout_marginEnd="20dip"
         android:layout_height="0px" />
 
     <LinearLayout android:layout_height="0px"
@@ -45,7 +45,7 @@
         <Button android:id="@+id/next_button"
             android:layout_width="150dip"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:text="@string/next_label"
         />
 
diff --git a/res/layout/date_time_setup_custom_list_item_2.xml b/res/layout/date_time_setup_custom_list_item_2.xml
index 623ac32..ed32fb7 100644
--- a/res/layout/date_time_setup_custom_list_item_2.xml
+++ b/res/layout/date_time_setup_custom_list_item_2.xml
@@ -27,7 +27,7 @@
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:minHeight="16dip"
-              android:layout_marginLeft="10dip"
+              android:layout_marginStart="10dip"
               android:textAppearance="?android:attr/textAppearanceMedium"
               />
 
@@ -36,7 +36,7 @@
               android:layout_height="wrap_content"
               android:minHeight="10dip"
               android:layout_below="@android:id/text1"
-              android:layout_alignLeft="@android:id/text1"
+              android:layout_alignStart="@android:id/text1"
               android:textAppearance="?android:attr/textAppearanceSmall"
               />
 
diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml
index 3b4824f..c54ecce 100644
--- a/res/layout/device_admin_add.xml
+++ b/res/layout/device_admin_add.xml
@@ -25,8 +25,8 @@
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1.0"
-        android:paddingLeft="16dip"
-        android:paddingRight="16dip"
+        android:paddingStart="16dip"
+        android:paddingEnd="16dip"
         android:scrollbarStyle="outsideOverlay"
         android:gravity="top">
         <LinearLayout
@@ -42,7 +42,7 @@
                 <ImageView android:id="@+id/admin_icon"
                     android:layout_width="@android:dimen/app_icon_size"
                     android:layout_height="@android:dimen/app_icon_size"
-                    android:layout_marginRight="16dip"
+                    android:layout_marginEnd="16dip"
                     android:layout_gravity="center_vertical"
                     android:scaleType="fitCenter"
                     android:contentDescription="@null" />
@@ -94,8 +94,8 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:orientation="vertical"
-                    android:paddingLeft="16dip"
-                    android:paddingRight="12dip" />
+                    android:paddingStart="16dip"
+                    android:paddingEnd="12dip" />
             </LinearLayout>
 
         </LinearLayout>
@@ -121,7 +121,7 @@
                 android:visibility="gone" />
             <Button android:id="@+id/cancel_button"
                 android:layout_width="0dip"
-                android:layout_gravity="right"
+                android:layout_gravity="end"
                 android:layout_weight="1"
                 android:maxLines="2"
                 android:text="@string/cancel"
@@ -129,7 +129,7 @@
                 android:layout_height="wrap_content" />
             <Button android:id="@+id/action_button"
                 android:layout_width="0dip"
-                android:layout_gravity="left"
+                android:layout_gravity="start"
                 android:layout_weight="1"
                 android:maxLines="2"
                 style="?android:attr/buttonBarButtonStyle"
diff --git a/res/layout/device_admin_item.xml b/res/layout/device_admin_item.xml
index 24dab5e..56be346 100644
--- a/res/layout/device_admin_item.xml
+++ b/res/layout/device_admin_item.xml
@@ -22,8 +22,8 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
-    android:paddingRight="6dip"
-    android:paddingLeft="6dip"
+    android:paddingEnd="6dip"
+    android:paddingStart="6dip"
     android:gravity="center_vertical" >
 
     <LinearLayout
@@ -63,7 +63,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dip"
             android:layout_below="@id/name"
-            android:layout_alignLeft="@id/name"
+            android:layout_alignStart="@id/name"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorSecondary"
             android:maxLines="4" />
@@ -75,8 +75,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginRight="16dip"
-        android:layout_marginLeft="16dip"
+        android:layout_marginEnd="16dip"
+        android:layout_marginStart="16dip"
         android:focusable="false"
         android:clickable="false" />
 
diff --git a/res/layout/dialog_edittext.xml b/res/layout/dialog_edittext.xml
index 80911da..0da47a9 100644
--- a/res/layout/dialog_edittext.xml
+++ b/res/layout/dialog_edittext.xml
@@ -17,8 +17,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:paddingLeft="8dip"
-    android:paddingRight="8dip">
+    android:paddingStart="8dip"
+    android:paddingEnd="8dip">
     
     <EditText 
         android:id="@+id/edittext"
diff --git a/res/layout/dock_audio_media_enable_dialog.xml b/res/layout/dock_audio_media_enable_dialog.xml
new file mode 100644
index 0000000..37ecdfe
--- /dev/null
+++ b/res/layout/dock_audio_media_enable_dialog.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<CheckBox
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dock_audio_media_enable_cb"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:text="@string/bluetooth_dock_settings_a2dp"
+    android:focusable="true"
+    android:clickable="true" />
diff --git a/res/layout/dream_info_row.xml b/res/layout/dream_info_row.xml
new file mode 100644
index 0000000..e8dd824
--- /dev/null
+++ b/res/layout/dream_info_row.xml
@@ -0,0 +1,104 @@
+<!--
+     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.
+-->
+<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:clickable="true"
+        android:focusable="true"
+        android:background="?android:attr/selectableItemBackground" >
+
+        <!-- Dream icon -->
+
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="@android:dimen/app_icon_size"
+            android:layout_height="@android:dimen/app_icon_size"
+            android:layout_centerVertical="true"
+            android:layout_marginBottom="10dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="6dp"
+            android:layout_marginTop="10dp"
+            android:contentDescription="@null"
+            android:maxHeight="@android:dimen/app_icon_size"
+            android:maxWidth="@android:dimen/app_icon_size"
+            android:scaleType="fitCenter" />
+
+        <!-- Dream caption -->
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="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/textAppearanceMedium"
+            android:textAlignment="viewStart"
+            android:labelFor="@android:id/button2" />
+
+        <!-- Dream radio button -->
+
+        <RadioButton
+            android:id="@android:id/button1"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:duplicateParentState="true"
+            android:clickable="false"
+            android:focusable="false" />
+    </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:clickable="true"
+        android:focusable="true"
+        android:src="@drawable/ic_bt_config" />
+
+</RelativeLayout>
diff --git a/res/layout/dream_picker_row.xml b/res/layout/dream_picker_row.xml
deleted file mode 100644
index 18fe4f0..0000000
--- a/res/layout/dream_picker_row.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-<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:paddingLeft="2dip"
-    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:scaleType="fitCenter"
-        android:contentDescription="@null" />
-
-    <TextView android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:paddingLeft="6dip" />
-        
-</LinearLayout>
-
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/empty_print_state.xml b/res/layout/empty_print_state.xml
new file mode 100644
index 0000000..6a82703
--- /dev/null
+++ b/res/layout/empty_print_state.xml
@@ -0,0 +1,49 @@
+<?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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/empty_print_state"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:visibility="gone">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dip"
+            android:src="@drawable/ic_grayedout_printer"
+            android:contentDescription="@null">
+        </ImageView>
+
+        <TextView
+            android:id="@+id/message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="?android:attr/textColorSecondary"
+            android:importantForAccessibility="no">
+        </TextView>
+
+    </LinearLayout>
+
+</FrameLayout>
diff --git a/res/layout/empty_printers_list_service_enabled.xml b/res/layout/empty_printers_list_service_enabled.xml
new file mode 100644
index 0000000..78c8b43
--- /dev/null
+++ b/res/layout/empty_printers_list_service_enabled.xml
@@ -0,0 +1,55 @@
+<?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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/empty_printers_list_service_enabled"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:visibility="gone">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dip"
+            android:src="@drawable/ic_grayedout_printer"
+            android:contentDescription="@string/print_searching_for_printers">
+        </ImageView>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="?android:attr/textColorSecondary"
+            android:text="@string/print_searching_for_printers">
+        </TextView>
+
+        <ProgressBar
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:indeterminate="true"
+            style="@android:style/Widget.Holo.ProgressBar.Horizontal">
+        </ProgressBar>
+
+    </LinearLayout>
+
+</FrameLayout>
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/grid_picker_dialog.xml b/res/layout/grid_picker_dialog.xml
new file mode 100644
index 0000000..a52f079
--- /dev/null
+++ b/res/layout/grid_picker_dialog.xml
@@ -0,0 +1,38 @@
+<?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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <GridView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:columnWidth="112dp"
+        android:numColumns="auto_fit"
+        android:scrollbarStyle="insideOverlay"
+        android:stretchMode="spacingWidthUniform" />
+
+    <!-- HACK: Setting minHeight has no effect within a dialog layout,
+         so this view keeps the minimum height above 300dp. -->
+    <View
+        android:layout_width="0dp"
+        android:layout_height="300dp"
+        android:visibility="invisible" />
+
+</FrameLayout>
diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index d69f98a..347c12b 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -19,12 +19,14 @@
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:clipToPadding="false"
+    android:scrollbarStyle="@integer/preference_scrollbar_style">
+
     <LinearLayout
         android:id="@+id/all_details"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingRight="6dip"
         android:paddingBottom="5dip"
         android:orientation="vertical">
 
@@ -33,28 +35,31 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:orientation="vertical"
-            android:paddingRight="6dip"
-            android:paddingLeft="6dip"
-            android:paddingTop="5dip"
-            android:paddingBottom="5dip" >
+            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"/>
+                android:id="@+id/app_snippet" />
 
             <!-- Force stop and uninstall buttons -->
             <include
                 layout="@layout/two_buttons_panel"
                 android:id="@+id/control_buttons_panel"/>
 
+            <!-- Force stop and uninstall buttons -->
+            <include
+                layout="@layout/two_buttons_panel"
+                android:id="@+id/more_control_buttons_panel"/>
+
             <!-- Ban notifications for this package -->
             <CheckBox android:id="@+id/notification_switch"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="12dip"
-                android:layout_gravity="left"
+                android:layout_gravity="start"
+                android:layout_marginTop="4dip"
                 android:text="@string/app_notifications_switch_label" />
 
         </LinearLayout>
@@ -67,8 +72,9 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="6dip"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -82,9 +88,7 @@
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1"
-                    android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
-
+                    android:paddingTop="6dip" />
                 <ImageView
                     android:id="@+id/info_size_dots"
                     android:src="@drawable/dotted_line_480px"
@@ -92,21 +96,20 @@
                     android:layout_weight="1"
                     android:layout_height="1px"
                     android:layout_gravity="bottom"
-                    android:layout_marginLeft="1dip"
-                    android:layout_marginRight="1dip"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
                     android:layout_marginBottom="4dip"
                     android:scaleType="center"
                     android:contentDescription="@null" />
                 <TextView
                     android:id="@+id/total_size_text"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
-
             </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -120,8 +123,7 @@
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1"
-                    android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
+                    android:paddingTop="6dip" />
                 <ImageView
                     android:id="@+id/info_size_dots"
                     android:src="@drawable/dotted_line_480px"
@@ -129,8 +131,8 @@
                     android:layout_weight="1"
                     android:layout_height="1px"
                     android:layout_gravity="bottom"
-                    android:layout_marginLeft="1dip"
-                    android:layout_marginRight="1dip"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
                     android:layout_marginBottom="4dip"
                     android:scaleType="center"
                     android:contentDescription="@null" />
@@ -138,11 +140,9 @@
                     android:id="@+id/application_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
-
             </LinearLayout>
 
             <LinearLayout
@@ -158,8 +158,7 @@
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1"
-                    android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
+                    android:paddingTop="6dip" />
                 <ImageView
                     android:id="@+id/info_size_dots"
                     android:src="@drawable/dotted_line_480px"
@@ -167,8 +166,8 @@
                     android:layout_weight="1"
                     android:layout_height="1px"
                     android:layout_gravity="bottom"
-                    android:layout_marginLeft="1dip"
-                    android:layout_marginRight="1dip"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
                     android:layout_marginBottom="4dip"
                     android:scaleType="center"
                     android:contentDescription="@null" />
@@ -176,11 +175,9 @@
                     android:id="@+id/external_code_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
-
             </LinearLayout>
 
             <LinearLayout
@@ -197,8 +194,7 @@
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1"
-                    android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
+                    android:paddingTop="6dip" />
                 <ImageView
                     android:id="@+id/info_size_dots"
                     android:src="@drawable/dotted_line_480px"
@@ -206,8 +202,8 @@
                     android:layout_weight="1"
                     android:layout_height="1px"
                     android:layout_gravity="bottom"
-                    android:layout_marginLeft="1dip"
-                    android:layout_marginRight="1dip"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
                     android:layout_marginBottom="4dip"
                     android:scaleType="center"
                     android:contentDescription="@null" />
@@ -215,11 +211,9 @@
                     android:id="@+id/data_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
-
             </LinearLayout>
 
             <LinearLayout
@@ -235,8 +229,7 @@
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1"
-                    android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
+                    android:paddingTop="6dip" />
                 <ImageView
                     android:id="@+id/info_size_dots"
                     android:src="@drawable/dotted_line_480px"
@@ -244,8 +237,8 @@
                     android:layout_weight="1"
                     android:layout_height="1px"
                     android:layout_gravity="bottom"
-                    android:layout_marginLeft="1dip"
-                    android:layout_marginRight="1dip"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
                     android:layout_marginBottom="4dip"
                     android:scaleType="center"
                     android:contentDescription="@null" />
@@ -253,11 +246,9 @@
                     android:id="@+id/external_data_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
-
             </LinearLayout>
 
             <!-- Clear data and install location buttons  -->
@@ -284,6 +275,8 @@
                 android:orientation="horizontal"
                 android:baselineAligned="true"
                 android:layout_below="@id/cache_header"
+                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
                 android:paddingTop="-1dip">
                 <TextView
                     android:text="@string/cache_size_label"
@@ -292,16 +285,15 @@
                     android:maxLines="1"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:gravity="center_vertical"
-                    android:paddingLeft="6dip"/>
+                    android:gravity="center_vertical" />
                 <ImageView
                     android:src="@drawable/dotted_line_480px"
                     android:layout_width="0dip"
                     android:layout_weight="1"
                     android:layout_height="1px"
                     android:layout_gravity="bottom"
-                    android:layout_marginLeft="1dip"
-                    android:layout_marginRight="1dip"
+                    android:layout_marginStart="1dip"
+                    android:layout_marginEnd="1dip"
                     android:layout_marginBottom="4dip"
                     android:scaleType="center"
                     android:contentDescription="@null" />
@@ -309,19 +301,36 @@
                     android:id="@+id/cache_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
             </LinearLayout>
 
-            <Button android:id="@+id/clear_cache_button"
-                android:layout_alignParentRight="true"
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_below="@id/cache_size"
-                android:layout_centerHorizontal="true"
-                android:layout_width="200dip"
-                android:text="@string/clear_cache_btn_text"
-                android:layout_height="wrap_content" />
+                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+                android:paddingTop="4dip"
+                android:orientation="horizontal">
+                <View
+                    android:layout_width="120dip"
+                    android:layout_height="0dip"
+                    android:layout_weight="0.4" />
+                <View
+                    android:layout_width="0dip"
+                    android:layout_height="0dip"
+                    android:visibility="invisible"
+                    android:layout_weight="0.2" />
+                <Button
+                    android:id="@+id/clear_cache_button"
+                    android:layout_width="120dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.4"
+                    android:text="@string/clear_cache_btn_text" />
+            </LinearLayout>
+
         </RelativeLayout>
 
         <!-- Prefered activities section -->
@@ -333,22 +342,38 @@
         <RelativeLayout 
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical">
+            android:layout_gravity="center_vertical"
+            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
             <TextView android:id="@+id/auto_launch"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="6dip"
-                android:paddingRight="6dip"
-                android:paddingLeft="6dip" />
-            <Button android:id="@+id/clear_activities_button"
-                android:layout_alignParentRight="true"
+                android:paddingTop="6dip" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_below="@id/auto_launch"
-                android:layout_centerHorizontal="true"
-                android:layout_width="200dip"
-                android:text="@string/clear_activities"
-                android:layout_height="wrap_content" />
+                android:paddingTop="4dip"
+                android:orientation="horizontal">
+                <View
+                    android:layout_width="120dip"
+                    android:layout_height="0dip"
+                    android:layout_weight="0.4" />
+                <View
+                    android:layout_width="0dip"
+                    android:layout_height="0dip"
+                    android:visibility="invisible"
+                    android:layout_weight="0.2" />
+                <Button
+                    android:id="@+id/clear_activities_button"
+                    android:layout_width="120dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.4"
+                    android:text="@string/clear_activities" />
+            </LinearLayout>
         </RelativeLayout>
 
         <!-- Screen compatibility section -->
@@ -362,24 +387,24 @@
                 android:text="@string/screen_compatibility_label" />
 
             <TextView android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingTop="6dip"
-                android:paddingRight="6dip"
-                android:paddingLeft="6dip"
+                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
                 android:text="@string/screen_compatibility_text"/>
             <CheckBox android:id="@+id/ask_compatibility_cb"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="12dip"
-                android:layout_gravity="left"
+                android:layout_marginStart="12dip"
+                android:layout_gravity="start"
                 android:text="@string/ask_compatibility" />
             <CheckBox android:id="@+id/enable_compatibility_cb"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="12dip"
-                android:layout_gravity="left"
+                android:layout_marginStart="12dip"
+                android:layout_gravity="start"
                 android:text="@string/enable_compatibility" />
         </LinearLayout>
 
@@ -393,12 +418,38 @@
                 style="?android:attr/listSeparatorTextViewStyle"
                 android:layout_marginTop="8dip"
                 android:text="@string/permissions_label" />
+            <TextView android:id="@+id/security_settings_billing_desc"
+                android:text="@string/security_settings_billing_desc"
+                android:textColor="#ffffb060"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:paddingTop="6dip"
+                android:paddingBottom="6dip"
+                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+            <LinearLayout
+                android:id="@+id/security_settings_billing_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/security_settings_premium_sms_desc" />
+                <Spinner
+                    android:id="@+id/security_settings_premium_sms_list"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:spinnerMode="dropdown" />
+            </LinearLayout>
             <TextView android:id="@+id/security_settings_desc"
                 android:text="@string/security_settings_desc"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:paddingTop="6dip"
-                android:paddingLeft="6dip"
                 android:paddingBottom="6dip"
+                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
             <LinearLayout
diff --git a/res/layout/intent_sender.xml b/res/layout/intent_sender.xml
index 8a85bf8..bf8fd64 100644
--- a/res/layout/intent_sender.xml
+++ b/res/layout/intent_sender.xml
@@ -18,8 +18,8 @@
 */
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:paddingLeft="6dip"
-    android:paddingRight="6dip"
+    android:paddingStart="6dip"
+    android:paddingEnd="6dip"
     android:paddingBottom="3dip"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/res/layout/keyguard_appwidget_item.xml b/res/layout/keyguard_appwidget_item.xml
new file mode 100755
index 0000000..de0c855
--- /dev/null
+++ b/res/layout/keyguard_appwidget_item.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content" >
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:background="@drawable/appwidget_item_bg"
+    android:layout_marginTop="2dip"
+    android:layout_marginBottom="2dip"
+    android:layout_marginLeft="2dip"
+    android:layout_marginRight="2dip"
+    android:paddingLeft="16dip"
+    android:paddingRight="16dip"
+    android:paddingTop="16dip"
+    android:paddingBottom="16dip" >
+      <ImageView
+       android:id="@+id/icon"
+       android:layout_width="@dimen/appwidget_preview_width"
+       android:layout_height="@dimen/appwidget_preview_height"
+       android:scaleType="center" />
+      <TextView
+       android:id="@+id/label"
+       style="@style/KeyguardAppWidgetItem"
+       android:layout_width="match_parent"
+       android:layout_height="match_parent"
+       android:paddingLeft="24dip"
+       android:paddingBottom="8dip"
+       android:gravity="left|bottom" />
+  </LinearLayout>
+</FrameLayout>
diff --git a/res/layout/keyguard_appwidget_picker_layout.xml b/res/layout/keyguard_appwidget_picker_layout.xml
new file mode 100644
index 0000000..e533672
--- /dev/null
+++ b/res/layout/keyguard_appwidget_picker_layout.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/layout_root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="@dimen/keyguard_appwidget_picker_margin_left"
+        android:paddingRight="@dimen/keyguard_appwidget_picker_margin_right"
+        android:paddingTop="2dip"
+        android:paddingBottom="2dip"
+        android:orientation="vertical" >
+  <GridView android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:numColumns="@integer/keyguard_appwidget_picker_cols"
+            android:layout_gravity="center_horizontal"
+            android:listSelector="@android:color/transparent"
+            android:id="@+id/widget_list" />
+</LinearLayout>
diff --git a/res/layout/location_list_no_item.xml b/res/layout/location_list_no_item.xml
new file mode 100644
index 0000000..5489a50
--- /dev/null
+++ b/res/layout/location_list_no_item.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.
+-->
+
+<!-- text that appears when the recent app list is empty -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:background="?android:attr/selectableItemBackground" >
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dip"
+        android:layout_marginEnd="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
+
+        <TextView android:id="@+android:id/title"
+            android:gravity="center"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary" />
+
+    </RelativeLayout>
+
+</LinearLayout>
+
diff --git a/res/layout/manage_accounts_screen.xml b/res/layout/manage_accounts_screen.xml
index 2717805..12158b9 100644
--- a/res/layout/manage_accounts_screen.xml
+++ b/res/layout/manage_accounts_screen.xml
@@ -27,9 +27,8 @@
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1"
-        android:drawSelectorOnTop="false"
-        android:scrollbarAlwaysDrawVerticalTrack="true"
-    />
+        android:clipToPadding="false"
+        android:scrollbarStyle="@integer/preference_scrollbar_style" />
 
     <TextView android:id="@+id/sync_settings_error_info"
         android:layout_width="match_parent"
diff --git a/res/layout/manage_applications_apps.xml b/res/layout/manage_applications_apps.xml
index 51ab412..6f4bf10 100644
--- a/res/layout/manage_applications_apps.xml
+++ b/res/layout/manage_applications_apps.xml
@@ -30,7 +30,8 @@
                 android:drawSelectorOnTop="false"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle" />
+                android:clipToPadding="false"
+                android:scrollbarStyle="@integer/preference_scrollbar_style" />
             <TextView android:id="@android:id/empty"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -38,8 +39,14 @@
                     android:text="@string/no_applications"
                     android:textAppearance="?android:attr/textAppearanceLarge" />
         </FrameLayout>
+        <!-- Force layout direction to LTR for now as we want the text to be at the same position in
+             any Locale included the RTL ones. Will need to fix LinearColorBar RTL support later.
+             Please also note the left/right gravities that would also need to be changed for proper
+             RTL support -->
         <view class="com.android.settings.applications.LinearColorBar"
                 android:id="@+id/storage_color_bar"
+                android:layout_marginStart="@dimen/settings_side_margin"
+                android:layout_marginEnd="@dimen/settings_side_margin"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="-5dp"
@@ -47,15 +54,13 @@
                 android:clipChildren="false"
                 android:clipToPadding="false"
                 android:paddingTop="30dp"
-                android:paddingLeft="4dp"
-                android:paddingRight="4dp"
                 android:paddingBottom="1dp"
-                android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
-                android:layout_marginRight="@*android:dimen/preference_fragment_padding_side">
+                android:layoutDirection="ltr">
             <TextView android:id="@+id/usedStorageText"
                 android:layout_width="0px"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:gravity="left"
                 android:textAppearance="?android:attr/textAppearanceSmallInverse"
                 android:textColor="#000"
                 android:singleLine="true" />
@@ -72,7 +77,7 @@
                 android:singleLine="true"
                 android:text="@string/internal_storage" />
             <TextView android:id="@+id/freeStorageText"
-                android:layout_gravity="center_vertical|right"
+                android:layout_gravity="center_vertical|end"
                 android:layout_width="0px"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -87,8 +92,6 @@
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
-            android:layout_marginRight="@*android:dimen/preference_fragment_padding_side"
             android:visibility="gone"
             android:gravity="center">
 
diff --git a/res/layout/manage_applications_content.xml b/res/layout/manage_applications_content.xml
index 96ddeb3..90b2cba 100644
--- a/res/layout/manage_applications_content.xml
+++ b/res/layout/manage_applications_content.xml
@@ -18,7 +18,6 @@
 */
 -->
 
-
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -35,7 +34,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"
-                android:textAppearance="@style/TextAppearance.PagerTabs">
+                android:textAppearance="@style/TextAppearance.PagerTabs"
+                android:padding="0dp">
         </android.support.v4.view.PagerTabStrip>
     </android.support.v4.view.ViewPager>
 
diff --git a/res/layout/manage_applications_item.xml b/res/layout/manage_applications_item.xml
index 6708647..bf93840 100755
--- a/res/layout/manage_applications_item.xml
+++ b/res/layout/manage_applications_item.xml
@@ -17,68 +17,55 @@
 */
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:orientation="horizontal"
-    android:paddingRight="6dip"
-    android:paddingLeft="6dip"
-    android:paddingTop="5dip"
-    android:paddingBottom="5dip"
-    android:gravity="center_vertical" >
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingTop="8dip"
+    android:paddingBottom="8dip"
+    android:columnCount="4">
 
-    <ImageView android:id="@+id/app_icon"
+    <ImageView
+        android:id="@+id/app_icon"
         android:layout_width="@android:dimen/app_icon_size"
         android:layout_height="@android:dimen/app_icon_size"
-        android:layout_marginRight="11dip"
-        android:layout_gravity="center_vertical"
-        android:scaleType="fitCenter"
-        android:contentDescription="@null"/>
+        android:layout_rowSpan="2"
+        android:layout_marginEnd="8dip"
+        android:scaleType="centerInside"
+        android:contentDescription="@null" />
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="0px"
-        android:layout_weight="1"
-        android:layout_height="wrap_content" >
-        <TextView android:id="@+id/app_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textStyle="bold"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:layout_marginBottom="2dip" />
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:baselineAlignedChildIndex="0" >
-            <TextView android:id="@+id/app_size"
-                android:layout_marginTop="-4dip"
-                android:layout_gravity="center_vertical|left"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-            <TextView android:id="@+id/app_disabled"
-                android:layout_marginTop="-4dip"
-                android:layout_gravity="center_vertical|right"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:visibility="gone"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:text="@string/disabled" />
-        </LinearLayout>
-    </LinearLayout>
-    
+    <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" />
+
     <CheckBox android:id="@+id/app_on_sdcard"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
+        android:layout_marginStart="8dip"
         android:layout_gravity="center_vertical"
+        android:layout_rowSpan="2"
         android:visibility="gone"
         android:clickable="false"
         android:focusable="false" />
-</LinearLayout>
+
+    <TextView
+        android:id="@+id/app_size"
+        android:layout_width="0dip"
+        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/manage_applications_running.xml b/res/layout/manage_applications_running.xml
index 634de1c..352ce44 100644
--- a/res/layout/manage_applications_running.xml
+++ b/res/layout/manage_applications_running.xml
@@ -27,8 +27,6 @@
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
-            android:layout_marginRight="@*android:dimen/preference_fragment_padding_side"
             android:visibility="gone"
             android:gravity="center">
 
diff --git a/res/layout/master_clear.xml b/res/layout/master_clear.xml
index 268daa0..db62936 100644
--- a/res/layout/master_clear.xml
+++ b/res/layout/master_clear.xml
@@ -23,8 +23,8 @@
     <ScrollView
             android:layout_width="match_parent"
             android:layout_height="0dip"
-            android:layout_marginLeft="12dp"
-            android:layout_marginRight="12dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
             android:layout_marginTop="12dp"
             android:layout_weight="1">
         <LinearLayout android:layout_width="match_parent"
@@ -70,7 +70,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:paddingRight="8dp"
+                        android:paddingEnd="8dp"
                         android:focusable="false"
                         android:clickable="false"
                         android:duplicateParentState="true" />
diff --git a/res/layout/master_clear_confirm.xml b/res/layout/master_clear_confirm.xml
index 0599b10..6e50278 100644
--- a/res/layout/master_clear_confirm.xml
+++ b/res/layout/master_clear_confirm.xml
@@ -22,8 +22,8 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
         android:layout_marginTop="12dp"
         android:textSize="20sp"
         android:text="@string/master_clear_final_desc" />
diff --git a/res/layout/nfc_payment.xml b/res/layout/nfc_payment.xml
new file mode 100644
index 0000000..d6f9fa4
--- /dev/null
+++ b/res/layout/nfc_payment.xml
@@ -0,0 +1,45 @@
+<FrameLayout 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"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:orientation="vertical" >
+        <ImageView
+            android:id="@+id/nfc_payment_tap_image"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:visibility="gone"
+            android:src="@drawable/nfc_payment_empty_state"/>
+        <TextView
+            android:id="@+id/nfc_payment_empty_text"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textSize="24sp"
+            android:visibility="gone"
+            android:paddingTop="16dp"
+            android:text="@string/nfc_payment_no_apps"/>
+        <TextView
+            android:id="@+id/nfc_payment_learn_more"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:clickable="true"
+            android:textSize="20sp"
+            android:textStyle="italic"
+            android:visibility="gone"
+            android:textColor="@android:color/holo_blue_light"
+            android:paddingTop="16dp"
+            android:text="@string/nfc_payment_learn_more"/>
+    </LinearLayout>
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="5dp" />
+
+</FrameLayout>
diff --git a/res/layout/nfc_payment_option.xml b/res/layout/nfc_payment_option.xml
new file mode 100644
index 0000000..04fdc07
--- /dev/null
+++ b/res/layout/nfc_payment_option.xml
@@ -0,0 +1,51 @@
+<?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="match_parent"
+    android:layout_weight="1"
+    android:id="@+id/nfc_payment_pref"
+    android:focusable="true"
+    android:clickable="true"
+    android:gravity="center_vertical"
+    android:paddingTop="10dp"
+    android:paddingBottom="10dp"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:background="?android:attr/selectableItemBackground">
+    <FrameLayout
+        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="@+id/banner"
+            android:layout_gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="96dp"
+            android:scaleType="centerInside"
+                />
+    </FrameLayout>
+    <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>
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 1001a21..35f04d8 100644
--- a/res/layout/ownerinfo.xml
+++ b/res/layout/ownerinfo.xml
@@ -15,8 +15,8 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:paddingLeft="6dip"
-    android:paddingRight="6dip"
+    android:paddingStart="6dip"
+    android:paddingEnd="6dip"
     android:layout_width="match_parent" android:layout_height="wrap_content"
     android:scrollbars="vertical" >
 
@@ -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"
@@ -55,7 +65,7 @@
             <EditText android:id="@+id/owner_info_edit_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="62dip"
+                android:layout_marginStart="62dip"
                 android:layout_marginTop="40dip"
                 android:gravity="top"
                 android:hint="@string/owner_info_settings_edit_text_hint"
diff --git a/res/layout/pick_item.xml b/res/layout/pick_item.xml
index 62fc4f4..d85edc4 100755
--- a/res/layout/pick_item.xml
+++ b/res/layout/pick_item.xml
@@ -17,9 +17,9 @@
 <TextView 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:textAppearance="?android:attr/textAppearanceLargeInverse"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:textAppearance="?android:attr/textAppearanceMedium"
     android:gravity="center_vertical"
-    android:drawablePadding="14dip"
-    android:paddingLeft="15dip"
-    android:paddingRight="15dip" />
+    android:drawablePadding="8dip"
+    android:paddingStart="11dip"
+    android:paddingEnd="11dip" />
diff --git a/res/layout/power_usage_action_item.xml b/res/layout/power_usage_action_item.xml
index e4d8b5a..9e8551e 100644
--- a/res/layout/power_usage_action_item.xml
+++ b/res/layout/power_usage_action_item.xml
@@ -19,10 +19,10 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingLeft="4dip"
+    android:paddingStart="4dip"
     android:focusable="true"
     android:orientation="vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <TextView android:id="@+id/summary"
             android:layout_width="match_parent"
@@ -47,7 +47,7 @@
         <Button
                 android:id="@+id/action_button"
                 android:layout_width="150dip"
-                android:paddingRight="6dip"
+                android:paddingEnd="6dip"
                 android:layout_weight="0.3"
                 android:layout_height="wrap_content"/>
     </LinearLayout>
diff --git a/res/layout/power_usage_detail_item_text.xml b/res/layout/power_usage_detail_item_text.xml
index 6c21274..9c9c72c 100644
--- a/res/layout/power_usage_detail_item_text.xml
+++ b/res/layout/power_usage_detail_item_text.xml
@@ -26,19 +26,22 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textStyle="bold"
         android:singleLine="true"
-        android:layout_alignParentLeft="true"
+        android:ellipsize="middle"
+        android:layout_alignParentStart="true"
+        android:layout_toStartOf="@+id/value"
         android:layout_marginBottom="4dip"
         android:layout_marginTop="4dip"
-        android:layout_marginLeft="4dip" />
+        android:layout_marginStart="4dip"
+        android:layout_marginEnd="4dip"/>
     <TextView
         android:id="@+id/value"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textStyle="normal"
         android:singleLine="true"
         android:layout_marginBottom="4dip"
         android:layout_marginTop="4dip"
-        android:layout_marginRight="10dip"/>
+        android:layout_marginEnd="10dip"/>
 </RelativeLayout>
diff --git a/res/layout/power_usage_details.xml b/res/layout/power_usage_details.xml
index 99567a1..ca65863 100644
--- a/res/layout/power_usage_details.xml
+++ b/res/layout/power_usage_details.xml
@@ -17,7 +17,10 @@
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:clipToPadding="false"
+    android:scrollbarStyle="@integer/preference_scrollbar_style">
+
     <LinearLayout
         android:id="@+id/all_details"
         android:layout_width="match_parent"
@@ -47,7 +50,7 @@
             android:id="@+id/details"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="6dip"
+            android:paddingStart="6dip"
             android:orientation="vertical">
 
             <!-- Insert detail items here -->
@@ -80,7 +83,7 @@
             android:id="@+id/packages_section"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="6dip"
+            android:paddingStart="6dip"
             android:orientation="vertical">
 
             <!-- Insert detail items here -->
diff --git a/res/layout/power_usage_package_item.xml b/res/layout/power_usage_package_item.xml
index 750e062..d939229 100644
--- a/res/layout/power_usage_package_item.xml
+++ b/res/layout/power_usage_package_item.xml
@@ -25,7 +25,7 @@
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:singleLine="true"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_marginBottom="2dip"
         android:layout_marginTop="2dip" />
 </RelativeLayout>
diff --git a/res/layout/preference.xml b/res/layout/preference.xml
index aef21a1..ef4444a 100644
--- a/res/layout/preference.xml
+++ b/res/layout/preference.xml
@@ -19,8 +19,8 @@
     android:layout_height="wrap_content"
     android:minHeight="48dip"
     android:gravity="center_vertical"
-    android:paddingLeft="@*android:dimen/preference_item_padding_side"
-    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingStart="@*android:dimen/preference_item_padding_side"
+    android:paddingEnd="?android:attr/scrollbarSize"
     android:background="?android:attr/selectableItemBackground">
 
     <RelativeLayout
@@ -44,7 +44,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
+            android:layout_alignStart="@android:id/title"
             android:visibility="gone"
             android:textAppearance="?android:attr/textAppearanceSmall"
             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..753099d
--- /dev/null
+++ b/res/layout/preference_app_restrictions.xml
@@ -0,0 +1,105 @@
+<?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">
+
+    <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:gravity="center_vertical"
+        android:orientation="vertical" />
+</LinearLayout>
diff --git a/res/layout/preference_batteryhistory.xml b/res/layout/preference_batteryhistory.xml
index 53dce74..2655615 100644
--- a/res/layout/preference_batteryhistory.xml
+++ b/res/layout/preference_batteryhistory.xml
@@ -21,7 +21,7 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
     android:id="@+android:id/battery_history_chart"
-    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingEnd="?android:attr/scrollbarSize"
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:shadowRadius="4"
     android:shadowColor="?android:attr/colorBackground"
diff --git a/res/drawable/wifi_signal.xml b/res/layout/preference_color.xml
similarity index 60%
copy from res/drawable/wifi_signal.xml
copy to res/layout/preference_color.xml
index 86c1ab0..de4b832 100644
--- a/res/drawable/wifi_signal.xml
+++ b/res/layout/preference_color.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!--
+     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.
@@ -14,9 +15,8 @@
      limitations under the License.
 -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock" />
-    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open" />
-</selector>
-
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/color_preview"
+    android:layout_width="?android:attr/listPreferredItemHeight"
+    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:contentDescription="@null" />
diff --git a/res/layout/preference_dialog_brightness.xml b/res/layout/preference_dialog_brightness.xml
deleted file mode 100644
index 82c6f28..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_marginLeft="20dip"
-                android:layout_marginRight="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_dialog_ringervolume.xml b/res/layout/preference_dialog_ringervolume.xml
index a92f0ef..2af1ba9 100644
--- a/res/layout/preference_dialog_ringervolume.xml
+++ b/res/layout/preference_dialog_ringervolume.xml
@@ -44,33 +44,41 @@
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingLeft="16dip"
-                android:layout_gravity="left"
+                android:paddingStart="16dip"
+                android:layout_gravity="start"
                 android:text="@string/volume_media_description"
             />
 
         <!-- Used for the media volume -->
         <LinearLayout
+                android:id="@+id/media_section"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="8dip"
-                android:orientation="horizontal"
-                android:gravity="center_vertical">
+                android:orientation="vertical">
 
-                <ImageView android:id="@+id/media_mute_button"
-                        android:layout_width="wrap_content"
+                <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:padding="16dip"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:contentDescription="@string/volume_media_mute"
-                    />
+                        android:paddingStart="8dip"
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical">
 
-                <SeekBar android:id="@+id/media_volume_seekbar"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:paddingTop="2dip"
-                        android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+                        <ImageView android:id="@+id/media_mute_button"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:padding="16dip"
+                                android:background="?android:attr/selectableItemBackground"
+                                android:contentDescription="@string/volume_media_mute"
+                            />
+
+                        <SeekBar android:id="@+id/media_volume_seekbar"
+                                android:layout_width="0dip"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:paddingTop="2dip"
+                                android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
+                </LinearLayout>
+
         </LinearLayout>
 
         <!-- Used for the ringer/notification volume -->
@@ -86,15 +94,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dip"
-                    android:paddingLeft="16dip"
-                    android:layout_gravity="left"
+                    android:paddingStart="16dip"
+                    android:layout_gravity="start"
                     android:text="@string/volume_ring_description"
                 />
 
             <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="8dip"
+                    android:paddingStart="8dip"
                     android:orientation="horizontal"
                     android:gravity="center_vertical">
 
@@ -111,7 +119,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:paddingTop="2dip"
-                            android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+                            android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
             </LinearLayout>
 
         </LinearLayout>
@@ -129,15 +137,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dip"
-                    android:paddingLeft="16dip"
-                    android:layout_gravity="left"
+                    android:paddingStart="16dip"
+                    android:layout_gravity="start"
                     android:text="@string/volume_notification_description"
                 />
 
             <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="8dip"
+                    android:paddingStart="8dip"
                     android:orientation="horizontal"
                     android:gravity="center_vertical">
 
@@ -154,41 +162,50 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:paddingTop="2dip"
-                            android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+                            android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
             </LinearLayout>
 
         </LinearLayout>
 
-        <TextView
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dip"
-                android:paddingLeft="16dip"
-                android:layout_gravity="left"
-                android:text="@string/volume_alarm_description"
-            />
-
         <!-- Used for the alarm volume -->
         <LinearLayout
+                android:id="@+id/alarm_section"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="8dip"
-                android:orientation="horizontal"
-                android:gravity="center_vertical">
+                android:orientation="vertical">
 
-                <ImageView android:id="@+id/alarm_mute_button"
+                <TextView
+                        android:textAppearance="?android:attr/textAppearanceSmall"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:padding="16dip"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:contentDescription="@string/volume_alarm_mute" />
-                <SeekBar android:id="@+id/alarm_volume_seekbar"
-                        android:layout_width="0dip"
+                        android:layout_marginTop="16dip"
+                        android:paddingStart="16dip"
+                        android:layout_gravity="start"
+                        android:text="@string/volume_alarm_description"
+                    />
+
+                <!-- Used for the alarm volume -->
+                <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:paddingTop="2dip"
-                        android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+                        android:paddingStart="8dip"
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical">
+
+                        <ImageView android:id="@+id/alarm_mute_button"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:padding="16dip"
+                                android:background="?android:attr/selectableItemBackground"
+                                android:contentDescription="@string/volume_alarm_mute" />
+                        <SeekBar android:id="@+id/alarm_volume_seekbar"
+                                android:layout_width="0dip"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:paddingTop="2dip"
+                                android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
+                </LinearLayout>
+
         </LinearLayout>
 
     </LinearLayout>
diff --git a/res/layout/preference_empty_list.xml b/res/layout/preference_empty_list.xml
index 1c721ac..9faffe3 100644
--- a/res/layout/preference_empty_list.xml
+++ b/res/layout/preference_empty_list.xml
@@ -24,7 +24,6 @@
         android:id="@+android:id/title"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="@*android:dimen/preference_fragment_padding_side"
         android:gravity="center" />
 
 </LinearLayout>
diff --git a/res/layout/preference_header_button_item.xml b/res/layout/preference_header_button_item.xml
new file mode 100644
index 0000000..ecbd14b
--- /dev/null
+++ b/res/layout/preference_header_button_item.xml
@@ -0,0 +1,83 @@
+<?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 of a header item in PreferenceActivity. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:descendantFocusability="blocksDescendants"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="48dp"
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:gravity="center_vertical"
+    android:paddingEnd="?android:attr/scrollbarSize">
+
+    <LinearLayout
+        android:layout_width="@dimen/header_icon_width"
+        android:layout_marginStart="6dip"
+        android:layout_marginEnd="6dip"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="2dip"
+        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:textAppearance="?android:attr/textAppearanceSmall"
+            android:ellipsize="end"
+            android:maxLines="2" />
+
+    </RelativeLayout>
+
+   <View
+       android:id="@+id/divider"
+       style="@style/VertDivider"
+       android:layout_marginTop="6dp"
+       android:layout_marginBottom="6dp" />
+
+   <ImageButton android:id="@+id/buttonWidget"
+       android:layout_width="wrap_content"
+       android:layout_height="wrap_content"
+       android:layout_gravity="center"
+       android:padding="8dip"
+       android:focusable="false"
+       style="?android:attr/borderlessButtonStyle"
+       android:clickable="true" />
+
+
+</LinearLayout>
diff --git a/res/layout/preference_header_item.xml b/res/layout/preference_header_item.xml
index 28da8a1..36ed8e4 100644
--- a/res/layout/preference_header_item.xml
+++ b/res/layout/preference_header_item.xml
@@ -21,12 +21,12 @@
     android:minHeight="48dp"
     android:background="?android:attr/activatedBackgroundIndicator"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <LinearLayout
         android:layout_width="@dimen/header_icon_width"
-        android:layout_marginLeft="6dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="6dip"
+        android:layout_marginEnd="6dip"
         android:layout_height="wrap_content">
         <ImageView
             android:id="@+id/icon"
@@ -38,8 +38,8 @@
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="6dip"
         android:layout_marginTop="6dip"
         android:layout_marginBottom="6dip"
         android:layout_weight="1">
@@ -56,7 +56,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
+            android:layout_alignStart="@android:id/title"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:ellipsize="end"
             android:maxLines="2" />
diff --git a/res/layout/preference_header_switch_item.xml b/res/layout/preference_header_switch_item.xml
index 9d89c25..4ab09d6 100644
--- a/res/layout/preference_header_switch_item.xml
+++ b/res/layout/preference_header_switch_item.xml
@@ -21,12 +21,12 @@
     android:minHeight="48dp"
     android:background="?android:attr/activatedBackgroundIndicator"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <LinearLayout
         android:layout_width="@dimen/header_icon_width"
-        android:layout_marginLeft="6dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="6dip"
+        android:layout_marginEnd="6dip"
         android:layout_height="wrap_content">
         <ImageView
             android:id="@+id/icon"
@@ -38,8 +38,8 @@
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="6dip"
         android:layout_marginTop="6dip"
         android:layout_marginBottom="6dip"
         android:layout_weight="1">
@@ -56,7 +56,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
+            android:layout_alignStart="@android:id/title"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:ellipsize="end"
             android:maxLines="2" />
diff --git a/res/layout/preference_home_app.xml b/res/layout/preference_home_app.xml
new file mode 100644
index 0000000..8418161
--- /dev/null
+++ b/res/layout/preference_home_app.xml
@@ -0,0 +1,80 @@
+<?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">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:id="@+id/home_app_pref"
+        android:focusable="true"
+        android:clickable="true"
+        android:gravity="center_vertical"
+        android:background="?android:attr/selectableItemBackground" >
+            <RadioButton
+                android:id="@+id/home_radio"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginStart="10dip"
+                android:layout_marginEnd="4dip"
+                android:layout_gravity="center_vertical"
+                android:orientation="vertical"
+                android:clickable="false"
+                android:focusable="false" />
+            <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"
+                />
+            <TextView
+                android:id="@+android:id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:layout_weight="1"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:ellipsize="end" />
+    </LinearLayout>
+    <View
+        android:id="@+id/home_divider"
+        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/home_app_uninstall"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:paddingStart="12dip"
+        android:paddingEnd="12dp"
+        android:src="@drawable/ic_menu_delete_holo_dark"
+        android:contentDescription="@string/home_app_uninstall_button"
+        android:layout_gravity="center"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?android:attr/selectableItemBackground" />
+</LinearLayout>
diff --git a/res/layout/preference_icon.xml b/res/layout/preference_icon.xml
index 7660646..8e62508 100644
--- a/res/layout/preference_icon.xml
+++ b/res/layout/preference_icon.xml
@@ -23,22 +23,22 @@
     android:layout_height="wrap_content"
     android:minHeight="56dp"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
     
     <ImageView
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="6dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="6dip"
+        android:layout_marginEnd="6dip"
         android:layout_gravity="center"
         android:contentDescription="@null" />
 
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="6dip"
         android:layout_marginTop="6dip"
         android:layout_marginBottom="6dip"
         android:layout_weight="1">
@@ -55,7 +55,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
+            android:layout_alignStart="@android:id/title"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:maxLines="2" />
 
diff --git a/res/layout/preference_inputmethod.xml b/res/layout/preference_inputmethod.xml
index f477a6e..589ddc9 100644
--- a/res/layout/preference_inputmethod.xml
+++ b/res/layout/preference_inputmethod.xml
@@ -38,7 +38,7 @@
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="6dip"
+            android:layout_marginEnd="6dip"
             android:layout_marginTop="6dip"
             android:layout_marginBottom="6dip"
             android:layout_weight="1">
@@ -55,7 +55,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@android:id/title"
-                android:layout_alignLeft="@android:id/title"
+                android:layout_alignStart="@android:id/title"
                 android:paddingBottom="3dip"
                 android:visibility="gone"
                 android:textAppearance="?android:attr/textAppearanceSmall"
@@ -75,8 +75,8 @@
         android:id="@+id/inputmethod_settings"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
-        android:paddingLeft="15dip"
-        android:paddingRight="?android:attr/scrollbarSize"
+        android:paddingStart="15dip"
+        android:paddingEnd="?android:attr/scrollbarSize"
         android:src="@drawable/ic_sysbar_quicksettings"
         android:contentDescription="@string/input_method_settings_button"
         android:layout_gravity="center"
diff --git a/res/layout/preference_linearcolor.xml b/res/layout/preference_linearcolor.xml
new file mode 100644
index 0000000..754558d
--- /dev/null
+++ b/res/layout/preference_linearcolor.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="?android:attr/listPreferredItemHeight"
+        android:paddingEnd="?android:attr/scrollbarSize">
+    <com.android.settings.applications.LinearColorBar
+        android:id="@+id/linear_color_bar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        android:gravity="center_vertical"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:shadowRadius="4"
+        android:shadowColor="?android:attr/colorBackground"
+        android:shadowDx="2"
+        android:shadowDy="2">
+    </com.android.settings.applications.LinearColorBar>
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/preference_memoryusage.xml b/res/layout/preference_memoryusage.xml
index 2882535..ddc619d 100644
--- a/res/layout/preference_memoryusage.xml
+++ b/res/layout/preference_memoryusage.xml
@@ -20,8 +20,8 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize"
-    android:paddingLeft="@*android:dimen/preference_widget_width">
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:paddingStart="@*android:dimen/preference_widget_width">
 
     <com.android.settings.deviceinfo.PercentageBarChart
         android:id="@+id/percentage_bar_chart"
diff --git a/res/layout/preference_powergauge.xml b/res/layout/preference_powergauge.xml
deleted file mode 100644
index e6188dc..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:paddingLeft="16dip"
-    android:paddingRight="?android:attr/scrollbarSize">
-
-    <ImageView
-        android:id="@+id/appIcon"
-        android:layout_width="48dip"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="6dip"
-        android:layout_gravity="center"
-        android:contentDescription="@null" />
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="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_alignParentLeft="true"
-            android:layout_alignParentTop="true"
-            android:layout_toLeftOf="@+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_alignParentRight="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_alignLeft="@id/appGauge"
-            android:layout_below="@id/appGauge"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:maxLines="2" />
-
-    </RelativeLayout>
-
-</LinearLayout>
diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml
index ad782f2..17d87d7 100644
--- a/res/layout/preference_progress_category.xml
+++ b/res/layout/preference_progress_category.xml
@@ -18,19 +18,18 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     style="?android:attr/listSeparatorTextViewStyle"
     android:gravity="center_vertical"
-    android:orientation="horizontal"
-    >
+    android:orientation="horizontal">
 
     <!-- This text view has the style of the list separator text view without the background and padding. -->
     <TextView
         style="?android:attr/listSeparatorTextViewStyle"
         android:background="@null"
-        android:paddingLeft="16dip"
         android:id="@+android:id/title"
+        android:paddingStart="0dp"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_gravity="left|bottom"
+        android:layout_gravity="start|center"
     />
 
     <ProgressBar
@@ -39,8 +38,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
+        android:layout_marginStart="16dip"
         style="?android:attr/progressBarStyleSmallTitle"
         />
 
diff --git a/res/drawable/wifi_signal.xml b/res/layout/preference_rename_widget.xml
similarity index 60%
copy from res/drawable/wifi_signal.xml
copy to res/layout/preference_rename_widget.xml
index 86c1ab0..81e401f 100644
--- a/res/drawable/wifi_signal.xml
+++ b/res/layout/preference_rename_widget.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- 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.
@@ -14,9 +14,8 @@
      limitations under the License.
 -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock" />
-    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open" />
-</selector>
-
+<!-- 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_settings_checkbox_widget.xml b/res/layout/preference_settings_checkbox_widget.xml
index 960661f..41cfaa5 100644
--- a/res/layout/preference_settings_checkbox_widget.xml
+++ b/res/layout/preference_settings_checkbox_widget.xml
@@ -17,7 +17,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <!-- Settings button -->
     <ImageView
diff --git a/res/layout/preference_spellchecker.xml b/res/layout/preference_spellchecker.xml
index f64c26c..3e73fa1 100644
--- a/res/layout/preference_spellchecker.xml
+++ b/res/layout/preference_spellchecker.xml
@@ -38,7 +38,7 @@
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="6dip"
+            android:layout_marginEnd="6dip"
             android:layout_marginTop="6dip"
             android:layout_marginBottom="6dip"
             android:layout_weight="1">
@@ -55,7 +55,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@android:id/title"
-                android:layout_alignLeft="@android:id/title"
+                android:layout_alignStart="@android:id/title"
                 android:visibility="gone"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textSize="13sp"
@@ -81,8 +81,8 @@
         <ImageView
             android:layout_width="40dip"
             android:layout_height="fill_parent"
-            android:paddingLeft="5dip"
-            android:paddingRight="5dip"
+            android:paddingStart="5dip"
+            android:paddingEnd="5dip"
             android:src="@drawable/ic_sysbar_quicksettings"
             android:layout_gravity="center"
             android:contentDescription="@string/spellchecker_quick_settings" />
@@ -98,10 +98,10 @@
         android:id="@+id/pref_right_button2"
         android:layout_width="40dip"
         android:layout_height="fill_parent"
-        android:paddingLeft="5dip"
-        android:paddingRight="5dip"
+        android:paddingStart="5dip"
+        android:paddingEnd="5dip"
         android:src="@drawable/ic_menu_3d_globe"
-        android:layout_gravity="right"
+        android:layout_gravity="end"
         android:clickable="true"
         android:focusable="true"
         android:background="?android:attr/selectableItemBackground"
diff --git a/res/layout/preference_tts_engine.xml b/res/layout/preference_tts_engine.xml
index 3cbdff4..a9d0043 100644
--- a/res/layout/preference_tts_engine.xml
+++ b/res/layout/preference_tts_engine.xml
@@ -33,8 +33,8 @@
             android:id="@+id/tts_engine_radiobutton"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginLeft="10dip"
-            android:layout_marginRight="4dip"
+            android:layout_marginStart="10dip"
+            android:layout_marginEnd="4dip"
             android:layout_gravity="center_vertical"
             android:orientation="vertical"
             android:clickable="true" />
@@ -42,8 +42,8 @@
             android:id="@+id/tts_engine_pref_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="15dip"
-            android:layout_marginRight="6dip"
+            android:layout_marginStart="15dip"
+            android:layout_marginEnd="6dip"
             android:layout_marginTop="6dip"
             android:layout_marginBottom="6dip"
             android:layout_weight="1">
@@ -60,7 +60,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@android:id/title"
-                android:layout_alignLeft="@android:id/title"
+                android:layout_alignStart="@android:id/title"
                 android:visibility="gone"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textSize="13sp"
@@ -78,8 +78,8 @@
         android:id="@+id/tts_engine_settings"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
-        android:paddingLeft="15dip"
-        android:paddingRight="?android:attr/scrollbarSize"
+        android:paddingStart="15dip"
+        android:paddingEnd="?android:attr/scrollbarSize"
         android:src="@drawable/ic_sysbar_quicksettings"
         android:contentDescription="@string/tts_engine_settings_button"
         android:layout_gravity="center"
diff --git a/res/layout/preference_user_delete_widget.xml b/res/layout/preference_user_delete_widget.xml
new file mode 100644
index 0000000..7d563f8
--- /dev/null
+++ b/res/layout/preference_user_delete_widget.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Used by UserPreference to show the trash icon -->
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+    <View
+        android:id="@+id/divider_manage"
+        android:layout_width="2dip"
+        android:layout_height="match_parent"
+        android:layout_marginTop="5dip"
+        android:layout_marginBottom="5dip"
+        android:background="@android:drawable/divider_horizontal_dark" />
+    <ImageView
+        android:id="@+id/manage_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"
+        android:layout_marginBottom="5dip"
+        android:background="@android:drawable/divider_horizontal_dark" />
+    <ImageView
+        android:id="@+id/trash_user"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        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"
+        android:background="?android:attr/selectableItemBackground" />
+</LinearLayout>
diff --git a/res/layout/preference_widget_radiobutton.xml b/res/layout/preference_widget_radiobutton.xml
new file mode 100644
index 0000000..7f4ee95
--- /dev/null
+++ b/res/layout/preference_widget_radiobutton.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Layout used by CheckBoxPreference for the checkbox style. This is inflated
+     inside android.R.layout.preference. -->
+<RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+android:id/checkbox"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:focusable="false"
+    android:clickable="false" />
diff --git a/res/layout/preference_widget_shortcut.xml b/res/layout/preference_widget_shortcut.xml
index 4f14667..1a885a2 100644
--- a/res/layout/preference_widget_shortcut.xml
+++ b/res/layout/preference_widget_shortcut.xml
@@ -18,7 +18,7 @@
     android:id="@+id/shortcut" 
     android:layout_width="40dip"
     android:layout_height="40dip"
-    android:layout_marginRight="4sp"
+    android:layout_marginEnd="4sp"
     android:layout_gravity="center_vertical"
     android:background="#555555"
     android:gravity="center"
diff --git a/res/layout/preference_widget_sync_toggle.xml b/res/layout/preference_widget_sync_toggle.xml
index 7cb2997..115098b 100644
--- a/res/layout/preference_widget_sync_toggle.xml
+++ b/res/layout/preference_widget_sync_toggle.xml
@@ -19,14 +19,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="center_vertical|right"
-    android:gravity="center_vertical|right">
+    android:layout_gravity="center_vertical|end"
+    android:gravity="center_vertical|end">
 
     <ImageView
         android:id="@+id/sync_failed"
         android:src="@drawable/ic_sync_error_holo"
         android:layout_width="wrap_content"
-        android:layout_marginRight="8dip"
+        android:layout_marginEnd="8dip"
         android:layout_height="wrap_content"
         android:contentDescription="@string/sync_failed" />
 
@@ -35,7 +35,7 @@
         android:src="@drawable/ic_list_sync_anim"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="8dip"
+        android:layout_marginEnd="8dip"
         android:contentDescription="@string/sync_active" />
 
     <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/res/layout/preference_widget_wifi_signal.xml b/res/layout/preference_widget_wifi_signal.xml
index 6df203c..c2541a5 100644
--- a/res/layout/preference_widget_wifi_signal.xml
+++ b/res/layout/preference_widget_wifi_signal.xml
@@ -15,8 +15,8 @@
 -->
 
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/signal" 
+    android:id="@+id/signal"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:src="@drawable/wifi_signal"
+    android:src="?attr/wifi_signal"
     android:contentDescription="@null" />
diff --git a/res/layout/preset_picker_item.xml b/res/layout/preset_picker_item.xml
new file mode 100644
index 0000000..0cafd34
--- /dev/null
+++ b/res/layout/preset_picker_item.xml
@@ -0,0 +1,46 @@
+<?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:gravity="center"
+    android:orientation="vertical"
+    android:paddingLeft="4dp"
+    android:paddingRight="4dp"
+    android:paddingTop="16dp" >
+
+    <FrameLayout
+        android:layout_width="96dp"
+        android:layout_height="96dp"
+        android:background="@drawable/transparency_tileable" >
+
+        <com.android.internal.widget.SubtitleView
+            android:id="@+id/preview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/captioning_preview_characters" />
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/summary"
+        android:layout_width="96dp"
+        android:layout_height="wrap_content"
+        android:gravity="center" />
+
+</LinearLayout>
diff --git a/res/layout/print_job_summary.xml b/res/layout/print_job_summary.xml
new file mode 100644
index 0000000..d755de2
--- /dev/null
+++ b/res/layout/print_job_summary.xml
@@ -0,0 +1,43 @@
+<?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="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="15dip"
+    android:layout_marginEnd="6dip"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="top|start"
+    android:orientation="vertical"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:background="?android:attr/selectableItemBackground">
+
+    <View
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/listDivider">
+    </View>
+
+    <TextView android:id="@+android:id/summary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorSecondary">
+    </TextView>
+
+</LinearLayout>
diff --git a/res/layout/printer_dropdown_item.xml b/res/layout/printer_dropdown_item.xml
new file mode 100644
index 0000000..ad393b8
--- /dev/null
+++ b/res/layout/printer_dropdown_item.xml
@@ -0,0 +1,67 @@
+<?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="48dip"
+    android:gravity="center_vertical"
+    android:paddingStart="@*android:dimen/preference_item_padding_side"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:background="?android:attr/selectableItemBackground">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="32dip"
+        android:layout_height="32dip"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="8dip"
+        android:duplicateParentState="true"
+        android:contentDescription="@null"
+        android:visibility="gone">
+    </ImageView>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:textIsSelectable="false">
+        </TextView>
+
+        <TextView
+            android:id="@+id/subtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:textIsSelectable="false"
+            android:visibility="gone"
+            android:textColor="?android:attr/textColorSecondary">
+        </TextView>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/process_stats_details.xml b/res/layout/process_stats_details.xml
new file mode 100644
index 0000000..0de1054
--- /dev/null
+++ b/res/layout/process_stats_details.xml
@@ -0,0 +1,76 @@
+<?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="match_parent"
+    android:layout_height="match_parent"
+    android:clipToPadding="false"
+    android:scrollbarStyle="@integer/preference_scrollbar_style">
+
+    <LinearLayout
+        android:id="@+id/all_details"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingTop="5dip"
+        android:paddingBottom="5dip"
+        android:orientation="vertical">
+
+        <include layout="@layout/app_percentage_item" />
+
+        <!-- Force stop and report buttons -->
+        <LinearLayout
+            android:id="@+id/two_buttons_panel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="6dip"
+            android:orientation="vertical">
+            <include
+                layout="@layout/two_buttons_panel"/>
+        </LinearLayout>
+
+        <TextView
+            style="?android:attr/listSeparatorTextViewStyle"
+            android:text="@string/details_subtitle" />
+
+        <LinearLayout
+            android:id="@+id/details"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="6dip"
+            android:orientation="vertical">
+
+            <!-- Insert detail items here -->
+
+        </LinearLayout>
+
+        <TextView
+            style="?android:attr/listSeparatorTextViewStyle"
+            android:text="@string/services_subtitle" />
+
+        <LinearLayout
+            android:id="@+id/services"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="6dip"
+            android:orientation="vertical">
+
+            <!-- Insert service items here -->
+
+        </LinearLayout>
+
+    </LinearLayout>
+</ScrollView>
diff --git a/res/layout/profile_icon_small.xml b/res/layout/profile_icon_small.xml
index 9967f77..3fd4bfc 100644
--- a/res/layout/profile_icon_small.xml
+++ b/res/layout/profile_icon_small.xml
@@ -18,7 +18,7 @@
         android:id="@+id/icon"
         android:layout_width="30dp"
         android:layout_height="30dp"
-        android:layout_marginRight="4dip"
+        android:layout_marginEnd="4dip"
         android:gravity="center"
         android:layout_gravity="center_vertical"
         android:contentDescription="@null" />
diff --git a/res/layout/proxy.xml b/res/layout/proxy.xml
index 5fc42e7..6409822 100644
--- a/res/layout/proxy.xml
+++ b/res/layout/proxy.xml
@@ -23,8 +23,8 @@
 
     <LinearLayout
         android:orientation="vertical"
-        android:paddingLeft="6dip"
-        android:paddingRight="6dip"
+        android:paddingStart="6dip"
+        android:paddingEnd="6dip"
         android:paddingBottom="3dip"
         android:layout_width="match_parent" android:layout_height="wrap_content"
         android:scrollbars="vertical" >
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index d9e5f4d..eeb46a0 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -84,6 +84,13 @@
             <TextView android:id="@+id/neighboring" style="@style/info_value" />
         </LinearLayout>
 
+        <!-- CellInfo -->
+        <LinearLayout style="@style/entry_layout">
+            <TextView android:text="@string/radio_info_cellinfo_label"
+                      style="@style/info_label" />
+            <TextView android:id="@+id/cellinfo" style="@style/info_value" />
+        </LinearLayout>
+
         <!-- Roaming -->
         <LinearLayout style="@style/entry_layout">
             <TextView android:text="@string/radio_info_roaming_label" style="@style/info_label" />
@@ -196,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"
@@ -233,7 +248,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/radio_info_smsc_refresh_label"
-                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
                     />
             <Button android:id="@+id/update_smsc"
                     android:textSize="14sp"
@@ -241,14 +256,14 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/radio_info_smsc_update_label"
-                    android:layout_toLeftOf="@+id/refresh_smsc"
+                    android:layout_toStartOf="@+id/refresh_smsc"
                     android:layout_alignBaseline="@+id/refresh_smsc"
                     />
             <EditText android:id="@+id/smsc"
                       style="@style/form_value"
                       android:layout_alignBaseline="@+id/refresh_smsc"
-                      android:layout_toLeftOf="@id/update_smsc"
-                      android:layout_toRightOf="@id/smsc_label" />
+                      android:layout_toStartOf="@id/update_smsc"
+                      android:layout_toEndOf="@id/smsc_label" />
         </RelativeLayout>
 
         <!-- Test setting to ignore bad DNS, useful in lab environments -->
diff --git a/res/layout/regulatory_info.xml b/res/layout/regulatory_info.xml
new file mode 100755
index 0000000..8cd4157
--- /dev/null
+++ b/res/layout/regulatory_info.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <ImageView
+        android:id="@+id/regulatoryInfo"
+        android:adjustViewBounds="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:scaleType="centerCrop"
+        android:src="@drawable/regulatory_info" />
+</ScrollView>
+
diff --git a/res/layout/running_processes_item.xml b/res/layout/running_processes_item.xml
index f46527a..52cecf6 100644
--- a/res/layout/running_processes_item.xml
+++ b/res/layout/running_processes_item.xml
@@ -17,79 +17,68 @@
 */
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:orientation="vertical"
-    android:gravity="fill" >
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingTop="8dip"
+    android:paddingBottom="8dip"
+    android:columnCount="2">
+
+    <ImageView
+        android:id="@+id/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" />
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="horizontal"
-        android:paddingRight="6dip"
-        android:paddingLeft="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_marginRight="11dip"
-            android:layout_gravity="center_vertical"
-            android:scaleType="fitCenter"
-            android:contentDescription="@null" />
-    
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-            <LinearLayout
-                android:orientation="horizontal"
-                android:baselineAlignedChildIndex="0"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-                <TextView android:id="@+id/name"
-                    android:layout_width="0px"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:paddingRight="4dip"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textStyle="bold"
-                    android:singleLine="true"
-                    android:ellipsize="marquee"
-                    android:layout_marginBottom="2dip" />
-                <TextView android:id="@+id/size"
-                    android:layout_gravity="center_vertical|right"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:singleLine="true"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-            </LinearLayout>
-            <LinearLayout
-                android:orientation="horizontal"
-                android:baselineAlignedChildIndex="0"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-                <TextView android:id="@+id/description"
-                    android:layout_gravity="center_vertical|left"
-                    android:layout_width="0px"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:paddingRight="4dip"
-                    android:singleLine="true"
-                    android:ellipsize="marquee"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-                <TextView android:id="@+id/uptime"
-                    android:layout_gravity="center_vertical|right"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:singleLine="true"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-            </LinearLayout>
-        </LinearLayout>
+        android:layout_width="0dip"
+        android:layout_gravity="fill_horizontal"
+        android:layout_marginTop="2dip">
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textAlignment="viewStart" />
+
+        <TextView
+            android:id="@+id/size"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dip"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
     </LinearLayout>
-</LinearLayout>
+
+    <LinearLayout
+        android:layout_width="0dip"
+        android:layout_gravity="fill_horizontal|top">
+
+        <TextView
+            android:id="@+id/description"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAlignment="viewStart" />
+
+        <TextView
+            android:id="@+id/uptime"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dip"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    </LinearLayout>
+
+</GridLayout>
diff --git a/res/layout/running_processes_view.xml b/res/layout/running_processes_view.xml
index e23de16..3a2552f 100644
--- a/res/layout/running_processes_view.xml
+++ b/res/layout/running_processes_view.xml
@@ -24,10 +24,9 @@
             android:layout_height="0px"
             android:layout_weight="1">
         <ListView android:id="@android:id/list"
+                style="@style/PreferenceFragmentListSinglePane"
                 android:layout_width="match_parent" 
                 android:layout_height="match_parent"
-                android:paddingLeft="@*android:dimen/preference_fragment_padding_side"
-                android:paddingRight="@*android:dimen/preference_fragment_padding_side"
                 android:drawSelectorOnTop="false"
                 android:scrollbarStyle="outsideOverlay"
                 android:fastScrollEnabled="true" />
@@ -38,8 +37,14 @@
                 android:text="@string/no_running_services"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
     </FrameLayout>
+    <!-- Force layout direction to LTR for now as we want the text to be at the same position in
+         any Locale included the RTL ones. Will need to fix LinearColorBar RTL support later.
+         Please also note the left/right gravities that would also need to be changed for proper
+         RTL support -->
     <view class="com.android.settings.applications.LinearColorBar"
             android:id="@+id/color_bar"
+            android:layout_marginStart="@dimen/settings_side_margin"
+            android:layout_marginEnd="@dimen/settings_side_margin"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="-5dp"
@@ -47,11 +52,10 @@
             android:clipChildren="false"
             android:clipToPadding="false"
             android:paddingTop="30dp"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp"
+            android:paddingStart="4dp"
+            android:paddingEnd="4dp"
             android:paddingBottom="1dp"
-            android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
-            android:layout_marginRight="@*android:dimen/preference_fragment_padding_side">
+            android:layoutDirection="ltr">
         <TextView android:id="@+id/foregroundText"
             android:layout_width="0px"
             android:layout_height="wrap_content"
@@ -74,7 +78,7 @@
             android:singleLine="true"
             android:text="@string/memory" />
         <TextView android:id="@+id/backgroundText"
-            android:layout_gravity="center_vertical|right"
+            android:layout_gravity="center_vertical|end"
             android:layout_width="0px"
             android:layout_height="wrap_content"
             android:layout_weight="1"
diff --git a/res/layout/running_service_details.xml b/res/layout/running_service_details.xml
index 98c144c..f618bdd 100644
--- a/res/layout/running_service_details.xml
+++ b/res/layout/running_service_details.xml
@@ -19,7 +19,10 @@
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:clipToPadding="false"
+    android:scrollbarStyle="@integer/preference_scrollbar_style">
+
     <LinearLayout
         android:id="@+id/all_details"
         android:layout_width="match_parent"
@@ -29,8 +32,8 @@
         <!-- Summary information as per previous screen -->
         <include
             layout="@layout/running_processes_item"
-            android:id="@+id/snippet"/>
+            android:id="@+id/snippet" />
 
     </LinearLayout>
-</ScrollView>
 
+</ScrollView>
diff --git a/res/layout/running_service_details_process.xml b/res/layout/running_service_details_process.xml
index d12b486..68ec482 100644
--- a/res/layout/running_service_details_process.xml
+++ b/res/layout/running_service_details_process.xml
@@ -29,9 +29,9 @@
     <TextView android:id="@+id/comp_description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        android:paddingLeft="14dip"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
 </LinearLayout>
diff --git a/res/layout/running_service_details_service.xml b/res/layout/running_service_details_service.xml
index b9f9bbe..706d1cf 100644
--- a/res/layout/running_service_details_service.xml
+++ b/res/layout/running_service_details_service.xml
@@ -33,16 +33,23 @@
         layout="@layout/running_processes_item"
         android:id="@+id/service"/>
 
-    <TextView android:id="@+id/comp_description"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:paddingLeft="14dip"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:orientation="vertical">
 
-    <include
-        layout="@layout/two_buttons_panel"
-        android:id="@+id/control_buttons_panel"/>
+        <TextView android:id="@+id/comp_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingBottom="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <include
+            layout="@layout/two_buttons_panel"
+            android:id="@+id/control_buttons_panel" />
+
+    </LinearLayout>
 
 </LinearLayout>
diff --git a/res/layout/set_backup_pw.xml b/res/layout/set_backup_pw.xml
index 3743c81..ce9a398 100644
--- a/res/layout/set_backup_pw.xml
+++ b/res/layout/set_backup_pw.xml
@@ -75,7 +75,7 @@
     <Button
             android:id="@+id/backup_pw_set_button"
             android:layout_below="@id/confirm_new_backup_pw"
-            android:layout_toRightOf="@id/backup_pw_cancel_button"
+            android:layout_toEndOf="@id/backup_pw_cancel_button"
             android:text="@string/backup_pw_set_button_text"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content" />
diff --git a/res/layout/settings_storage_miscfiles.xml b/res/layout/settings_storage_miscfiles.xml
index 7c52efa..0360cde 100644
--- a/res/layout/settings_storage_miscfiles.xml
+++ b/res/layout/settings_storage_miscfiles.xml
@@ -21,7 +21,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
-    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingEnd="?android:attr/scrollbarSize"
     android:background="?android:attr/selectableItemBackground"
     android:gravity="center_vertical"
     android:focusable="true">
@@ -29,26 +29,26 @@
     <CheckBox android:id="@+id/misc_checkbox"
               android:layout_width="wrap_content"
               android:layout_height="match_parent"
-              android:layout_alignParentLeft="true"
-              android:paddingLeft="16dip"
+              android:layout_alignParentStart="true"
+              android:paddingStart="16dip"
               android:scaleType="fitCenter"
               android:layout_centerVertical="true"/>
 
     <TextView android:id="@+id/misc_filename"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:layout_toRightOf="@id/misc_checkbox"
+              android:layout_toEndOf="@id/misc_checkbox"
               android:maxLines="1"
-              android:paddingLeft="16dip"
+              android:paddingStart="16dip"
               android:textAppearance="?android:attr/textAppearanceSmall"/>
 
     <TextView android:id="@+id/misc_filesize"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:layout_toRightOf="@id/misc_checkbox"
+              android:layout_toEndOf="@id/misc_checkbox"
               android:layout_below="@id/misc_filename"
               android:maxLines="1"
-              android:paddingLeft="16dip"
+              android:paddingStart="16dip"
               android:textStyle="bold"
               android:textAppearance="?android:attr/textAppearanceSmall" />
 </com.android.settings.deviceinfo.FileItemInfoLayout>
diff --git a/res/layout/settings_storage_miscfiles_list.xml b/res/layout/settings_storage_miscfiles_list.xml
index 5f8c5ed..b712073 100644
--- a/res/layout/settings_storage_miscfiles_list.xml
+++ b/res/layout/settings_storage_miscfiles_list.xml
@@ -21,8 +21,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingRight="16dip"
-    android:paddingLeft="16dip">
+    android:paddingEnd="16dip"
+    android:paddingStart="16dip">
 
     <ListView android:id="@android:id/list"
               android:layout_width="match_parent"
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index 79d59b3..d0cbc02 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -30,10 +30,9 @@
         android:gravity="bottom">
 
         <LinearLayout
-            android:id="@+id/button_bar"
+            android:id="@+id/title_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/title"
             android:gravity="bottom"
             android:orientation="horizontal">
             <TextView
@@ -49,12 +48,12 @@
                 android:id="@+id/more"
                 android:layout_width="@dimen/setup_button_size"
                 android:layout_height="@dimen/setup_button_size"
-                android:layout_marginLeft="8dip"
-                android:layout_marginRight="8dip"
+                android:layout_marginStart="8dip"
+                android:layout_marginEnd="8dip"
                 android:layout_marginBottom="8dip"
-                android:src="@*android:drawable/ic_menu_moreoverflow_holo_dark"
+                android:src="?attr/ic_menu_moreoverflow"
                 android:background="?android:attr/actionBarItemBackground"
-                android:contentDescription="@string/wifi_menu_wps_pbc" />
+                android:contentDescription="@string/wifi_menu_more_options" />
 
         </LinearLayout>
 
@@ -62,7 +61,7 @@
         <View
             android:id="@+id/top_divider"
             style="@style/TopDivider"
-            android:layout_below="@id/button_bar" />
+            android:layout_below="@id/title_bar" />
 
     </RelativeLayout>
 
@@ -74,6 +73,15 @@
         android:background="@android:color/transparent"
         android:orientation="vertical" >
 
+        <TextView
+            android:id="@+id/wifi_required_info"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="6dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="@string/wifi_required_info_text"
+            android:visibility="gone" />
+
         <ListView
             android:id="@android:id/list"
             android:layout_width="match_parent"
@@ -88,7 +96,8 @@
         <TextView
             android:id="@android:id/empty"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="0px"
+            android:layout_weight="1"
             android:gravity="center"
             android:visibility="gone" />
 
@@ -107,22 +116,22 @@
             android:background="?android:attr/selectableItemBackground"
             android:gravity="center_vertical"
             android:minHeight="?android:attr/listPreferredItemHeight"
-            android:paddingRight="?android:attr/scrollbarSize" >
+            android:paddingEnd="?android:attr/scrollbarSize" >
 
             <ImageView
                 android:id="@+id/add_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:src="@drawable/ic_menu_add" />
+                android:src="?attr/ic_menu_add" />
 
             <TextView
                 android:id="@+id/other"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="6dip"
-                android:layout_marginLeft="15dip"
-                android:layout_marginRight="6dip"
+                android:layout_marginStart="15dip"
+                android:layout_marginEnd="6dip"
                 android:layout_marginTop="6dip"
                 android:layout_weight="1"
                 android:ellipsize="marquee"
@@ -144,14 +153,22 @@
                 android:id="@+id/back_button"
                 android:layout_width="150dip"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
                 android:layout_margin="5dip"
                 android:text="@string/wifi_setup_back" />
 
+            <Button
+                android:id="@+id/custom_button"
+                android:layout_width="150dip"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_margin="5dip"
+                android:text="@string/wifi_setup_skip" />
+
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
                 android:orientation="horizontal" >
 
                 <Button
@@ -167,8 +184,9 @@
                     android:layout_width="150dip"
                     android:layout_height="wrap_content"
                     android:layout_margin="5dip"
-                    android:text="@string/wifi_setup_next" />
-            </LinearLayout>
+                    android:text="@string/wifi_setup_next"
+                    android:visibility="gone" />
+                </LinearLayout>
         </RelativeLayout>
     </LinearLayout>
-</view>
\ No newline at end of file
+</view>
diff --git a/res/layout/sms_preference_item.xml b/res/layout/sms_preference_item.xml
new file mode 100755
index 0000000..2146764
--- /dev/null
+++ b/res/layout/sms_preference_item.xml
@@ -0,0 +1,41 @@
+<?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="?android:attr/listPreferredItemHeight"
+    android:padding="6dip">
+    <ImageView
+        android:id="@+id/sms_image"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:padding="6dip"
+    />
+    <CheckedTextView
+        android:id="@+id/sms_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textColor="?android:attr/textColorAlertDialogListItem"
+        android:gravity="center_vertical"
+        android:paddingEnd="7dip"
+        android:checkMark="?android:attr/listChoiceIndicatorSingle"
+        android:ellipsize="marquee"
+    />
+</LinearLayout>
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 eb2222b..63030af 100644
--- a/res/layout/title.xml
+++ b/res/layout/title.xml
@@ -19,46 +19,45 @@
 
 <!-- The title area at the top of the settings pane -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/title_area"
-    android:orientation="horizontal">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/settings_side_margin"
+    android:layout_marginEnd="@dimen/settings_side_margin"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingTop="8dip"
+    android:paddingBottom="8dip"
+    android:columnCount="2">
 
-    <ImageView android:id="@+id/provider_icon"
-        android:layout_width="48dip"
-        android:layout_height="48dip"
-        android:layout_margin="5dip"
-        android:layout_gravity="center_vertical"
+    <ImageView
+        android:id="@+id/provider_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" />
 
-    <LinearLayout
+    <TextView
+        android:id="@+id/user_id"
         android:layout_width="0dip"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        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/user_id"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="?android:attr/textColorTertiary"
-            android:textStyle="bold"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:layout_marginTop="5dip"/>
+    <TextView
+        android:id="@+id/provider_id"
+        android:layout_width="0dip"
+        android:layout_gravity="fill_horizontal|top"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textAlignment="viewStart" />
 
-        <TextView
-            android:id="@+id/provider_id"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorTertiary"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:layout_gravity="bottom"
-            android:layout_marginBottom="5dip"/>
-
-    </LinearLayout>
-
-</LinearLayout>
+</GridLayout>
diff --git a/res/layout/trusted_credential.xml b/res/layout/trusted_credential.xml
index a2b84e2..e559a6e 100644
--- a/res/layout/trusted_credential.xml
+++ b/res/layout/trusted_credential.xml
@@ -18,7 +18,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingEnd="?android:attr/scrollbarSize"
     android:background="?android:attr/selectableItemBackground"
     android:padding="15dip"
     >
@@ -39,7 +39,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/trusted_credential_subject_primary"
-            android:layout_alignLeft="@id/trusted_credential_subject_primary"
+            android:layout_alignStart="@id/trusted_credential_subject_primary"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorSecondary"
         />
diff --git a/res/layout/trusted_credential_details.xml b/res/layout/trusted_credential_details.xml
index e220e1c..c8c16f7 100644
--- a/res/layout/trusted_credential_details.xml
+++ b/res/layout/trusted_credential_details.xml
@@ -18,6 +18,6 @@
     android:id="@+id/cert_remove_button"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
-    android:layout_gravity="right"
+    android:layout_gravity="end"
     android:layout_margin="6dip"
     />
diff --git a/res/layout/twelve_key_entry.xml b/res/layout/twelve_key_entry.xml
index 81ead98..e1d3172 100644
--- a/res/layout/twelve_key_entry.xml
+++ b/res/layout/twelve_key_entry.xml
@@ -24,16 +24,16 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="64dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="2dip"
         android:orientation="horizontal">
 
         <Button android:id="@+id/one"
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -42,8 +42,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -52,8 +52,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -63,16 +63,16 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="64dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="2dip"
         android:orientation="horizontal">
 
         <Button android:id="@+id/four"
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -81,8 +81,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -91,8 +91,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -101,16 +101,16 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="64dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="2dip"
         android:orientation="horizontal">
 
         <Button android:id="@+id/seven"
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -119,8 +119,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -129,8 +129,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -140,16 +140,16 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="64dip"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="2dip"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="2dip"
         android:orientation="horizontal">
 
         <Button android:id="@+id/ok"
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textStyle="bold"
             android:text="@android:string/ok"
@@ -159,8 +159,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textStyle="bold"
         />
@@ -169,8 +169,8 @@
             android:layout_width="0sp"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:layout_marginLeft="2dip"
-            android:layout_marginRight="2dip"
+            android:layout_marginStart="2dip"
+            android:layout_marginEnd="2dip"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textStyle="bold"
             android:text="@android:string/cancel"
diff --git a/res/layout/two_buttons_panel.xml b/res/layout/two_buttons_panel.xml
index 5d76312..2acf6f6 100755
--- a/res/layout/two_buttons_panel.xml
+++ b/res/layout/two_buttons_panel.xml
@@ -24,8 +24,6 @@
         android:layout_height="wrap_content"
         android:gravity="bottom"
         android:paddingTop="4dip"
-        android:paddingLeft="2dip"
-        android:paddingRight="2dip"
         android:orientation="horizontal">
         <Button
             android:id="@+id/left_button"
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/usage_stats.xml b/res/layout/usage_stats.xml
index 9ce338c..96e1bd1 100755
--- a/res/layout/usage_stats.xml
+++ b/res/layout/usage_stats.xml
@@ -24,11 +24,11 @@
             android:text="@string/app_name_label"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="wrap_content"
-            android:paddingRight="6dip"
+            android:paddingEnd="6dip"
             android:layout_height="wrap_content" />
         <TextView
             android:text="@string/launch_count_label"
-            android:paddingRight="6dip"
+            android:paddingEnd="6dip"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
diff --git a/res/layout/usage_stats_item.xml b/res/layout/usage_stats_item.xml
index bdadf85..c231b58 100755
--- a/res/layout/usage_stats_item.xml
+++ b/res/layout/usage_stats_item.xml
@@ -27,24 +27,24 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:paddingRight="6dip"
-        android:paddingLeft="12dip"
+        android:paddingEnd="6dip"
+        android:paddingStart="12dip"
         android:maxLines="1" />
 
     <TextView android:id="@+id/launch_count"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:paddingRight="6dip"
-        android:paddingLeft="12dip"
+        android:paddingEnd="6dip"
+        android:paddingStart="12dip"
         android:maxLines="1" />
 
     <TextView android:id="@+id/usage_time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:paddingRight="6dip"
-        android:paddingLeft="12dip"
+        android:paddingEnd="6dip"
+        android:paddingStart="12dip"
         android:maxLines="1" />
 </LinearLayout>
 
diff --git a/res/layout/user_dictionary_add_word.xml b/res/layout/user_dictionary_add_word.xml
index 4089299..3624dad 100644
--- a/res/layout/user_dictionary_add_word.xml
+++ b/res/layout/user_dictionary_add_word.xml
@@ -28,9 +28,9 @@
           android:ellipsize="end"
           android:layout_width="match_parent"
           android:layout_height="64dip"
-          android:layout_marginLeft="16dip"
-          android:layout_marginRight="16dip"
-          android:gravity="center_vertical|left"
+          android:layout_marginStart="16dip"
+          android:layout_marginEnd="16dip"
+          android:gravity="center_vertical|start"
           android:text="@string/user_dict_settings_add_dialog_title" />
     <View android:layout_width="match_parent"
           android:layout_height="2dip"
@@ -42,9 +42,10 @@
             android:layout_height="match_parent"
             android:layout_width="match_parent"
             android:layout_gravity="fill_horizontal|center_vertical"
-            android:layout_marginLeft="8dip"
+            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 />
@@ -62,7 +63,7 @@
                   android:orientation="horizontal"
                   android:measureWithLargestChild="true">
       <Button android:layout_width="0dip"
-              android:layout_gravity="left"
+              android:layout_gravity="start"
               android:layout_weight="1"
               android:maxLines="2"
               style="?android:attr/buttonBarButtonStyle"
@@ -71,7 +72,7 @@
               android:layout_height="wrap_content"
               android:onClick="onClickCancel" />
       <Button android:layout_width="0dip"
-              android:layout_gravity="right"
+              android:layout_gravity="end"
               android:layout_weight="1"
               android:maxLines="2"
               style="?android:attr/buttonBarButtonStyle"
diff --git a/res/layout/user_dictionary_add_word_fullscreen.xml b/res/layout/user_dictionary_add_word_fullscreen.xml
index c0f3f53..42bd197 100644
--- a/res/layout/user_dictionary_add_word_fullscreen.xml
+++ b/res/layout/user_dictionary_add_word_fullscreen.xml
@@ -14,61 +14,54 @@
      limitations under the License.
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:id="@+id/user_dict_settings_add_dialog_top"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="vertical">
+    android:id="@+id/user_dict_settings_add_dialog_top"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
 
-  <TextView
-     android:layout_height="wrap_content"
-     android:layout_width="match_parent"
-     android:text="@string/user_dict_settings_add_screen_title"
-     style="?android:attr/listSeparatorTextViewStyle" />
+    <EditText
+        android:id="@+id/user_dictionary_add_word_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="fill_horizontal|center_vertical"
+        android:layout_marginBottom="8dip"
+        android:layout_marginStart="8dip"
+        android:layout_marginTop="8dip"
+        android:hint="@string/user_dict_settings_add_word_hint"
+        android:imeOptions="flagNoFullscreen"
+        android:inputType="textNoSuggestions"
+        android:maxLength="@integer/maximum_user_dictionary_word_length" >
 
-  <EditText android:id="@+id/user_dictionary_add_word_text"
-            android:maxLength="@integer/maximum_user_dictionary_word_length"
+        <requestFocus />
+    </EditText>
+
+    <GridLayout
+        android:id="@+id/user_dictionary_add_word_grid"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dip"
+        android:layout_marginStart="8dip"
+        android:columnCount="2" >
+
+        <TextView
+            android:id="@+id/user_dictionary_add_shortcut_label"
+            style="?android:attr/textAppearanceSmall"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_width="match_parent"
+            android:layout_gravity="start|center_vertical"
+            android:text="@string/user_dict_settings_add_shortcut_option_name" />
+
+        <EditText
+            android:id="@+id/user_dictionary_add_shortcut"
+            android:layout_width="wrap_content"
             android:layout_gravity="fill_horizontal|center_vertical"
-            android:layout_marginLeft="8dip"
             android:layout_marginBottom="8dip"
+            android:layout_marginStart="8dip"
             android:layout_marginTop="8dip"
+            android:hint="@string/user_dict_settings_add_shortcut_hint"
+            android:imeOptions="flagNoFullscreen"
             android:inputType="textNoSuggestions"
-            android:imeOptions="flagNoFullscreen">
-    <requestFocus />
-  </EditText>
-  <GridLayout android:id="@+id/user_dictionary_add_word_grid"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:layout_marginLeft="8dip"
-              android:layout_marginRight="8dip"
-              android:columnCount="2">
-    <TextView android:id="@+id/user_dictionary_add_shortcut_label"
-              style="?android:attr/textAppearanceSmall"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="left|center_vertical"
-              android:text="@string/user_dict_settings_add_shortcut_option_name" />
-    <EditText android:id="@+id/user_dictionary_add_shortcut"
-              android:maxLength="@integer/maximum_user_dictionary_word_length"
-              android:layout_width="wrap_content"
-              android:layout_gravity="fill_horizontal|center_vertical"
-              android:layout_marginLeft="8dip"
-              android:layout_marginBottom="8dip"
-              android:layout_marginTop="8dip"
-              android:inputType="textNoSuggestions"
-              android:imeOptions="flagNoFullscreen" />
-    <TextView android:id="@+id/user_dictionary_add_locale_label"
-              style="?android:attr/textAppearanceSmall"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="left|center_vertical"
-              android:text="@string/user_dict_settings_add_locale_option_name" />
-    <Spinner  android:id="@+id/user_dictionary_add_locale"
-              android:layout_marginLeft="8dip"
-              android:layout_marginBottom="8dip"
-              android:layout_marginTop="8dip"
-              android:layout_width="wrap_content"
-              android:layout_gravity="fill_horizontal|center_vertical" />
+            android:maxLength="@integer/maximum_user_dictionary_word_length" />
     </GridLayout>
+
 </LinearLayout>
diff --git a/res/layout/user_dictionary_item.xml b/res/layout/user_dictionary_item.xml
index 749986e..82d8629 100644
--- a/res/layout/user_dictionary_item.xml
+++ b/res/layout/user_dictionary_item.xml
@@ -19,13 +19,13 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingEnd="?android:attr/scrollbarSize"
     android:background="?android:attr/selectableItemBackground" >
 
   <RelativeLayout android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
-                  android:layout_marginLeft="15dip"
-                  android:layout_marginRight="6dip"
+                  android:layout_marginStart="15dip"
+                  android:layout_marginEnd="6dip"
                   android:layout_marginTop="6dip"
                   android:layout_marginBottom="6dip"
                   android:layout_weight="1">
@@ -42,7 +42,7 @@
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_below="@android:id/text1"
-              android:layout_alignLeft="@android:id/text1"
+              android:layout_alignStart="@android:id/text1"
               android:textAppearance="?android:attr/textAppearanceSmall"
               android:textColor="?android:attr/textColorSecondary"
               android:maxLines="1" />
diff --git a/res/layout/user_info_header.xml b/res/layout/user_info_header.xml
new file mode 100644
index 0000000..aeecc58
--- /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="@dimen/settings_side_margin"
+    android:paddingEnd="@dimen/settings_side_margin" >
+
+    <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/vpn_lockdown_editor.xml b/res/layout/vpn_lockdown_editor.xml
new file mode 100644
index 0000000..933c5ec
--- /dev/null
+++ b/res/layout/vpn_lockdown_editor.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="16dip"
+        android:paddingRight="16dip"
+        android:paddingTop="8dip"
+        android:paddingBottom="8dip"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/vpn_lockdown_summary" />
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1" />
+
+</LinearLayout>
diff --git a/res/layout/weak_biometric_fallback_header.xml b/res/layout/weak_biometric_fallback_header.xml
index adbb613..5f9c2a2 100644
--- a/res/layout/weak_biometric_fallback_header.xml
+++ b/res/layout/weak_biometric_fallback_header.xml
@@ -19,6 +19,5 @@
         android:padding="8dip"
         android:gravity="center"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?android:attr/textColorSecondary"
         android:text="@string/unlock_backup_info_summary"
 />
\ No newline at end of file
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index d000a46..a125d80 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -95,7 +95,7 @@
         />
 
     <LinearLayout
-        android:id="@+id/btn_gps"
+        android:id="@+id/btn_location"
         android:layout_width="0dip"
         android:layout_weight="1"
         android:layout_height="match_parent"
@@ -106,7 +106,7 @@
         android:orientation="vertical">
 
         <ImageView
-            android:id="@+id/img_gps"
+            android:id="@+id/img_location"
             android:layout_width="match_parent"
             android:layout_height="0dip"
             android:layout_weight="1"
@@ -115,7 +115,7 @@
             />
 
         <ImageView
-            android:id="@+id/ind_gps"
+            android:id="@+id/ind_location"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitXY"
diff --git a/res/layout/wifi_ap_dialog.xml b/res/layout/wifi_ap_dialog.xml
index d458cd3..002a640 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" />
 
@@ -81,7 +82,8 @@
                     android:layout_height="wrap_content"
                     android:singleLine="true"
                     android:password="true"
-                    android:maxLength="63" />
+                    android:maxLength="63"
+                    android:imeOptions="flagForceAscii" />
 
             <TextView android:id="@+id/hint"
                     style="?android:attr/textAppearanceSmall"
diff --git a/res/layout/wifi_config_ui_for_setup_wizard.xml b/res/layout/wifi_config_ui_for_setup_wizard.xml
index 1b10f90..143d9ee 100644
--- a/res/layout/wifi_config_ui_for_setup_wizard.xml
+++ b/res/layout/wifi_config_ui_for_setup_wizard.xml
@@ -68,24 +68,25 @@
                 android:minWidth="128dip"
                 android:layout_height="wrap_content"
                 android:minHeight="56dip"
-                android:paddingRight="16dip"
-                android:layout_alignParentLeft="true"
+                android:paddingEnd="16dip"
+                android:layout_alignParentStart="true"
                 android:text="@string/wifi_ssid"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textSize="20sp"
-                android:gravity="left|center_vertical" />
+                android:gravity="start|center_vertical" />
 
             <FrameLayout
                 android:id="@+id/ssid_layout"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignBottom="@id/ssid_text"
-                android:layout_toRightOf="@id/ssid_text">
+                android:layout_toEndOf="@id/ssid_text">
                 <EditText
                     android:id="@+id/ssid"
                     android:layout_width="368dip"
                     android:layout_height="wrap_content"
                     android:singleLine="true"
+                    android:hint="@string/wifi_ssid_hint"
                     android:inputType="textNoSuggestions"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:textSize="20sp" />
@@ -105,7 +106,7 @@
                 android:text="@string/wifi_password"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textSize="20sp"
-                android:gravity="left|center_vertical" />
+                android:gravity="start|center_vertical" />
 
             <LinearLayout
                 android:id="@+id/password_layout"
@@ -162,7 +163,7 @@
                     android:layout_width="368dip"
                     android:layout_height="wrap_content"
                     android:minHeight="56dip"
-                    android:paddingLeft="4dip"/>
+                    android:paddingStart="4dip"/>
             </FrameLayout>
         </TableRow>
     </TableLayout>
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index 88dae27..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" />
@@ -34,10 +35,12 @@
                       style="@style/wifi_item" >
                 <TextView
                         style="@style/wifi_item_label"
-                        android:text="@string/wifi_ssid" />
+                        android:text="@string/wifi_ssid"
+                        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" />
@@ -122,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>
@@ -135,25 +138,25 @@
                             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>
             </LinearLayout>
 
-            <LinearLayout
+            <LinearLayout android:id="@+id/password_layout"
                        style="@style/wifi_item" >
                 <TextView
                         style="@style/wifi_item_label"
                         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>
 
-            <LinearLayout
+            <LinearLayout android:id="@+id/show_password_layout"
                     style="@style/wifi_item" >
                 <!--  Dummy to enable right-justification of checkbox -->
                 <TextView
@@ -217,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" />
@@ -228,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" />
@@ -239,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" />
@@ -271,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" />
@@ -284,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" />
@@ -297,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" />
@@ -309,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" />
@@ -322,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_display_options.xml b/res/layout/wifi_display_options.xml
new file mode 100644
index 0000000..c56a512
--- /dev/null
+++ b/res/layout/wifi_display_options.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    android:orientation="vertical">
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/wifi_display_options_name" />
+
+    <EditText
+            android:id="@+id/name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/res/layout/wifi_display_preference.xml b/res/layout/wifi_display_preference.xml
new file mode 100644
index 0000000..d8c4729
--- /dev/null
+++ b/res/layout/wifi_display_preference.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical">
+
+    <!-- Divider -->
+    <ImageView
+        android:id="@+id/divider"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:src="@drawable/nav_divider"
+        android:contentDescription="@null"
+         />
+
+    <!-- Details button -->
+    <ImageView
+        android:id="@+id/deviceDetails"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:padding="8dip"
+        android:background="?android:attr/selectableItemBackground"
+        android:src="@drawable/ic_bt_config"
+        android:contentDescription="@string/wifi_display_details" />
+
+</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/layout/wifi_setup_custom_list_item_1.xml b/res/layout/wifi_setup_custom_list_item_1.xml
index 9d329ea..3ef7e25 100644
--- a/res/layout/wifi_setup_custom_list_item_1.xml
+++ b/res/layout/wifi_setup_custom_list_item_1.xml
@@ -22,6 +22,6 @@
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:textSize="20sp"
     android:gravity="center_vertical"
-    android:paddingLeft="16dip"
+    android:paddingStart="16dip"
     android:minHeight="48dip"
 />
diff --git a/res/layout/wifi_wps_dialog.xml b/res/layout/wifi_wps_dialog.xml
index 1c5713a..a86823d 100644
--- a/res/layout/wifi_wps_dialog.xml
+++ b/res/layout/wifi_wps_dialog.xml
@@ -35,7 +35,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="8dip"
-                android:src="@drawable/ic_wps" />
+                android:src="?attr/ic_wps" />
 
         <ProgressBar
                 android:id="@+id/wps_timeout_bar"
diff --git a/res/menu/print_service_settings.xml b/res/menu/print_service_settings.xml
new file mode 100644
index 0000000..a9a4aed
--- /dev/null
+++ b/res/menu/print_service_settings.xml
@@ -0,0 +1,36 @@
+<?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.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/print_menu_item_search"
+        android:title="@string/print_menu_item_search"
+        android:icon="@*android:drawable/ic_menu_search_holo_dark"
+        android:actionViewClass="android.widget.SearchView"
+        android:showAsAction="ifRoom|collapseActionView"
+        android:imeOptions="actionSearch">
+    </item>
+    <item
+        android:id="@+id/print_menu_item_add_printer"
+        android:title="@string/print_menu_item_add_printer"
+        android:showAsAction="never">
+    </item>
+    <item
+        android:id="@+id/print_menu_item_settings"
+        android:title="@string/print_menu_item_settings"
+        android:showAsAction="never">
+    </item>
+</menu>
diff --git a/res/menu/vpn.xml b/res/menu/vpn.xml
new file mode 100644
index 0000000..3e0a788
--- /dev/null
+++ b/res/menu/vpn.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/vpn_create"
+        android:title="@string/vpn_create"
+        android:icon="?attr/ic_menu_add"
+        android:showAsAction="always" />
+    <item
+        android:id="@+id/vpn_lockdown"
+        android:title="@string/vpn_menu_lockdown"
+        android:showAsAction="never" />
+</menu>
diff --git a/res/mipmap-hdpi/ic_launcher_settings.png b/res/mipmap-hdpi/ic_launcher_settings.png
index 32da776..a8ccc89 100644
--- a/res/mipmap-hdpi/ic_launcher_settings.png
+++ b/res/mipmap-hdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_settings.png b/res/mipmap-mdpi/ic_launcher_settings.png
index 32a22ac..69709a8 100644
--- a/res/mipmap-mdpi/ic_launcher_settings.png
+++ b/res/mipmap-mdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_settings.png b/res/mipmap-xhdpi/ic_launcher_settings.png
index 9bfdd78..c3adce6 100644
--- a/res/mipmap-xhdpi/ic_launcher_settings.png
+++ b/res/mipmap-xhdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_settings.png b/res/mipmap-xxhdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..52fe978
--- /dev/null
+++ b/res/mipmap-xxhdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_settings.png b/res/mipmap-xxxhdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..6b92795
--- /dev/null
+++ b/res/mipmap-xxxhdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 397ee9e..07094a4 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,16 +218,127 @@
     <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="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"mediaknoppies"</item>
+    <item msgid="4547883971364273343">"klankfokus"</item>
+    <item msgid="2603878814882344450">"meestervolume"</item>
+    <item msgid="7136963238377062018">"stemvolume"</item>
+    <item msgid="4270236897655923007">"lui-volume"</item>
+    <item msgid="6325739889222559394">"mediavolume"</item>
+    <item msgid="5762123934816216821">"wekkervolume"</item>
+    <item msgid="785049718065337473">"kennisgewingvolume"</item>
+    <item msgid="6700305533746877052">"bluetoothvolume"</item>
+    <item msgid="2029227495214047094">"hou wakker"</item>
+    <item msgid="26109888160231211">"monitor ligging"</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>
+    <item msgid="5753789168376302997">"Mediaknoppies"</item>
+    <item msgid="3265262911688671938">"Oudiofokus"</item>
+    <item msgid="2098976479485046797">"Meestervolume"</item>
+    <item msgid="5660213838861789350">"Stemvolume"</item>
+    <item msgid="7983336752371254444">"Luivolume"</item>
+    <item msgid="7878027809189330917">"Mediavolume"</item>
+    <item msgid="7260546305036218513">"Wekkervolume"</item>
+    <item msgid="9103719301075748925">"Kennisgewingvolume"</item>
+    <item msgid="7025966722295861512">"Bluetoothvolume"</item>
+    <item msgid="4665183401128289653">"Hou wakker"</item>
+    <item msgid="8584357129746649222">"Ligging"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Medium"</item>
     <item msgid="2372711992605524591">"Lank"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (ontfout)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Gebruik Dalvik"</item>
+    <item msgid="5131846588686178907">"Gebruik ART"</item>
+    <item msgid="4530003713865319928">"Gebruik ART-ontfoutbou"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Kontroleer nooit"</item>
     <item msgid="6042769699089883931">"Kontroleer net vir DRM-inhoud"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Animasieskaal 5x"</item>
     <item msgid="1069584980746680398">"Animasieskaal 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Geen"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi en 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Geen"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Af"</item>
+    <item msgid="7688197031296835369">"Wys oortrekareas"</item>
+    <item msgid="8332661909019981149">"Wys oortrektoonbank"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standaardlimiet"</item>
     <item msgid="4071574792028999443">"Geen agtergrondprosesse"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Uittelling"</item>
     <item msgid="7664124146786465092">"Onsuksesvol"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Vra"</item>
+    <item msgid="5077768429488260031">"Moet nooit toelaat dat"</item>
+    <item msgid="1417929597727989746">"Laat altyd toe"</item>
+  </string-array>
 </resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 6075a8d..9b75efc 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nee"</string>
     <string name="create" msgid="3578857613172647409">"Skep"</string>
+    <string name="allow" msgid="3349662621170855910">"Laat toe"</string>
+    <string name="deny" msgid="6947806159746484865">"Weier"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Onbekend"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Jy het nou <xliff:g id="STEP_COUNT">%1$d</xliff:g> stap oor voor jy \'n ontwikkelaar is."</item>
+    <item quantity="other" msgid="6722953419953594148">"Jy het nou <xliff:g id="STEP_COUNT">%1$d</xliff:g> stappe oor voor jy \'n ontwikkelaar is."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Jy is nou \'n ontwikkelaar!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Toemaar, jy is reeds \'n ontwikkelaar."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"DRAADLOOS en NETWERKE"</string>
     <string name="header_category_device" msgid="5781174212691167553">"TOESTEL"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PERSOONLIK"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Laai"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Ontlaai"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(draadloos)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Laai nie"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Laai nie"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Vol"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Uitgeprop"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"draadloos"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Onbekend"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Onbekend"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Onbekende fout"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Koud"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Ontdekbaar"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Sigbaar vir alle nabye Bluetooth-toestelle (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Sigbaar vir alle Bluetooth-toestelle wat naby is"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nie sigbaar vir ander Bluetooth-toestelle nie"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Net sigbaar vir saamgebinde toestelle"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Maak toestel opspoorbaar"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Sigbaarheid-tydperk"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Stel hoe lank die toestel opspoorbaar moet wees"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Sluit stembellery"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Voorkom die gebruik van die Bluetooth-beller wanneer die skerm gesluit is"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-toestelle"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Wys ontvangde lêers"</string>
     <string name="device_picker" msgid="8398232791303186677">"Kieser vir Bluetooth-toestelle"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-toestemmingsversoek"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"\'n Program wil Bluetooth aanskakel. Toelaat?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"\'n Program op jou tablet wil jou tablet opspoorbaar maak vir ander Bluetooth-toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes . Toelaat?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"\'n Program op jou foon wil jou foon opspoorbaar maak vir ander Bluetooth-toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes . Toelaat?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"\'n Program op jou tablet wil jou tablet \"altyd opspoorbaar\" maak vir ander Bluetooth-toestelle. Toelaat?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"\'n Program op jou foon wil jou foon \"altyd opspoorbaar\" maak vir ander Bluetooth-toestelle. Toelaat?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"\'n Program op jou tablet wil Bluetooth aanskakel en jou tablet opspoorbaar maak vir ander toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes. Toelaat?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"\'n Program op jou foon wil Bluetooth aanskakel en jou foon opspoorbar maak vir ander toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes. Toelaat?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"\'n Program op jou tablet wil Bluetooth aanskakel en jou tablet opspoorbaar maak vir ander toestelle. Toelaat?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"\'n Program op jou foon wil Bluetooth aanskakel en jou foon opspoorbar maak vir ander toestelle? Toelaat?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"\'n Program wil Bluetooth aanskakel."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"\'n Program wil jou tablet sigbaar maak vir ander Bluetooth-toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"\'n Program wil jou foon sigbaar maak vir ander Bluetooth-toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"\'n Program wil jou tablet sigbaar maak vir ander Bluetooth-toestelle. Jy kan dit later verander in Bluetooth-instellings."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"\'n Program wil jou foon sigbaar maak vir ander Bluetooth-toestelle. Jy kan dit later verander in Bluetooth-instellings."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"\'n Program wil Bluetooth aanskakel en jou tablet sigbaar maak vir ander toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"\'n Program wil Bluetooth aanskakel en jou foon sigbaar maak vir ander toestelle vir <xliff:g id="TIMEOUT">%1$d</xliff:g> sekondes."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"\'n Program wil Bluetooth aanskakel en jou tablet sigbaar maak vir ander toestelle. Jy kan dit later verander in Bluetooth-instellings."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"\'n Progam wil Bluetooth aanskakel en jou foon sigbaar maak vir ander toestelle. Jy kan dit later verander in Bluetooth-instellings."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Skakel tans Bluetooth af…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Skakel tans Bluetooth af…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Outokoppel"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Die HTTP-instaanbediener word deur die blaaier gebruik, maar kan nie deur die ander programme gebruik word nie."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ligging:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naburige CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Selinligting:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Datapogings:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-dienste:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Swerwing:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Jy het dataverbinding verloor omdat jy wegbeweeg het van jou tuisnetwerk af sonder om dataswerwing weer aan te skakel."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Skakel dit aan"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"As jy dataswerwing toelaat, kan dit moontlik heelwat swerfkoste veroorsaak!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"As jy dataswerwing toelaat, kan hoë swerwingskoste jou in die gesig staar! \n\nHierdie instelling beïnvloed alle gebruikers op hierdie tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"As jy dataswerwing toelaat, kan hoë swerwingskoste jou in die gesig staar! \n\nHierdie instelling beïnvloed alle gebruikers op hierdie foon."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Laat dataswerwing toe?"</string>
     <string name="networks" msgid="6333316876545927039">"Operateurkeuse"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Kies \'n netwerkoperateur"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Eienaar se inligting"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Vereis \'n numeriese PIN of wagwoord om jou tablet te dekripteer elke keer as jy dit aanskakel"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Vereis \'n numeriese PIN of wagwoord om jou foon te dekripteer elke keer as jy dit aanskakel"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Geënkripteer"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media, en ander lêers enkripteer. Sodra jy jou tablet geënkripteer het, moet jy elke keer \'n numeriese PIN of wagwoord invoer om dit te dekripteer wanneer jy dit aanskakel. Jy kan nie jou tablet dekripteer nie, behalwe deur \'n fabrieksterugstelling uit te voer, wat al jou data sal uitvee."\n\n"Enkripsie neem \'n uur of langer. Jy moet begin met \'n volgelaaide battery en jou tablet ingeprop hou tot enkripsie klaar is. As jy die enkripsieproses onderbreek, sal jy sommige van of al jou data verloor."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media, en ander lêers enkripteer. Sodra jy jou foon geënkripteer het, moet jy elke keer \'n numeriese PIN of wagwoord invoer om dit te dekripteer wanneer jy dit aanskakel. Jy kan nie jou foon dekripteer nie, behalwe deur \'n fabrieksterugstelling uit te voer, wat al jou data sal uitvee."\n\n"Enkripsie neem \'n uur of langer. Jy moet begin met \'n volgelaaide battery en jou foon ingeprop hou tot enkripsie klaar is. As jy die enkripsieproses onderbreek, sal jy sommige van of al jou data verloor."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media, en ander lêers enkripteer. Sodra jy jou tablet geënkripteer het, moet jy elke keer \'n numeriese PIN of wagwoord invoer om dit te dekripteer wanneer jy dit aanskakel. Jy kan nie jou tablet dekripteer nie, behalwe deur \'n fabrieksterugstelling uit te voer, wat al jou data sal uitvee.\n\nEnkripsie neem \'n uur of langer. Jy moet begin met \'n volgelaaide battery en jou tablet ingeprop hou tot enkripsie klaar is. As jy die enkripsieproses onderbreek, sal jy sommige van of al jou data verloor."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media, en ander lêers enkripteer. Sodra jy jou foon geënkripteer het, moet jy elke keer \'n numeriese PIN of wagwoord invoer om dit te dekripteer wanneer jy dit aanskakel. Jy kan nie jou foon dekripteer nie, behalwe deur \'n fabrieksterugstelling uit te voer, wat al jou data sal uitvee.\n\nEnkripsie neem \'n uur of langer. Jy moet begin met \'n volgelaaide battery en jou foon ingeprop hou tot enkripsie klaar is. As jy die enkripsieproses onderbreek, sal jy sommige van of al jou data verloor."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Enkripteer tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Enkripteer foon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laai jou battery en probeer weer."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Probeer weer oor <xliff:g id="DELAY">^1</xliff:g> sekondes."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Voer jou wagwoord in"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripsie onsuksesvol"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripsie is onderbreek en kan nie voltooi word nie. Gevolglik is die data op jou tablet nie langer toeganklik nie. "\n\n" Om gebruik van jou tablet te hervat, moet jy \'n fabriekterugstelling doen. As jy jou tablet opstel na die terugstelling, sal jy \'n geleentheid kry om enige inligting te herstel wat na jou Google-rekening gerugsteun was."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripsie is onderbreek en kan nie voltooi word nie. Gevolglik is die data op jou selfoon nie langer toeganklik nie. "\n\n"Om gebruik van jou selfoon te hervat, moet jy \'n fabriekterugstelling doen. As jy jou foon na die terugstelling weer opstel, sal jy \'n geleentheid kry om enige inligting te herstel wat na jou Google-rekening gerugsteun was."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripsie is onderbreek en kan nie voltooi word nie. Gevolglik is die data op jou tablet nie langer toeganklik nie. \n\n Om gebruik van jou tablet te hervat, moet jy \'n fabriekterugstelling doen. As jy jou tablet opstel na die terugstelling, sal jy \'n geleentheid kry om enige inligting te herstel wat na jou Google-rekening gerugsteun was."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripsie is onderbreek en kan nie voltooi word nie. Gevolglik is die data op jou selfoon nie langer toeganklik nie. \n\nOm gebruik van jou selfoon te hervat, moet jy \'n fabriekterugstelling doen. As jy jou foon na die terugstelling weer opstel, sal jy \'n geleentheid kry om enige inligting te herstel wat na jou Google-rekening gerugsteun was."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Wissel invoermetode"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Kies skermslot"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Kies rugsteunslot"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Verander ontsluit-PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Verander ontsluitwagwoord"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Wagwoord moet minstens %d karakters hê"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN moet minstens %d karakters bevat"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN moet minstens %d syfers wees"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Raak \"Gaan voort\" as jy klaar is"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Gaan voort"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Wagwoord moet korter as <xliff:g id="NUMBER">%d</xliff:g> karakters wees."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As luidsprekerfoon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Vir musiek en media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Onthou instellings"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Saamgebinde skerms"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Beskikbare toestelle"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Koppel tans"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Gekoppel"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Beskikbaar"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"In gebruik"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Vertooninstellings"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Ontkoppel?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Dit sal jou verbinding met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; beëindig."</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Draadlose vertoonopsies"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Vergeet"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Klaar"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Naam"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Aan"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Af"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Gedeaktiveer"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Laat dataruiling toe wanneer die tablet aan \'n ander toestel raak"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Laat data-ruilprogram toe wanneer die foon aan \'n ander toestel raak"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Af"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Onbeskikbaar omdat NFC afgeskakel is"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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 \nBring 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="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="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="8116564886303972764">"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_in_progress" msgid="2944576520214787628">"WPS is reeds besig en kan tot twee minute neem om te voltooi"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Die draadlose roeteerder se sekuriteitsinstelling (TKIP) word nie ondersteun nie"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Stawingmislukking. Probeer asseblief weer."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Nog \'n WPS-sessie is opgespoor. Probeer asseblief oor \'n paar minute weer."</string>
     <string name="wifi_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>
@@ -564,6 +621,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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Stoor"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Netwerkstoring het misluk"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Kanselleer"</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_skip_anyway" msgid="6965361454438011190">"Slaan in elk geval oor"</string>
+    <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\nTablet-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\nFoon-opstelling kan beduidende netwerkaktiwiteit vereis."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Soek tans…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Hernoem toestel"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Portuurtoestelle"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Onthoude groepe"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Kon nie koppel nie."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Kon nie toestel hernoem nie."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Ontkoppel?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"As jy ontkoppel, sal jou verbinding met <xliff:g id="PEER_NAME">%1$s</xliff:g> en <xliff:g id="PEER_COUNT">%2$s</xliff:g> ander toestelle ophou."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Wi-Fi-warmkol"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vergeet hierdie groep?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Draagbare Wi-Fi-warmkol"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Musiekeffekte"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Luiervolume"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibreer wanneer stil"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Verstek kennisgewing"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Verstek kennisgewingklank"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Flikker kennisgewing-liggie"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Luitoon"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Kennisgewing"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Gebruik inkomendeoproep-volume vir kennisgewings"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Kies kennisgewingsluitoon"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Verstek kennisgewingklank"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Media"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Stel volume vir musiek en video\'s"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Wekker"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> se onaktiwiteit"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Muurpapier"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Kies muurpapier uit"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Skermversiering"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Sal begin sodra slaap, mits gekoppel aan krag"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Gedeaktiveer"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Gekose versiering"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Wanneer om te aktiveer"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> van niksdoen"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nooit"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Probeer dit!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Begin ook wanneer gedok"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Sluimer"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Wanneer dit gedok is of slaap en laai"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Enige een"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Terwyl laai"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Terwyl dit gedok is"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Af"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Om te beheer wat gebeur wanneer die foon gedok is en/of slaap, skakel Sluimer aan."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Wanneer om Sluimer te gebruik"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Begin nou"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Instellings"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Outomatiese helderheid"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fontgrootte"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Lettergrootte"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Verkeerde PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN\'e stem nie ooreen nie"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Kan nie PIN verander nie."\n"Moontlik verkeerde PIN."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Kan nie PIN verander nie.\nMoontlik verkeerde PIN."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-PIN is suksesvol verander"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Kan nie SIM-kaart se sluitstatus verander nie."\n"Moontlik \'n verkeerde PIN."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Kan nie SIM-kaart se sluitstatus verander nie.\nMoontlik \'n verkeerde PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Kanselleer"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tabletstatus"</string>
@@ -715,7 +788,8 @@
     <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>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -733,12 +807,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">"Mobielenetwerk-tipe"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Operateurinligting"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Mobielenetwerk-status"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Diensstatus"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-berging"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kaart"</string>
     <string name="memory_available" msgid="5052397223077021181">"Beskikbaar"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Beskikbaar (leesalleen)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Totale spasie"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Bereken tans…"</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Programme (programdata en media-inhoud)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Prente, video\'s"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Oudio (musiek, luitone, podsendings ens.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Diverse"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Gekasseerde data"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Ontheg gedeelde berging"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Ontheg SD-kaart"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Ontheg die interne USB-berging"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Vee SD-kaart uit"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Vee alle data op die interne USB-berging uit, soos musiek en foto\'s"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Vee alle data op die SD-kaart uit, soos musiek en foto\'s"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Leesalleen)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Moet gekasseerde data skoongemaak word?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Dit sal gekasseerde data vir alle programme skoonmaak."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP- of PTP-funksie is aktief"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Ontheg USB-berging?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Demonteer SD-kaart?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"As jy die USB-berging ontheg het, sal sommige programme wat jy gebruik stop en onbeskikbaar wees totdat jy die USB-berging weer heg."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Camera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Laat jou foto\'s met kamerasagteware deel, en enige lêers oordra op rekenaars wat nie MTP ondersteun nie"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installeer lêeroordrag-hulpmiddels"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Ander gebruikers"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batterystatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batteryvlak"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Toegangspuntname"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrieksterugstelling"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Vee alle data op tablet uit"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Vee al die data op foon uit"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Dit sal al die data uit jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend: "\n\n<li>"jou Google-rekening"</li>\n" "<li>"stelsel- en programdata-instellings"</li>\n<li>"afgelaaide programme"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Dit sal al die data uit jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend: "\n\n<li>"jou Google-rekening"</li>\n" "<li>"stelsel- en programdata-instellings"</li>\n<li>"afgelaaide programme"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jy is tans aangemeld by die volgende rekeninge:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Dit sal al die data uit jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend: \n\n"<li>"jou Google-rekening"</li>\n" "<li>"stelsel- en programdata-instellings"</li>\n<li>"afgelaaide programme"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Dit sal al die data uit jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend: \n\n"<li>"jou Google-rekening"</li>\n" "<li>"stelsel- en programdata-instellings"</li>\n<li>"afgelaaide programme"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jy is tans aangemeld by die volgende rekeninge:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiek"</li>\n<li>"Foto\'s"</li>\n<li>"Ander gebruikerdata"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Om musiek, prente en ander gebruikersdata uit te vee, moet die "<b>"USB-berging"</b>" uitgevee word."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Om musiek, prente en ander gebruikersdata uit te vee, moet die "<b>"SD-kaart"</b>" uitgevee word."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sal ontverbind word."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hulp"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiele netwerke"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Bestuur mobiele plan"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Onbekende SIM-operateur"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s het geen bekende voorsieningwebwerf nie"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Steek asseblief SIM-kaart in en herbegin"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Koppel asseblief aan die internet"</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>
@@ -917,6 +1004,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Sien regsinligting, status, sagteware-weergawe"</string>
     <string name="legal_information" msgid="5769301644270604095">"Regsinligting"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Bydraers"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Regulerende inligting"</string>
     <string name="copyright_title" msgid="865906688917260647">"Kopiereg"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensie"</string>
     <string name="terms_title" msgid="7697580845616764642">"Bepalings en voorwaardes"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Verander ontsluit-PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bevestig gestoorde patroon"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Probeer weer:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Teken \'n ontsluitpatroon"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Teken \'n ontsluitpatroon"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Druk Kieslys vir hulp."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Lig vinger wanneer jy klaar is."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Verbind ten minste <xliff:g id="NUMBER">%d</xliff:g> kolletjies. Probeer weer:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Hoe om \'n ontsluitpatroon te teken"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Te veel verkeerde pogings!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Probeer weer oor <xliff:g id="NUMBER">%d</xliff:g> sekondes."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Kanselleer"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Volgende"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Beveilig jou tablet"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Beveilig jou foon"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Beskerm jou tablet teen ongemagtigde gebruik deur \'n persoonlike skermontsluitpatroon te skep. Laat gly jou vinger oor die volgende skerm om die kolletjies in enige volgorde te verbind. Jy moet ten minste vier kolletjies verbind. "\n\n"Reg om te begin? Raak Volgende."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Beskerm jou foon teen ongemagtigde gebruik deur \'n persoonlike skermontsluit-patroon te skep. Gly met jou vinger om ten minste vier kolletjies in enige volgorde op die volgende skerm te verbind. "\n\n"Gereed? Raak \"Volgende\"."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Die program is nie op jou foon geïnstalleer nie."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Bestuur programme"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Bestuur en verwyder geïnstalleerde programme"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Programme"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Laat die installering van programme van onbekende bronne toe"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Jou tablet en persoonlike inligting is meer blootgestel aan aanvalle van programme uit onbekende bronne. Jy stem in dat slegs jy verantwoordelik is vir enige skade aan jou tablet of verlies van data weens die gebruik van hierdie programme."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Jou selfoon en persoonlike inligting is meer kwesbaar vir aanvalle deur programme van onbekende bronne. Jy stem saam dat slegs jy verantwoordelik is vir enige skade aan jou foon of verlies van data weens die gebruik van hierdie programme."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Verifieer programme"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Weier of waarsku voor programme geïnstalleer word wat skade kan veroorsaak"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Gevorderde instellings"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktiveer meer instellingsopsies"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Programinligting"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-berging-data"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kaart"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Verwyder"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Deïnstalleer vir alle gebruikers"</string>
+    <string name="install_text" msgid="884360662922471113">"Installeer"</string>
     <string name="disable_text" msgid="6544054052049395202">"Deaktiveer"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktiveer"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Vee data uit"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Wys gekaste prosesse"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Stel programvoorkeure terug"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Stel programvoorkeure terug?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Dit sal alle voorkeure terugstel vir:"\n\n<li>"Gedeaktiveerde programme"</li>\n" "<li>"Gedeaktiveerde programkennisgewings"</li>\n" "<li>"Verstek programme vir aksies"</li>\n" "<li>"Agtergronddata-beperkings vir programme"</li>\n" "\n" Jy sal nie enige programdata verloor nie."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Dit sal alle voorkeure terugstel vir:\n\n"<li>"Gedeaktiveerde programme"</li>\n" "<li>"Gedeaktiveerde programkennisgewings"</li>\n" "<li>"Verstek programme vir aksies"</li>\n" "<li>"Agtergronddata-beperkings vir programme"</li>\n" \n Jy sal nie enige programdata verloor nie."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Stel programme terug"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Bestuur spasie"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Op SD-kaart"</string>
     <string name="disabled" msgid="9206776641295849915">"Gedeaktiveer"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Nie geïnstalleer nie"</string>
     <string name="no_applications" msgid="7336588977497084921">"Geen programme nie"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interne berging"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-berging"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> en <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Hierdie program kan dalk geld van jou hef:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Stuur \'n premium-SMS"</string>
     <string name="computing_size" msgid="1599186977475211186">"Bereken tans..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Kon nie pakketgrootte bereken nie."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Jy het geen geïnstalleerde derdeparty-programme nie."</string>
@@ -1076,9 +1167,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>
@@ -1094,6 +1190,8 @@
     <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">"Gebruiker: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Verwyderde gebruiker"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses en <xliff:g id="NUMSERVICES">%2$d</xliff:g> diens"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses en <xliff:g id="NUMSERVICES">%2$d</xliff:g> dienste"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> prosesse en <xliff:g id="NUMSERVICES">%2$d</xliff:g> diens"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Fisiese sleutelbordinstellings"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Druk spasie-sleutel twee keer om \".\" in te voeg"</string>
     <string name="show_password" msgid="3001113966880559611">"Maak wagwoorde sigbaar"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Die invoermetode kan dalk alle teks wat jy invoer, versamel, insluitend persoonlike data soos wagwoorde en kredietkaartnommers. Dit kom van die program <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Wil jy dié invoermetode gebruik?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Hierdie speltoetser is dalk in staat om al die teks wat jy invoer te versamel, insluitend persoonlike inligting soos wagwoorde en kredietkaartnommers. Dit kom van die <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>-program. Gebruik hierdie speltoetser?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Instellings"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Om te wissel, druk Control-spasiebalk"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Verstek"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Sleutelborduitlegte"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Gebruikerwoordeboek"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Persoonlike woordeboek"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Persoonlike woordeboeke"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Persoonlike woordeboek"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Voeg by"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Voeg by woordeboek"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skerm sal nooit slaap terwyl laai nie"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktiveer Bluetooth HCI-loerloglêer"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Vang alle Bluetooth HCI-pakette in \'n lêer vas"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Kies looptyd"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Kies looptyd"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Herlaai om looptyd van <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g> te verander?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Laat skynliggings toe"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Laat skynliggings toe"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Kontroleer programme wat via ADB/ADT geïnstalleer is vir skadelike gedrag."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Beskerm USB-berging"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Programme moet toestemming versoek om USB-berging te lees"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Beskerm USB-berging?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wanneer USB-geheue beskerm word, moet programme toestemming versoek om data vanuit eksterne berging te lees."\n\n" Sommige programme werk dalk nie totdat dit deur hul ontwikkelaars opgedateer word.berging"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wanneer USB-geheue beskerm word, moet programme toestemming versoek om data vanuit eksterne berging te lees.\n\n Sommige programme werk dalk nie totdat dit deur hul ontwikkelaars opgedateer word.berging"</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Beskerm SD-kaart"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Programme moet toestemming versoek om SD-kaart te lees"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Beskerm SD-kaart?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wanneer die SD-kaart beskerm word, moet programme toestemming versoek om data vanuit eksterne berging te lees."\n\n"Sommige programme werk dalk nie totdat dit deur hul ontwikkelaars opgedateer word."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wanneer die SD-kaart beskerm word, moet programme toestemming versoek om data vanuit eksterne berging te lees.\n\nSommige programme werk dalk nie totdat dit deur hul ontwikkelaars opgedateer word."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Plaaslike terminaal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktiveer terminaalprogram wat plaaslike skermtoegang bied"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Kies apparaat"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Kies legstuk"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Skep legstuk en laat toegang toe?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Toeganklikheidsinstellings"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Dienste"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Stelsel"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Groot teks"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Krag-knoppie beëindig oproep"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Sê wagwoorde hardop"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Raak-en-hou-vertraging"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Verbeter webtoeganklikheid"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Vergrotingsgebare"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Wanneer hierdie funksie aangeskakel is, kan jy in- en uitzoem deur die skerm te trippeltik.\n \nTerwyl jy ingezoem is, kan jy:\n"<ul><li>"Swenk: Sleep twee of meer vingers oor die skerm."</li>\n<li>"Verstel zoemvlak: Knyp twee of meer vingers saam of versprei hulle uitmekaar."</li></ul>\n\n"Jy kan ook dit wat onder jou vinger is tydelik vergroot deur die skerm te trippeltik-en-hou. In daardie vergroting kan jy jou vinger sleep om verskillende dele van die skerm te verken. Lig jou vinger om terug te keer na die vorige vergroting.\n\nLet wel: trippeltik vir vergroting werk oral behalwe op die sleutelbord en navigasiebalk."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Toeganklikheid-kortpad"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Aan"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Af"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Wanneer hierdie kenmerk aangeskakel is, kan jy toeganklikheidskenmerke vinnig met twee stappe aktiveer:\n\nStap 1: Druk en hou die kragknoppie totdat jy \'n geluid hoor of \'n vibrasie voel.\n\nStap 2: Raak en hou met twee vingers totdat jy oudiobevestiging hoor.\n\nAs die toestel verskeie gebruikers het, sal hierdie kortpad op die sluitskerm tydelik toegang bied totdat die toestel ontsluit is."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Groot teks"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Skermvergroting"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Dateer outomaties skermvergroting op"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Dateer skermvergroting op tydens programverwisseling"</string>
+    <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_menu_item_settings" msgid="3344942964710773365">"Instellings"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Aan"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"Aan"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Af"</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="print_settings" msgid="4742428530112487843">"Druk"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Druk-instellings"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Dienste"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Gebruik <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> kan dokumente ontvang wat jy druk. Sulke dokumente kan sensitiewe inligting bevat."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Geen dienste geïnstalleer nie"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Instellings"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Voeg drukkers by"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Aan"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Af"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Battery"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Wat het die battery gebruik"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Batterygebruikdata is nie beskikbaar nie."</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Data ontvang"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Mobiele data gestuur"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobiele data ontvang"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Wi‑Fi-data gestuur"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Wi‑Fi-data ontvang"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Oudio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tyd aan"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Stop of deïnstalleer die program"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Beheer GPS handmatig om te keer dat program dit gebruik"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Die program kan dalk instellings bied om batterygebruik te verminder"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Battery deur gebruiker gebruik"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sedert uitgeprop is"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Sedert laas uitgeprop vir <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Gebruikstotale"</string>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Toonhoogte"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affekteer die klank van die gesproke teks"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Taal"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Taal nie gekies nie"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Stel die taalspesifieke stem vir gesproke teks"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Luister na \'n voorbeeld"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Speel \'n kort demonstrasie van spraaksintese"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Helderheid <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"outo"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"vol"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"half"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"af"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Eiebewysberging"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installeer uit berging"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Wanneer \'n program weer geïnstalleer word, herstel gerugsteunde instellings en data"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Neem foutverslag"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Dit sal inligting oor die huidige toestand van jou toestel insamel, om as \'n e-posboodskap te stuur. Dit sal \'n tydjie neem vandat die foutverslag begin is totdat dit reg is om gestuur te word; wees asseblief geduldig."</string>
-    <string name="report" msgid="302437572240018342">"Rapporteer"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Werkskerm-rugsteunwagwoord"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Volle rekenaarrugsteune word nie tans beskerm nie"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Raak om die wagwoord vir volledige rekenaarrugsteune te verander of te verwyder"</string>
@@ -1426,7 +1570,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>
@@ -1440,12 +1584,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>
@@ -1467,9 +1611,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\nRaak "<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>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalender"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kontakte"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welkom by Google Sync!"</font>" "\n"\'n Google-benadering om data te sinchroniseer vir toegang tot al jou kontakte, afsprake en meer, ongeag waar jy is."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welkom by Google Sync!"</font>" \n\'n Google-benadering om data te sinchroniseer vir toegang tot al jou kontakte, afsprake en meer, ongeag waar jy is."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Programsinkronisering-instellings"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data en sinkronisering"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Verander wagwoord"</string>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Flits vensteroppervlaktes in geheel wanneer dit opdateer"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Wys GPU-aansigopdaterings"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flits aansigte binne die vensters wanneer dit met die GPU geskets is"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Wys hardewarelae se opdaterings"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Laat hardewarelae groen flits wanneer hulle opgedateer word"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Ontfout GPU-oortrek"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Wys CPU-verbruik"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Skermlaag wys huidige CPU-gebruik"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forseer GPU-lewering"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simuleer sekondêre uitstallings"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Programme"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Moenie aktiwiteite behou nie"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Vernietig elke aktiwiteit sodra die gebruiker dit verlaat"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Deaktiveer agtergronddata op mobiele netwerke. Niesellulêre netwerke sal gebruik word, indien beskikbaar."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Om agtergronddata vir hierdie program te beperk, moet jy eers \'n mobieldatalimiet stel."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Beperk agtergronddata?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Hierdie funksie kan veroorsaak dat \'n program wat afhanklik is van agtergronddata, ophou werk wanneer slegs mobiele netwerke beskikbaar is."\n\n"Jy kan meer geskikte datagebruik-kontroles vind in die instellings wat in die program self beskikbaar is."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Hierdie funksie kan veroorsaak dat \'n program wat afhanklik is van agtergronddata, ophou werk wanneer slegs mobiele netwerke beskikbaar is.\n\nJy kan meer geskikte datagebruik-kontroles vind in die instellings wat in die program self beskikbaar is."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Beperking van agtergronddata is moontlik slegs as jy \'n mobieldatalimiet gestel het."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Moet die outomatiese sinkronisering van data aangeskakel word?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Enige veranderings wat jy aan jou rekeninge op die web maak, sal outomaties na jou tablet gekopieer word."\n\n"Sommige rekeninge kan ook moontlik outomaties enige veranderinge wat jy op die tablet maak, na die web kopieer. \'n Google-rekening werk so."\n\n"Om te kies watter soort inligting binne elke rekening gesinkroniseer moet word, gaan na Instellings en Rekeninge."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Enige veranderings wat jy aan jou rekeninge op die web maak, sal outomaties na jou foon gekopieer word."\n\n"Sommige rekeninge kan ook moontlik outomaties enige veranderinge wat jy op die foon maak, na die web kopieer. \'n Google-rekening werk so."\n\n"Om te kies watter soort inligting binne elke rekening gesinkroniseer moet word, gaan na Instellings en Rekeninge."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Enige veranderings wat jy aan jou rekeninge op die web maak, sal outomaties na jou tablet gekopieer word.\n\nSommige rekeninge kan ook moontlik outomaties enige veranderinge wat jy op die tablet maak, na die web kopieer. \'n Google-rekening werk so.\n\nOm te kies watter soort inligting binne elke rekening gesinkroniseer moet word, gaan na Instellings en Rekeninge."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Enige veranderings wat jy aan jou rekeninge op die web maak, sal outomaties na jou foon gekopieer word.\n\nSommige rekeninge kan ook moontlik outomaties enige veranderinge wat jy op die foon maak, na die web kopieer. \'n Google-rekening werk so.\n\nOm te kies watter soort inligting binne elke rekening gesinkroniseer moet word, gaan na Instellings en Rekeninge."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Moet die outomatiese sinkronisering van data afgeskakel word?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Dit sal data- en batteryverbruik bespaar, maar jy sal elke rekening self moet sinkroniseer om onlangse inligting in te samel.  En jy sal geen kennisgewings ontvang wanneer opdaterings plaasvind nie."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Gebruiksiklus-terugsteldatum"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Stel dataverbruik-waarskuwing"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Stel dataverbruik-limiet"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Beperk datagebruik"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Jou mobiele dataverbinding sal gedeaktiveer word wanneer die gespesifiseerde limiet bereik word.\n\nAangesien 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\nAangesien 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" 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\nHierdie 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\nHierdie 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Verwyderde programme en gebruikers"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> ontvang, <xliff:g id="SENT">%2$s</xliff:g> gestuur"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> gebruik."</string>
     <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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Voeg VPN-profiel by"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Redigeer profiel"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Vee profiel uit"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Altydaan-VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Kies \'n VPN-profiel om altyd aan gekoppel te bly. Netwerkverkeer sal net toegelaat word wanneer verbind aan hierdie VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Geen"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Altydaan-VPN vereis \'n IP-adres vir beide die bediener en DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Daar is geen netwerkverbinding nie. Probeer asseblief later weer."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"\'n Sertifikaat ontbreek. Wysig asseblief die profiel."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Stelsel"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Kanselleer"</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">"Bykomende stelselopdaterings"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Gebruikers en beperkings"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Gebruikers"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Voeg gebruiker by"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Redigeer besonderhede"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Gebruikerinligting"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Naam"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Inhoudbeperkings"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Vereis PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Inhoudgradering"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Stelselprogramme"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Geïnstalleerde programme"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Gooi weg"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Verwyder gebruiker"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Lastige kind"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Gedeaktiveer"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Toestemmend"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Pas toe"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Gebruikers"</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_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="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\nNadat jy \'n nuwe gebruiker geskep het, moet daardie persoon deur \'n opstelproses gaan.\n\nEnige 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\nEnige 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_confirm_remove_message" msgid="5284111415714437285">"Is jy seker jy wil die gebruiker en alle verwante data van die toestel verwyder?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Verander lettergrootte"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Beperkings"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Verwyder beperkings"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Verander PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Wys kennisgewings"</string>
     <string name="help_label" msgid="1107174367904110532">"Hulp"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Rekening vir die inhoud"</string>
+    <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="6160672982086584261">"Stel program-beperkings"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Beheer deur <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Hierdie program word nie in beperkte profiele ondersteun nie"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Hierdie program kan toegang tot jou rekeninge kry"</string>
+    <string name="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 00b0101..485369f 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,16 +218,127 @@
     <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="886742181977884584">"ማህደረ መረጃ"</item>
+    <item msgid="7924928667052300589">"መሣሪያ"</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>
+    <item msgid="5124443975763747838">"የሚዲያ አዝራሮች"</item>
+    <item msgid="4547883971364273343">"የድምጽ ትኩረት"</item>
+    <item msgid="2603878814882344450">"ዋናው ድምጽ መቆጣጠሪያ"</item>
+    <item msgid="7136963238377062018">"የድምጽ መጠን"</item>
+    <item msgid="4270236897655923007">"የደወል ድምጽ መጠን"</item>
+    <item msgid="6325739889222559394">"የማህደረ መረጃ መጠን"</item>
+    <item msgid="5762123934816216821">"የማንቂያ ድምፅ መጠን"</item>
+    <item msgid="785049718065337473">"የማሳወቂያ ድምጽ መጠን"</item>
+    <item msgid="6700305533746877052">"የብሉቱዝ ድምፅ መጠን"</item>
+    <item msgid="2029227495214047094">"እንደነቃ አቆይ"</item>
+    <item msgid="26109888160231211">"አካባቢን ይቆጣጠሩ"</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>
+    <item msgid="5753789168376302997">"የሚዲያ አዝራሮች"</item>
+    <item msgid="3265262911688671938">"የድምጽ ትኩረት"</item>
+    <item msgid="2098976479485046797">"ዋናው የድምጽ መቆጣጠሪያ"</item>
+    <item msgid="5660213838861789350">"የድምጽ መጠን"</item>
+    <item msgid="7983336752371254444">"የደወል ድምጽ መጠን"</item>
+    <item msgid="7878027809189330917">"የማህደረ መረጃ ክፍልፍል"</item>
+    <item msgid="7260546305036218513">"የማንቂያ ድምፅ መጠን"</item>
+    <item msgid="9103719301075748925">"የማሳወቂያ ድምጽ መጠን"</item>
+    <item msgid="7025966722295861512">"የብሉቱዝ ድምፅ መጠን"</item>
+    <item msgid="4665183401128289653">"እንደነቃ አቆይ"</item>
+    <item msgid="8584357129746649222">"አካባቢ"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"አጭር"</item>
     <item msgid="2560532955514699713">"መካከለኛ"</item>
     <item msgid="2372711992605524591">"ረጅም"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (ስህተት አርም)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Dalvik ይጠቀሙ"</item>
+    <item msgid="5131846588686178907">"ART ይጠቀሙ"</item>
+    <item msgid="4530003713865319928">"ART ስህተት የማረም ግንባታ ይጠቀሙ"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"በፍፁም አትመልከት"</item>
     <item msgid="6042769699089883931">"የDRM ይዘት ብቻ ተመልከት"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"የእነማ ልኬት ለውጥ 5x"</item>
     <item msgid="1069584980746680398">"የእነማ ልኬት ለውጥ 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"ምንም የለም"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi እና 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"ምንም"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"ጠፍቷል"</item>
+    <item msgid="7688197031296835369">"ስዕሉ አልፎ የፈሰሰባቸው አካባቢዎችን አሳይ"</item>
+    <item msgid="8332661909019981149">"የአልፎ ፍሰት ቆጣሪውን አሳይ"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"መደበኛ ወሰኖች"</item>
     <item msgid="4071574792028999443">"ምንም የዳራ ሂደቶች የሉም"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"ጊዜው አልቋል"</item>
     <item msgid="7664124146786465092">"ስኬታማ አልነበረም"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"ጠይቅ"</item>
+    <item msgid="5077768429488260031">"በጭራሽ አትፍቀድ"</item>
+    <item msgid="1417929597727989746">"ሁልጊዜ ፍቀድ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 09a6de4..ab9afbb 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"አዎ"</string>
     <string name="no" msgid="6731231425810196216">"አይ"</string>
     <string name="create" msgid="3578857613172647409">"ፍጠር"</string>
+    <string name="allow" msgid="3349662621170855910">"ይፍቀዱ"</string>
+    <string name="deny" msgid="6947806159746484865">"ይከልክሉ"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ያልታወቀ"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"አሁን ገንቢ ለመሆን <xliff:g id="STEP_COUNT">%1$d</xliff:g> ደረጃ ይቀርዎታል።"</item>
+    <item quantity="other" msgid="6722953419953594148">"አሁን ገንቢ ለመሆን <xliff:g id="STEP_COUNT">%1$d</xliff:g> ደረጃዎች ይቀርዎታል።"</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"አሁን ገንቢ ሆነዋል!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"አያስፈልግም፣ አስቀድሞ ገንቢ ሆነዋል።"</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"ገመድ አልባ&amp; አውታረ መረቦች"</string>
     <string name="header_category_device" msgid="5781174212691167553">"መሣሪያ"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"የግል"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"ኃይል በመሙላት ላይ"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"በመልቀቅ ላይ"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(ገመድ አልባ)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"ባትሪ እየሞላ አይደለም"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"ኃይል  እየሞላ አይደለም"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"ሙሉነው"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"ሶኬቱ አልተሰካም"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"ገመድ አልባ"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"ያልታወቀ"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"ያልታወቀ"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"ያልታወቀ ስህተት"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"ቀዝቃዛ"</string>
     <string name="bluetooth" msgid="5549625000628014477">"ብሉቱዝ"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"መገኘት የሚችል"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"ለሁሉም የብሉቱዝ መሣሪያዎች(<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>) የሚታይ"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"ለሁሉም የብሉቱዝ መሣሪያዎች የሚታይ"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"ለሌሎች የብሉቱዝ መሣሪያዎች አይታይም"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"ለተጣመሩ መሣሪያዎች ብቻ የሚታይ"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"መሳሪያው መገኘት የሚችል አድርግ"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"የታይነትጊዜ አብቅቷል"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"መሣሪያ በምን ያህል ጊዜ እንደሚገኝ አዘጋጅ"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"በድምፅ መደወያ ቆልፍ"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ማያው ሲቆለፍ የብሉቱዝ ደዋዩ እንዳይጠቀምበት ተከላከል።"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"የብሉቱዝመሣሪያዎች"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"የደረሱ ፋይሎችን አሳይ"</string>
     <string name="device_picker" msgid="8398232791303186677">"የብሉቱዝ መሣሪያ መራጭ"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"የብሉቱዝ ፈቃድ ጥየቃ"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"መተግበሪያ ብሉቱዝን ማብራት ይፈልጋል:: ፍቀድ?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"በጡባዊህ ላይ ያለ መተግበሪያ ብሉቱዝን አብርቶ ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ጡባዊህ በሌሎች መሣሪያዎች እንዲገኝ ማድረግ ይፈልጋል:: ፍቀድ?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"በስልክህ ላይ ያለ መተግበሪያ ብሉቱዝን አብርቶ ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ስልክህ በሌሎች መሣሪያዎች እንዲገኝ ማድረግ ይፈልጋል::  ፍቀድ?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"በጡባዊህ ላይ ያለ መተግበሪያ ብሉቱዝን አብርቶ ጡባዊህ በሌሎች መሣሪያዎች “ሁልጊዜ እንዲገኝ ማድረግ ይፈልጋል:: ፍቀድ?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"በስልክህ ላይ ያለ መተግበሪያ ብሉቱዝን አብርቶ ስልክህ በሌሎች መሣሪያዎች “ሁልጊዜ እንዲገኝ ማድረግ ይፈልጋል::  ፍቀድ?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"በጡባዊህ ላይ ያለ መተግበሪያ ብሉቱዝን አብርቶ ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ጡባዊህ በሌሎች መሣሪያዎች እንዲገኝ ማድረግ ይፈልጋል:: ፍቀድ?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"በስልክህ ላይ ያለ መተግበሪያ ብሉቱዝን አብርቶ ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ስልክህ በሌሎች መሣሪያዎች እንዲገኝ ማድረግ ይፈልጋል::  ፍቀድ?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"በጡባዊህ ላይ ያለ መተግበሪያ ብሉቱዝን አብርቶ ጡባዊህ በሌሎች መሣሪያዎች እንዲገኝ ማድረግ ይፈልጋል:: ፍቀድ?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"በስልክህ ላይ ያለ መተግበሪያ ብሉቱዝን አብርቶ ስልክህ በሌሎች መሣሪያዎች እንዲገኝ ማድረግ ይፈልጋል::  ፍቀድ?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"አንድ መተግበሪያ ብሉቱዝን ማብራት ይፈልጋል።"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"አንድ መተግበሪያ ጡባዊዎን ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ለሌሎች የብሉቱዝ መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል።"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"አንድ መተግበሪያ ስልክዎን ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ለሌሎች የብሉቱዝ መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል።"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"አንድ መተግበሪያ ጡባዊዎን ለሌሎች የብሉቱዝ መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል። ይሄን በኋላ ላይ በብሉቱዝ ቅንብሮች ውስጥ ሊቀይሩት ይችላሉ።"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"አንድ መተግበሪያ ስልክዎን ለሌሎች የብሉቱዝ መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል። ይሄን በኋላ ላይ በብሉቱዝ ቅንብሮች ውስጥ ሊቀይሩት ይችላሉ።"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"አንድ መተግበሪያ ብሉቱዝን አብርቶ ጡባዊዎን ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ለሌሎች መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል።"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"አንድ መተግበሪያ ብሉቱዝን አብርቶ ስልክዎን ለ<xliff:g id="TIMEOUT">%1$d</xliff:g> ሰከንዶች ያህል ለሌሎች መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል።"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"አንድ መተግበሪያ ብሉቱዝን አብርቶ ጡባዊዎን ለሌሎች መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል። ይሄን በኋላ ላይ በብሉቱዝ ቅንብሮች ውስጥ ሊቀይሩት ይችላሉ።"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"አንድ መተግበሪያ ብሉቱዝን አብርቶ ስልክዎን ለሌሎች መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል። ይሄን በኋላ ላይ በብሉቱዝ ቅንብሮች ውስጥ ሊቀይሩት ይችላሉ።"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"ብሉቱዝ በማብራት ላይ..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"ብሉቱዝ በማጥፋት ላይ..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"በራስ ሰር ተገናኝ"</string>
@@ -159,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>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"አሳሹ የHTTP ተተኪ ተጠቅሟል ሆኖም በሌሎች መተግበሪያዎች ላይጠቀም ይችላል።"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"ስፍራ:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"አጎራባችCID፡"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo፦"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"የውሂብ ሙከራዎች፡"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"የGPRS አገልግሎት፡"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"በመንቀሳቀስ ላይ:"</string>
@@ -260,20 +268,22 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"የውሂብዎ ተያያዥነት ጠፍቷል ምክንያቱም የቤትዎን አውታረመረብ በእንቅስቃሴ ላይ አጥፋተው በመተዎ ነው።"</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"አብራው"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"የውሂብ ዝውውር በምትፈቅድበት ጊዜ፤ ላቅ ያለ የዝውውር ክፍያዎች ልትከፍልትችላለህ!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"የውሂብ ዝውውር ሲፈቅዱ ጉልህ የሆኑ የውሂብ ዝውውር ክፍያዎች ሊደርስብዎት ይችላል!\n\nይህ ቅንብር እዚህ ጡባዊ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"የውሂብ ዝውውር ሲፈቅዱ ጉልህ የሆኑ የውሂብ ዝውውር ክፍያዎች ሊደርስብዎት ይችላል!\n\nይህ ቅንብር እዚህ ስልክ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"የውሂብ ዝውውር ፍቀድ?"</string>
     <string name="networks" msgid="6333316876545927039">"የከዋኝ ምርጫ"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"የአውታረ መረብ ከዋኝ ምረጥ"</string>
-    <string name="date_and_time_settings_title" msgid="3350640463596716780">"ቀን&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>
@@ -297,6 +307,10 @@
     <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>
@@ -308,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>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"በ <xliff:g id="DELAY">^1</xliff:g>ሰከንዶች ውስጥ እንደገና ሞክር።"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"የይለፍቃልህን ተይብ"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ምስጠራ ስኬታማ አልነበረም"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"ማመስጠር ተቆራርጧል እና መጨረስ አይችልም። በመሆኑም፣ በጡባዊዎ ላይ ያለውን ውሂብ እስከነጭራሹ መድረስ አይቻልም። "\n\n" ጡባዊህን በመጠቀም ለመቀጠል፣ የፋብሪካ ዳግም አስጀምር ማከናወን አለብህ። ጡባዊህን ዳግም ካስጀመርክ በኋላ ስታዘጋጅ፣ ወደ Google መለያህ አስጠብቀህ የነበረውን ውሂብ እነበረበት ለመመለስ እድሉን ታገኛለህ።"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"ማመስጠር ተቆራርጧል እና መጨረስ አይችልም። በመሆኑም፣ በስልክህ ላይ ያለውን ውሂብ እስከነጭራሹ መድረስ አይቻልም። "\n\n" ስልክህን በመጠቀም ለመቀጠል፣ የፋብሪካ ዳግም አስጀምር ማከናወን አለብህ። ስልክህን ዳግም ካስጀመርክ በኋላ ስታዘጋጅ፣ ወደ Google መለያህ አስጠብቀህ የነበረውን ውሂብ እነበረበት ለመመለስ እድሉን ታገኛለህ።"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"ማመስጠር ተቆራርጧል እና መጨረስ አይችልም። በመሆኑም፣ በጡባዊዎ ላይ ያለውን ውሂብ እስከነጭራሹ መድረስ አይቻልም። \n\n ጡባዊህን በመጠቀም ለመቀጠል፣ የፋብሪካ ዳግም አስጀምር ማከናወን አለብህ። ጡባዊህን ዳግም ካስጀመርክ በኋላ ስታዘጋጅ፣ ወደ Google መለያህ አስጠብቀህ የነበረውን ውሂብ እነበረበት ለመመለስ እድሉን ታገኛለህ።"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"ማመስጠር ተቆራርጧል እና መጨረስ አይችልም። በመሆኑም፣ በስልክህ ላይ ያለውን ውሂብ እስከነጭራሹ መድረስ አይቻልም። \n\n ስልክህን በመጠቀም ለመቀጠል፣ የፋብሪካ ዳግም አስጀምር ማከናወን አለብህ። ስልክህን ዳግም ካስጀመርክ በኋላ ስታዘጋጅ፣ ወደ Google መለያህ አስጠብቀህ የነበረውን ውሂብ እነበረበት ለመመለስ እድሉን ታገኛለህ።"</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"የግቤት ስልት ቀይር"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"ማሳያ ቆልፍ ምረጥ"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"ምትኬ ቆላፊ ምረጥ"</string>
@@ -334,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>
@@ -347,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>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"መክፈቻ PIN ለውጥ"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"መክፈቻ ይለፍ ቃል ለውጥ"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"የይለፍ ቃል ቢያንስ %d ቁምፊዎች መሆን አለበት"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN ቢያንስ %d ቁምፊዎች መሆን አለበት"</string>
+    <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>
@@ -406,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>
@@ -463,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>
@@ -480,6 +503,28 @@
     <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_empty_list_wifi_display_off" msgid="1225626898926363100">"መሣሪያዎችን ለማየት የገመድ አልባ ማሳያን ያብሩ።"</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_paired_devices" msgid="7395326840730024303">"የተጣመሩ ማሳያዎች"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"የሚገኙ መሣሪያዎች"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"በመገናኘት ላይ"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"ተገናኝቷል"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"የሚገኙ"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"በስራ ላይ ያሉ"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"የማሳያ ቅንብሮች"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"ግንኙነቱ ይቋረጥ?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"ይሄ ከዚህ ጋር ያለዎትን ግንኙነት ያስቆመዋል፦&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"የገመድ አልባ ማሳያ አማራጮች"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"እርሳ"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"ተከናውኗል"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"ስም"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"በርቷል"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"ጠፍቷል"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"ተሰናክሏል"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"ጡባዊ ቱኮው ሌላ መሳሪያ ሲነካ የውሂብ ልውውጥ ፍቀድ"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"ስልኩ ሌላ መሳሪያ ሲነካ የውሂብ ልውውጥ ፍቀድ"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"ጠፍቷል"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC ስለጠፋ ማግኘት አይቻልም"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"ይህ ባህሪ ሲበራ፣ የመተግበሪያ ይዘት ወደ ሌላ NFC-የሚችል መሳሪያ መሳሪያዎቹን አንድ ላይ አቀራርቦ በመያዝ ማብራት ትችላለህ፡፡ ለምሳሌ፣ የአሳሽ ገጾችን፣ YouTube ቪዲዮዎችን፣ የሰዎች ዕውቂያዎችን፣ እና በተጨማሪ"\n\n" ማብራት ትችላለህ፡፡ መሳሪያዎቹን ብቻ አንድ ላይ አቀራርበህ አምጣቸው (በተለምዶ ጀርባ ለጀርባ) እናም በመቀጠል ማያህን ንካ፡፡ መተግበሪያው ምን መብራት እንዳለበት ራሱ ይወስናል፡፡"</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"ይህ ባህሪ ሲበራ፣ የመተግበሪያ ይዘት ወደ ሌላ NFC-የሚችል መሳሪያ መሳሪያዎቹን አንድ ላይ አቀራርቦ በመያዝ ማብራት ትችላለህ፡፡ ለምሳሌ፣ የአሳሽ ገጾችን፣ YouTube ቪዲዮዎችን፣ የሰዎች ዕውቂያዎችን፣ እና በተጨማሪ\n\n ማብራት ትችላለህ፡፡ መሳሪያዎቹን ብቻ አንድ ላይ አቀራርበህ አምጣቸው (በተለምዶ ጀርባ ለጀርባ) እናም በመቀጠል ማያህን ንካ፡፡ መተግበሪያው ምን መብራት እንዳለበት ራሱ ይወስናል፡፡"</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"የአውታረ መረብ ማግኘት"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"ሌሎች መሣሪያዎች ላይ ያሉ መተግበሪያዎች በዚህ መሣሪያ ላይ ያሉ መተግበሪያዎች እንዲያገኙ ይፈቅድላቸዋል"</string>
-    <string name="wifi_quick_toggle_title" msgid="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="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="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="8116564886303972764">"በገመድ አልባ ማዞሪያህ ላይ ፒን <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_in_progress" msgid="2944576520214787628">"WPS አስቀድሞ በሂድት ላይ ነውና እስኪጠናቀቅ ድረስ እስከሁለት ደቂቃ ድረስ ሊፈጅ ይችላል"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"ከWi-Fi አውታረ መረብ <xliff:g id="NETWORK_NAME">%s</xliff:g> ጋር ተገናኝቷል"</string>
+    <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS አስቀድሞ በሂድት ላይ ነውና እስኪጠናቀቅ ድረስ እስከሁለት ደቂቃ ድረስ ሊፈጅ ይችላል"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS አልተሳካም። እባክህ ከጥቂት ደቂቃዎች በኋላ እንደገና ሞክር።"</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"የገመድ አልባው የማዞሪያ ድህንነት ቅንጅት (WEP) አይደገፍም"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"የገመድ አልባው የማዞሪያ ድህንነት ቅንጅት (TKIP) አይደገፍም"</string>
     <string name="wifi_wps_failed_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>
@@ -564,6 +621,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>
@@ -571,8 +631,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_advanced_titlebar" msgid="1627063574532930090">"የላቀ Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"ተደጋጋሚ Wi-Fi  ድግ"</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="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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"በመፈለግ ላይ…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"መሣሪያ ዳግም ሰይም"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"አቻ መሳሪያዎች"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"የታወሱ ቡድኖች"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"ማገናኘት አልተቻለም።"</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"መሣሪያ ዳግም መሰየም አልተሳካም።"</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"ይላቀቅ?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"ግንኙነቱን ካቋረጥክ፣ ከ<xliff:g id="PEER_NAME">%1$s</xliff:g> እና <xliff:g id="PEER_COUNT">%2$s</xliff:g> ሌላ መሳሪያዎች ጋር ያለህ ግንኙነት ይቋረጣል።"</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ግብዣ ይሰረዝ?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"ከ<xliff:g id="PEER_NAME">%1$s</xliff:g> ጋር የመገናኘት ግብዣውን መሰረዝ ትፈልጋለህ?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">" ተጓጓዥ Wi-Fi ድረስ ነጥብ"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ይህ ቡድን ይረሳ?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ተንቀሳቃሽ የWi-Fi መገናኛ ነጥብ"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"የሙዚቃ ማሳመሪያዎች"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"የስልክ ጥሪ ድምፅ"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ፀጥ ሲል ንዘር"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"ነባሪ ማሳወቂያ"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"ነባሪ የማሳወቂያ ድምጽ"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"የማሳወቂያ ብርሃን አሳይ"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"የስልክ ጥሪ ድምፅ"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"ማሳወቂያ"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"ለማሳወቂያዎች የገቢ ጥሪ ድምፅን ተጠቀም"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"የማሳወቂያ የስልክ ጥሪ ድምፅ ምረጥ"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"ነባሪ የማሳወቂያ ድምጽ"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"ማህደረ መረጃ"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"ለሙዚቃ እና ቪዲዮዎች የድምፅመጠን አዘጋጅ"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"ማንቂያ ደውል"</string>
@@ -632,11 +704,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>
@@ -658,7 +730,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>
@@ -671,15 +743,16 @@
     <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="3848608373818910549">"ማሳያ ካንዲ"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"ወደ ሀይል ከተገናኘ በእንቅልፍ ላይ ይጀምራል"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"ቦዝኗል"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"የተመረጠ ካንዲ"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"መቼ ይገብር"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"ከ<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ስራ ከፈታ በኋላ"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"በፍፁም"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"ሞክረው!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"በሚተከልበት ጊዜም ጀምር"</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">"ስልኩ ሲተከል እና/ወይም ሲተኛ ምን እንደሚከሰት ለመቆጣጠር የቀን ህልምን ይክፈቱ።"</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>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"የተሳሳተ ፒን!"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"ፒኖቹ አይዛመዱም"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"ፒን መለወጥ አይቻልም::"\n" ምናልባት ልክ ያልኾነ ፒን ሊሆን ይችላል::"</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"ፒን መለወጥ አይቻልም::\n ምናልባት ልክ ያልኾነ ፒን ሊሆን ይችላል::"</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN በተሳካ ተለውጧል"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"የሲም ካርድን ቆልፍ ሁኔታ ለመለወጥ አይቻልም። "\n" የተሳሳተ ፒን ሊሆን ይችላል።"</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"የሲም ካርድን ቆልፍ ሁኔታ ለመለወጥ አይቻልም። \n የተሳሳተ ፒን ሊሆን ይችላል።"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"እሺ"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ይቅር"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"የጡባዊ ኹነታ"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"የቤዝባንድ ሥሪት"</string>
     <string name="kernel_version" msgid="9192574954196167602">"የከርነል ሥሪት"</string>
     <string name="build_number" msgid="3075795840572241758">"የግንባታ ቁጥር"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"የSELinux ሁኔታ"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"አይገኝም"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"ኹናቴ"</string>
     <string name="device_status" msgid="607405385799807324">"ሁኔታ"</string>
@@ -733,12 +807,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">"የተንቀሳቃሽ አውታረ መረብ አይነት"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"የድምጸ ተያያዥ ሞደም መረጃ"</string>
     <string name="status_data_state" msgid="5503181397066522950">"የተንቀሳቃሽ አውታረ መረብክልል"</string>
     <string name="status_service_state" msgid="2323931627519429503">"የአገልግሎት ሁኔታ"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"የሲግናል ጥንካሬ"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"የUSB  ማከማቻ"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD ካርድ"</string>
     <string name="memory_available" msgid="5052397223077021181">"የሚገኝ"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"የሚገኝ (ተነባቢ ብቻ)"</string>
     <string name="memory_size" msgid="6629067715017232195">"ጠቅላላ ባዶ ቦታ"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"በማስላት ላይ..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"መተግበሪያዎች (የመተግበሪያ ውሂብ እና የሚዲያ ይዘት)"</string>
@@ -755,7 +831,8 @@
     <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>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"የውስጥ USB  ማከማቻ ንቀል"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"የSD ካርድ አጥፋ"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"እንደ ሙዚቃ እና ፎቶዎች፣ በውስጥ USB ማከማቻ ላይ ያለ ውሂብ ሁሉ ያጠፋል"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"እንደ ሙዚቃ እና ፎቶዎች፣ በ SD ካርድ ላይ ያለን ውሂብ ሁሉ ያጠፋል"</string>
-    <string name="read_only" msgid="6702420168629076340">" (ንባብ-ብቻ)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"የተሸጎጠ ውሂብ ይጽዳ?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"ይሄ የተሸጎጡ የሁሉም መተግበሪያዎች ውሂብ ያጸዳል።"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"የMTP ወይም PTP ተግባር ገባሪ ሆኗል"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"የUSB ማከማቻ ንቀል?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"SD ካርድ ንቀል?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"የ USB ማከማቻውን ከነቀልክ፣  እየተጠቀምክባቸው ያለኸው አንዳንድ መተግበሪያዎች መስራታቸውን ይቆማሉ እና USB ውን ድጋሚ እስከምትሰካ ድረስ ላይኖሩ ይችላሉ።"</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"ካሜራ(PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"የካሜራ ሶፍትዌርን በመጠቀም ፎቶዎችን እንዲያስተላልፉ እና በኮምፒዩተር ላይ የሚገኙ ማንኛውም የMTP ፋይልን የማይደግፉ ያስተላልፉ"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"የፋይል አስተላልፍ መሣሪያዎች ጫን"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"ሌሎች ተጠቃሚዎች"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"የባትሪሁኔታ"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"የባትሪደረጃ፡"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -822,6 +902,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>
@@ -831,17 +913,17 @@
     <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_accounts" product="default" msgid="6412857499147999073">\n\n" እርስዎ በአሁን ጊዜ የሚከተለው መለያዎች ውስጥ ገብተዋል፡"\n</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>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ \n\nለማጥራት፣"<b>"USBማከማቻ"</b>" መጥፋት ያስፈልገዋል።"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n" ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ ለማጥራት፣"<b>" የSD ካርድ "</b>"መጥፋት ያስፈልገዋል።"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB ማከማቻ አጥፋ"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"የSD ካርድ አጥፋ"</string>
@@ -875,7 +957,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>
@@ -896,11 +978,16 @@
     <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="manage_mobile_plan_title" msgid="7588182101738043593">"የሞባይል እቅድን ያስተዳድሩ"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"የማይታወቅ የSIM ከዋኝ"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s የሚታወቅ የአቅርቦት ድር ጣቢያ የለውም"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"እባክዎ SIM ካርድ ያስገቡና ዳግም ያስጀምሩ"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"እባክዎ ከበይነ መረብ ጋር ያገናኙ"</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>
@@ -910,13 +997,14 @@
     <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>
     <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="copyright_title" msgid="865906688917260647">"የቅጂ መብት"</string>
     <string name="license_title" msgid="1990487604356037871">"ፍቃድ"</string>
     <string name="terms_title" msgid="7697580845616764642">"ውሎች እና ደንቦች"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"መክፈቻ PIN ለውጥ"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"የተቀመጠ ስርዓተ ጥለት አረጋግጥ"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"በድጋሚ ሞክር::"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"የመክፈቻ ስርዓተ ንጥል ሳል"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"የመክፈቻ ስርዓተ ንጥል ይሳሉ"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"ለእገዛ ምናሌ ተጫን"</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"ሲጨርሱ ጣትዎን ይልቀቁ"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"ቢያንስ <xliff:g id="NUMBER">%d</xliff:g> ነጥቦች አያይዝ። እንገደና ሞክር፡"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"የመክፈቻ ስርዓተ ንጥል እንዴት ይሳላል"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"በጣም ብዙ የተሳሳቱ ሙከራዎች!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"በ<xliff:g id="NUMBER">%d</xliff:g>ሰከንዶች ውስጥ እንደገና ሞክር።"</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"ይቅር"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"ቀጥል"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"ጡባዊዎን በማስጠበቅ ላይ"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"ስልክዎን በማስጠበቅ ላይ"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"የግል ማያ መክፈቻ ስርዓተ ጥለት በመፍጠር ጡባዊህን ካልተፈቀደ ጥቅም ትከላከላለህ። በሚቀጥለው ማያ ላይ በማንኛውም ስርዓተ ነጥቦቹን ለማገናኘት ጣትህን ተጠቀም። ቢያንስ አራት ነጥቦች ማገናኘት አለብህ።"\n\n" ለመጀመር ዝግጁ ነህ? \"ቀጥል\" ንካ።"</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"የግል የስርዓተ ጥለት ማያ መክፈቻ በመፍጠር ስልክህን ካልተፈቀደ ጥቅም ጠብቅ። በሚቀጥለው ማያ ላይ በማንኛውም መልኩ ቢያንስ አራት ነጥቦች ጣትህን በመጠቀም አገናኝ። "\n\n" ለመጀመር ዝግጁ ነው? \"ቀጥሎ\" የሚለውን ንካ።"</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"መተግበሪያ በስልክዎ ላይ አልተጫነም።"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"መተግበሪያዎች አስተዳድር"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"የተጫኑ መተግበራያዎች አስተዳድር እና አስወግድ"</string>
     <string name="applications_settings" msgid="1721442176406964682">"መተግበሪያዎች"</string>
@@ -981,8 +1064,10 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"ካልታወቁ ምንጮች የሚመጡ መተግበሪያዎች እንዲጫኑ ፍቀድ"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"የእርስዎ ጡባዊ እና የግል ውሂብ ካልታወቁ ምንጮች በሚመጡ መተግበሪያዎች ለጥቃት የተጋለጡ ናቸው። እነዚህን መተግበሪያዎች በመጠቀምዎ ሊከሰት በሚችለው የጡባዊዎ ጉዳት ወይም የውሂብ መጥፋት ሙሉ በሙሉ ሃላፊነቱን እርስዎ ብቻ ለመውሰድ ተስማምተዋል።"</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"የአንተ  ስልክ እና የግል ውሂብ ካልታወቁ ምንጭ መተግበሪያዎች ለሚደርሱ ጥቃቶች የተጋለጡ ናቸው:: እነዚህን መተግበሪያዎች መጠቀም በመቀጠልህ ለሚደርስ ማናቸውም ጉዳት ሆነ የውሂብ መጥፋት ሃላፊነቱን ሙሉ በሙሉ ለብቻህ እንደምትወስድ ትስማማለህ::"</string>
+    <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>
@@ -1001,12 +1086,14 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"የUSB ማከማቻ ውሂብ"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD ካርድ"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"አራግፍ"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"ለሁሉም ተጠቃሚዎች ያራግፉ"</string>
+    <string name="install_text" msgid="884360662922471113">"ጫን"</string>
     <string name="disable_text" msgid="6544054052049395202">"አታቦዝን"</string>
     <string name="enable_text" msgid="9217362512327828987">"አንቃ"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"ውሂብ አጥራ"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"አዘምኖች አትጫን"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"ይህን መተግበሪያ በነባሪ ለሌላ እርምጃዎች እንዲጀምር መርጠኸዋል::"</string>
-    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"ይህ መተግበሪያ ምግብሮችን ፈጥሮ ውሂባቸውን እንዲደርስ ፈቅደሃል።"</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"ይህ መተግበሪያ ፍርግሞችን ፈጥሮ ውሂባቸውን እንዲደርስ ይፈቅዳል።"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"ምንም ነባሪዎች አልተዘጋጁም።"</string>
     <string name="clear_activities" msgid="7408923511535174430">"ነባሪዎችን አጥራ"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"ይህ መተግበሪያ ለአንተ ማያ አልተነደፈ ይሆናል፤ ለአንተ ማያ እንዴት እንደሚስማማ እዚህ መቆጣጠር ትችላለህ።"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"የተሸጎጡ ሂደቶችን አሳይ"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"የመተግበሪያዎች ምርጫዎችን ዳግም አስጀምር"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"የመተግበሪያዎች ምርጫዎች ዳግም ይጀመሩ?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"ይሄ የእነዚህን ሁሉ ምርጫዎች ዳግም ያስጀምራል፦"\n\n" "<li>"የተሰናከሉ መተግበሪያዎች"</li>\n" "<li>"የተሰናከሉ የመተግበሪያዎች ማሳወቂያዎች"</li>\n" "<li>"የእርምጃዎች ነባሪ መተግበሪያዎች"</li>\n" "<li>"የመተግበሪያዎች የጀርባ ውሂብ ገደቦች"</li>\n\n" ምንም የመተግበሪያ ውሂብ አታጣም።"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"ይሄ የእነዚህን ሁሉ ምርጫዎች ዳግም ያስጀምራል፦\n\n "<li>"የተሰናከሉ መተግበሪያዎች"</li>\n" "<li>"የተሰናከሉ የመተግበሪያዎች ማሳወቂያዎች"</li>\n" "<li>"የእርምጃዎች ነባሪ መተግበሪያዎች"</li>\n" "<li>"የመተግበሪያዎች የጀርባ ውሂብ ገደቦች"</li>\n\n" ምንም የመተግበሪያ ውሂብ አታጣም።"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"መተግበሪያዎችን ዳግም አስጀምር"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"ባዶ ቦታ አደራጅ"</string>
     <string name="filter" msgid="2018011724373033887">"አጣራ"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"የማጣሪያ አማራጮችን ምረጥ"</string>
     <string name="filter_apps_all" msgid="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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"በSD ካርድ ላይ"</string>
     <string name="disabled" msgid="9206776641295849915">"ቦዝኗል"</string>
+    <string name="not_installed" msgid="1475144352069281880">"አልተጫነም"</string>
     <string name="no_applications" msgid="7336588977497084921">"ምንም መተግበሪያዎች የሉም::"</string>
     <string name="internal_storage" msgid="1584700623164275282">"የውስጥ ማከማቻ"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"የUSB  ማከማቻ"</string>
@@ -1046,7 +1135,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>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> እና <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>፣ <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>፣ <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"ይህ መተግበሪያ ገንዘብ ሊያስከፍልዎት ይችላል፦"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"የክፍያ ኤስ ኤም ኤስ ይላክ?"</string>
     <string name="computing_size" msgid="1599186977475211186">"በማስላት ላይ..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"የጥቅል መጠንን ለማስላት አልተቻለም።"</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"የተጫኑ የማንኛውም ሦስተኛ ወገን መተግበሪያ የሉህም።"</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"ለአዲስ መተግበሪያዎች ተመራጭ መጫኛ ሥፍራዎችን ለውጥ።"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"የውስጠ ግንብ መተግበሪያ አቦዝን?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"ውስጠ-ግንቡ የሆኑ መተግበሪያዎችን ካቦዘንክ ሌሎች መተግበሪያዎች አደብ ሊስቱ ይችላሉ::"</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"ውሂብ ይሰረዝና መተግበሪያ ይሰናከል?"</string>
+    <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_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>
@@ -1094,6 +1190,8 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"ተጠቃሚ፦ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"የተወገደ ተጠቃሚ"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>ሂደት እና <xliff:g id="NUMSERVICES">%2$d</xliff:g>አገልግሎት"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>ሂደት እና <xliff:g id="NUMSERVICES">%2$d</xliff:g>አገልግሎቶች"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>ሂደት እና  <xliff:g id="NUMSERVICES">%2$d</xliff:g> አገልግሎት"</string>
@@ -1114,10 +1212,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>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"አካላዊ ቁልፍሰሌዳ ቅንብሮች"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"\".\" ለማስገባት የቦታ ቁልፍን ሁለቴ ተጫን"</string>
     <string name="show_password" msgid="3001113966880559611">"ይለፍቃሎችን የሚታዩ አድርግ"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></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>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"ለመቀየር፣ Control-Spacebar ተጫን"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"ነባሪ"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"የቁልፍ ሰሌዳ አቀማመጥ"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"የተጠቃሚ መዝገበ ቃላት"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"የግል መዝገበ ቃላት"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"የግል መዝገበ ቃላቶች"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"የግል መዝገበ-ቃላት"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"አክል"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"ወደ መዝገበ ቃላት አክል"</string>
@@ -1157,10 +1252,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>
@@ -1179,9 +1276,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>
@@ -1197,29 +1294,43 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"ማያኃይል በመሙላት ላይበፍፁም አይተኛም"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"የብሉቱዝ HCI ስለላ ምዝግብ ማስታወሻን ያንቁ"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"በአንድ ፋይል ውስጥ ያሉትን የብሉቱዝ HCI እሽጎች ይቅረጹ"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"የሚፈጀውን ጊዜ ይምረጡ"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"የሚፈጀውን ጊዜ ይምረጡ"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"የሚፈጀውን ጊዜ ከ<xliff:g id="OLD">%1$s</xliff:g> ወደ <xliff:g id="NEW">%2$s</xliff:g> ለመለወጥ ዳግም ይጀምር?"</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="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>
     <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>
-    <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_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="enable_terminal_title" msgid="95572094356054120">"አካባቢያዊ ተርሚናል"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"የአካባቢያዊ ሼል መዳረሻ የሚያቀርብ የተርሚናል መተግበሪያ አንቃ"</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>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"ምግብሩን ከፈጠርከው በኋላ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> የሚያሳየውን ውሂብ ሁሉ ሊደርስበት ይችላል።"</string>
-    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ምግብሮች እንዲፈጥርና ውሂባቸውን እንዲደርስ ሁልጊዜ ፍቀድ"</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ፍርግሞች እንዲፈጥርና ውሂባቸውን እንዲደርስ ሁልጊዜ ፍቀድ"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>ቀኖች<xliff:g id="HOURS">%2$d</xliff:g>ሰዓታት<xliff:g id="MINUTES">%3$d</xliff:g> ደቂቃዎች<xliff:g id="SECONDS">%4$d</xliff:g> ሰከንዶች"</string>
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ሰዓታት<xliff:g id="MINUTES">%2$d</xliff:g>ደቂቃዎች<xliff:g id="SECONDS">%3$d</xliff:g>ሰከንዶች"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>ደቂቃ <xliff:g id="SECONDS">%2$d</xliff:g>ሰከንድ"</string>
@@ -1234,29 +1345,43 @@
     <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_toggle_large_text_title" msgid="6618674985313017711">"ትልቅ ፅሁፍ"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"የኃይል ማስነሻ አዝራር ጥሪ"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"የይለፍ ቃሎችን ተናገር"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"ንካ&amp; አዘግይ ያዝ"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"የድር ተደራሽነት አሻሽል"</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>
+    <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_toggle_speak_password_preference_title" msgid="5986628515113204844">"የይለፍ ቃላትን ተናገር"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"ይንኩ እና ዝጌታን ይዘው ይቆዩ"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"ቅንብሮች"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"በ"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"ውጪ"</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="accessibility_feature_state_on" msgid="2864292320042673806">"በርቷል"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"ጠፍቷል"</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="print_settings" msgid="4742428530112487843">"ማተም"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"የህትመት ቅንብሮች"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"አገልግሎቶች"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> ይጠቀሙ?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> የሚያትሟቸውን ሰነዶች መቀበል ይችላል። እንደዚህ ያሉ ሰነዶች ሚስጥራዊ ውሂብ ሊይዙ ይችላሉ።"</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"ምንም አገልግሎቶች አልተጫኑም"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"ቅንብሮች"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"አታሚዎችን ያክሉ"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"በርቷል"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"ጠፍቷል"</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>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1291,13 +1416,15 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"ውሂብ ተቀብሏል"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"የሞባይል ውሂብ ተልኳል"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"የሞባይል ውሂብ ደርሷል"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"የWi‑Fi ውሂብ ተልኳል"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"የWi‑Fi ውሂብ ደርሷል"</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>
@@ -1306,30 +1433,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>
@@ -1341,7 +1469,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>
@@ -1350,17 +1478,19 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"ቅላፄ"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"የሚነገረው ፅሁፍ ድምፅ ላይ ተፅዕኖ ያሳድራል"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"ቋንቋ"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"ቋንቋ አልተመረጠም"</string>
     <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_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>
@@ -1374,12 +1504,26 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"ብሩህነት <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"ራስ-ሰር"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"ሙሉ"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"ግማሽ"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"ጠፍቷል"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"መረጃ ማከማቻ"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ከUSB  ማከማቻ ጫን"</string>
@@ -1390,10 +1534,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>
@@ -1406,19 +1553,16 @@
     <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>
-    <string name="bugreport_title" msgid="1009498799922543551">"የሳንካ ሪፖርት ውሰድ"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"ይሄ እንደ የኢሜይል መልዕክት አድርጎ የሚልከውን ስለመሣሪያዎ የአሁኑ ሁኔታ መረጃ ይሰበስባል። የሳንካ ሪፖርቱን ከመጀመር ጀምሮ እስኪላክ ድረስ ትንሽ ጊዜ ይወስዳል፤ እባክዎ ይታገሱ።"</string>
-    <string name="report" msgid="302437572240018342">"ሪፖርት አድርግ"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"የዴስክቶፕ መጠባበቂያ ይለፍ ቃል"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"ዴስክቶፕ ሙሉ ምትኬዎች በአሁኑ ሰዓት አልተጠበቁም"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"ለዴስክቶፕ ሙሉ ምትኬዎች የይለፍ ቃል ለመለወጥ ወይም ለማስወገድ ንካ"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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>
@@ -1494,10 +1638,10 @@
     <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_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>
@@ -1514,7 +1658,7 @@
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"በእጅ ማመሳሰል አልተቻለም"</string>
-    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"አመሳስል ለዚህ ንጥል በአሁን ጊዜ ቦዝኗል።ምርጫህን ለመለወጥ፣ ለጊዜው የዳራ ውሂብ እና ራስ ሰር ማመሳሰያ አብራ።"</string>
+    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"አመሳስል ለእዚህ ንጥል በአሁን ጊዜ ቦዝኗል።ምርጫህን ለመለወጥ፣ ለጊዜው የዳራ ውሂብ እና ራስ ሰር ማመሳሰያ አብራ።"</string>
     <string name="wimax_settings" msgid="1574837328738396794">"የ4G ቅንብሮች"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"አዋቅር &amp;  የ4G አውታረመረብ እና ሞደም አደራጅ"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"የ4G MAC አድራሻ"</string>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"የመስኮት ወለሎች ሲዘምኑ መላ መስኮቱን አብለጭልጭ"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"የGPU እይታ ዝማኔዎችን አሳይ"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"ከGPU ጋር ሲሳል መስኮቶች ውስጥ እይታዎችን አብለጭልጭ"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"የሃርድዌር ንብርብሮች ዝማኔዎችን አሳይ"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"የሃርድዌር ንብርብሮች ሲዘምኑ አረንጓዴ አብራ"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"የጂፒዩ አልፎ መሳል አርም"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"የCPU አጠቃቀም አሳይ"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"የማያ ተደራቢ የአሁኑን የCPU አጠቃቀም  እያሳየ ነው።"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU ምላሽ መስጠትን አስገድድ"</string>
     <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>
+    <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>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"ተጠቃሚው እስኪተወው ድረስ እያንዳንዱን እንቅስቃሴ አስወግድ"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1602,16 +1751,16 @@
     <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" msgid="1466689968707308512">"ይሄ ባህሪ የተንቀሳቃሽ ስልክ አውታረ መረቦች ብቻ የሚገኙ ከሆኑ በጀርባ ውሂብ ላይ የሚወሰኑ መተግበሪያዎች ስራቸውን እንዲያቆሙ ሊያደርግ ይችላል።"\n\n"በመተግበሪያው ቅንብሮች ውስጥ ተገቢ የሆኑ ተጨማሪ የአጠቃቀም መቆጣጠሪያዎችን ልታገኝ ትችላለህ።"</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"ለእዚህ ትግበራ የዳራ ውሂብ ለመገደብ፣ መጀመሪያ የተንቀሳቃሽ ውሂብ ወሰን አዘጋጅ።"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"ዳራ ውሂብ አግድ?"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"ይሄ ባህሪ የተንቀሳቃሽ ስልክ አውታረ መረቦች ብቻ የሚገኙ ከሆኑ በጀርባ ውሂብ ላይ የሚወሰኑ መተግበሪያዎች ስራቸውን እንዲያቆሙ ሊያደርግ ይችላል።\n\nበመተግበሪያው ቅንብሮች ውስጥ ተገቢ የሆኑ ተጨማሪ የአጠቃቀም መቆጣጠሪያዎችን ልታገኝ ትችላለህ።"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="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>
@@ -1620,22 +1769,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_restrict_background_title" msgid="2201315502223035062">"በስተጀርባ ውሂብ አግድ?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"የተንቀሳቃሽ ውሂብ ዳራን ከገደብከው ወደ Wi-Fi አውታረመረብ ካልተገናኘህ በቀር አንዳንድ መተግበሪያዎች እና አገልግሎቶች አይሰሩም::"</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="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_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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"የVPN መገለጫ አክል"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"መገለጫ አርትዕ"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"መገለጫ ሰርዝ"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"ሁልጊዜ የበራ VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"ሁልጊዜ እንደተገናኙ የሚቆዩበት የVPN መገለጫ ይምረጡ። ከዚህ VPN ጋር ሲገናኝ ብቻ ነው የአውታረ መረብ ትራፊክ የሚፈቀደው።"</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"ምንም"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"ሁልጊዜ የበራ VPN ለአገልጋይም ለDNSም የአይ.ፒ. አድራሻ ያስፈልገዋል።"</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"ምንም የአውታረ መረብ ግኑኝነት የለም። እባክህ ቆይተህ እንደገና ሞክር።"</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"የዕውቅና ማረጋገጫ ይጎድላል። እባክህ መገለጫውን አርትዕ።"</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"ስርዓት"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ይቅር"</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">"ተጨማሪ የስርዓት አዘምኖች"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"ተጠቃሚዎች አና ገደቦች"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"ተጠቃሚዎች"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"ተጠቃሚ አክል"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"ዝርዝሮችን አርትዕ"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"የተጠቃሚ መረጃ"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"ስም"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"የይዘት ገደቦች"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"ፒን ይፈልጋል"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"የይዘት ደረጃ አሰጣጥ"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"የስርዓት መተግበሪያዎች"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"የተጫኑ መተግበሪያዎች"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"አስወግድ"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"ተጠቃሚ አስወግድ"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"ረባሽ ልጅ"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"ተሰናክሏል"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"ፈቃጅ"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"በማስፈጸም ላይ"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"ተጠቃሚዎች"</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="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_confirm_remove_message" msgid="5284111415714437285">"ከመሳሪያው ላይ ተጠቃሚውን እና ሁሉንም ተያያዥነት ያለው ውሂብ ለማስወገድ መፈለግህን እርግጠኛ ነህ?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"የቅርጸ-ቁምፊ መጠን ይቀይሩ"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"ገደቦች"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"ገደቦችን አስወግድ"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"ፒን ቀይር"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"ማሳወቂያዎች አሳይ"</string>
     <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="user_restrictions_title" msgid="7745810037152772035">"የመተግበሪያ እና የይዘት ገደቦች"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ዳግም ሰይም"</string>
+    <string name="app_restrictions_custom_label" msgid="6160672982086584261">"የመተግበሪያ ገደቦችን አዘጋጅ"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"በ<xliff:g id="APP">%1$s</xliff:g> የሚቆጣጠሩ"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"ይህ መተግበሪያ በተገደቡ መገለጫዎች ውስጥ አይደገፍም"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"ይህ መተግበሪያ መለያዎችዎን ሊደርስባቸው ይችላል"</string>
+    <string name="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 b8fa065..0cb3074 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,16 +218,127 @@
     <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="886742181977884584">"الوسائط"</item>
+    <item msgid="7924928667052300589">"الجهاز"</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>
+    <item msgid="5124443975763747838">"أزرار الوسائط"</item>
+    <item msgid="4547883971364273343">"التركيز على الصوت"</item>
+    <item msgid="2603878814882344450">"مستوى الصوت الرئيسي"</item>
+    <item msgid="7136963238377062018">"مستوى الصوت"</item>
+    <item msgid="4270236897655923007">"مستوى صوت الرنين"</item>
+    <item msgid="6325739889222559394">"مستوى صوت الوسائط"</item>
+    <item msgid="5762123934816216821">"مستوى صوت المنبه"</item>
+    <item msgid="785049718065337473">"مستوى صوت الإشعار"</item>
+    <item msgid="6700305533746877052">"مستوى صوت البلوتوث"</item>
+    <item msgid="2029227495214047094">"البقاء في الوضع النشط"</item>
+    <item msgid="26109888160231211">"مراقبة الموقع"</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>
+    <item msgid="5753789168376302997">"أزرار الوسائط"</item>
+    <item msgid="3265262911688671938">"التركيز على الصوت"</item>
+    <item msgid="2098976479485046797">"مستوى الصوت الرئيسي"</item>
+    <item msgid="5660213838861789350">"مستوى الصوت"</item>
+    <item msgid="7983336752371254444">"مستوى صوت الرنين"</item>
+    <item msgid="7878027809189330917">"مستوى صوت الوسائط"</item>
+    <item msgid="7260546305036218513">"مستوى صوت المنبّه"</item>
+    <item msgid="9103719301075748925">"مستوى صوت الإشعار"</item>
+    <item msgid="7025966722295861512">"مستوى صوت البلوتوث"</item>
+    <item msgid="4665183401128289653">"البقاء في الوضع النشط"</item>
+    <item msgid="8584357129746649222">"الموقع"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"قصيرة"</item>
     <item msgid="2560532955514699713">"متوسطة"</item>
     <item msgid="2372711992605524591">"طويلة"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (تصحيح الأخطاء)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"استخدام Dalvik"</item>
+    <item msgid="5131846588686178907">"استخدام ART"</item>
+    <item msgid="4530003713865319928">"استخدام إصدار تصحيح الأخطاء من ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"عدم التحقق مطلقًا"</item>
     <item msgid="6042769699089883931">"التحقق من محتوى DRM فقط"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"حجم الرسوم المتحركة 5x"</item>
     <item msgid="1069584980746680398">"حجم الرسوم المتحركة 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"لا شيء"</item>
+    <item msgid="688482401508173818">"720×480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280×720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920×1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280×720 tvdpi و1920×1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"لا شيء"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"إيقاف"</item>
+    <item msgid="7688197031296835369">"عرض مناطق تجاوز الحد"</item>
+    <item msgid="8332661909019981149">"عرض مقابل تجاوز الحد"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"الحد القياسي"</item>
     <item msgid="4071574792028999443">"ليست هناك عمليات بالخلفية"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"المهلة"</item>
     <item msgid="7664124146786465092">"غير ناجح"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"اسأل"</item>
+    <item msgid="5077768429488260031">"عدم السماح مطلقًا"</item>
+    <item msgid="1417929597727989746">"السماح دومًا"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index b0c4acb..bf6893f 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"نعم"</string>
     <string name="no" msgid="6731231425810196216">"لا"</string>
     <string name="create" msgid="3578857613172647409">"إنشاء"</string>
+    <string name="allow" msgid="3349662621170855910">"سماح"</string>
+    <string name="deny" msgid="6947806159746484865">"رفض"</string>
     <string name="device_info_default" msgid="7847265875578739287">"غير معروف"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"لا يفصلك الآن عن الوصول إلى مرحلة مطوري البرامج سوى <xliff:g id="STEP_COUNT">%1$d</xliff:g> من الخطوات."</item>
+    <item quantity="other" msgid="6722953419953594148">"لا يفصلك الآن عن الوصول إلى مرحلة مطوري البرامج سوى <xliff:g id="STEP_COUNT">%1$d</xliff:g> من الخطوات."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"لقد أصبحت الآن مطور برامج!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"لا حاجة لذلك، فأنت مطور برامج فعلاً."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"اللاسلكي والشبكات"</string>
     <string name="header_category_device" msgid="5781174212691167553">"الجهاز"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"شخصي"</string>
@@ -38,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>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"شحن"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"تفريغ الشحن"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(الشبكات اللاسلكية)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"لا يتم الشحن"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"لا يتم الشحن"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"ممتلئة"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"غير متصل"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"الشبكات اللاسلكية"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"غير معروف"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"غير معروف"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"خطأ غير معروف"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"بارد"</string>
     <string name="bluetooth" msgid="5549625000628014477">"بلوتوث"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"قابل للاكتشاف"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"مرئي لجميع أجهزة بلوتوث القريبة (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"مرئي لجميع أجهزة بلوتوث القريبة"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"ليس مرئيًا لأجهزة بلوتوث الأخرى"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"مرئي فقط للأجهزة المقترنة"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"جعل الجهاز قابل للاكتشاف"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"مهلة الرؤية"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"تعيين الوقت الذي يكون فيه الجهاز قابلاً للاكتشاف"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"تأمين الطلب الصوتي"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"منع استخدام طالب البلوتوث عندما تكون الشاشة مؤمّنة"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"أجهزة بلوتوث"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"إظهار الملفات المستلمة"</string>
     <string name="device_picker" msgid="8398232791303186677">"منتقي جهاز البلوتوث"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"طلب إذن بلوتوث"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"هل تريد السماح لأي تطبيق يريد تشغيل بلوتوث؟"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"يريد أحد التطبيقات على الجهاز اللوحي جعله قابلاً للاكتشاف بواسطة أجهزة البلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانية. هل تريد السماح بذلك؟"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"يريد أحد التطبيقات على الهاتف جعله قابلاً للاكتشاف بواسطة أجهزة البلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانية. هل تريد السماح بذلك؟"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"يريد أحد التطبيقات على الجهاز اللوحي جعله \"قابلاً للاكتشاف دائمًا\" بواسطة أجهزة البلوتوث الأخرى. هل تريد السماح بذلك؟"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"يريد أحد التطبيقات على الهاتف جعله قابلاً للاكتشاف بواسطة أجهزة البلوتوث الأخرى. هل تريد السماح بذلك؟"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"يريد أحد التطبيقات على الجهاز اللوحي تشغيل بلوتوث وجعله قابلاً للاكتشاف بواسطة الأجهزة الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانية. هل تريد السماح بذلك؟"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"يريد أحد التطبيقات على الهاتف تشغيل البلوتوث وجعل هاتفك قابلاً للاكتشاف بواسطة الأجهزة الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانية. هل تريد السماح بذلك؟"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"يريد أحد التطبيقات على الجهاز اللوحي تشغيل بلوتوث وجعله قابلاً للاكتشاف بواسطة الأجهزة الأخرى. هل تريد السماح بذلك؟"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"يريد أحد التطبيقات على الهاتف تشغيل البلوتوث وجعل هاتفك قابلاً للاكتشاف بواسطة الأجهزة الأخرى. هل تريد السماح بذلك؟"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"يريد أحد التطبيقات تشغيل بلوتوث."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"يريد أحد التطبيقات أن يجعل جهازك اللوحي مرئيًا لأجهزة البلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> من الثواني."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"يريد أحد التطبيقات أن يجعل هاتفك مرئيًا لأجهزة البلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> من الثواني."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"يريد أحد التطبيقات جعل جهازك اللوحي مرئيًا لأجهزة بلوتوث الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"يريد أحد التطبيقات جعل هاتفك مرئيًا لأجهزة بلوتوث الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"يريد أحد التطبيقات تشغيل البلوتوث وجعل جهازك اللوحي مرئيًا للأجهزة الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> من الثواني."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"يريد أحد التطبيقات تشغيل البلوتوث وجعل هاتفك مرئيًا للأجهزة الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> من الثواني."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"يريد أحد التطبيقات تشغيل البلوتوث وجعل جهازك اللوحي مرئيًا للأجهزة الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"يريد أحد التطبيقات تشغيل البلوتوث وجعل هاتفك مرئيًا للأجهزة الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"جارٍ تشغيل البلوتوث..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"جارٍ إيقاف تشغيل البلوتوث..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"اتصال تلقائي"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"يستخدم المتصفح الخادم الوكيل HTTP، ولكنه ربما لا تستخدمه التطبيقات الأخرى."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"الموقع:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"تجاور CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"معلومات الخلية:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"محاولات البيانات:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"خدمة GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"تجوال:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"لقد فقدت اتصال البيانات نظرًا لأنك أوقفت تشغيل تجوال البيانات بشبكتك الرئيسية."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"تشغيل"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"عند السماح بتجوال البيانات، قد تتكلف رسوم تجوال مرتفعة!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"عند السماح بتجوال البيانات، قد تتكلف رسوم تجوال مرتفعة!\n\nيؤثر هذا الإعداد على جميع مستخدمي هذا الجهاز اللوحي."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"عند السماح بتجوال البيانات، قد تتكلف رسوم تجوال مرتفعة!\n\nيؤثر هذا الإعداد على جميع مستخدمي هذا الهاتف."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"السماح بتجوال البيانات؟"</string>
     <string name="networks" msgid="6333316876545927039">"تحديد المشغل"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"اختيار مشغل شبكة"</string>
@@ -274,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>
@@ -297,6 +307,10 @@
     <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>
@@ -308,8 +322,8 @@
     <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>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"حاول مرة أخرى خلال <xliff:g id="DELAY">^1</xliff:g> ثانية."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"اكتب كلمة المرور"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"لم يتم التشفير بنجاح"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على جهازك اللوحي. "\n\n"لاستئناف استخدام الجهاز اللوحي، يلزمك إجراء إعادة ضبط المصنع. وعند إعداد الجهاز اللوحي بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على هاتفك. "\n\n"لاستئناف استخدام الهاتف، يجب إجراء إعادة ضبط المصنع. وعند إعداد الهاتف بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على جهازك اللوحي. \n\nلاستئناف استخدام الجهاز اللوحي، يلزمك إجراء إعادة ضبط المصنع. وعند إعداد الجهاز اللوحي بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على هاتفك. \n\nلاستئناف استخدام الهاتف، يجب إجراء إعادة ضبط المصنع. وعند إعداد الهاتف بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"تبديل أسلوب الإدخال"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"اختيار قفل الشاشة"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"اختر قفلاً للنسخ الاحتياطي"</string>
@@ -339,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>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"تغيير رقم التعريف الشخصي لإلغاء التأمين"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"تغيير كلمة مرور إلغاء التأمين"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"يجب أن تكون كلمة المرور %d من الأحرف على الأقل"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"يجب أن يكون رقم التعريف الشخصي %d من الأحرف على الأقل"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"يجب أن يكون رقم التعريف الشخصي %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>
@@ -406,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>
@@ -480,6 +503,28 @@
     <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_empty_list_wifi_display_off" msgid="1225626898926363100">"للاطلاع على الأجهزة، شغّل وحدة العرض اللاسلكية."</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_paired_devices" msgid="7395326840730024303">"وحدات العرض المقترنة"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"الأجهزة المتاحة"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"جارٍ الاتصال"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"متصل"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"متاح"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"قيد الاستخدام"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"عرض الإعدادات"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"هل تريد قطع الاتصال؟"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"سيؤدي هذا إلى إنهاء الاتصال مع:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"خيارات وحدات العرض اللاسلكية"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"حذف"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"تم"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"الاسم"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"تشغيل"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"إيقاف"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"معطل"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"السماح بتبادل البيانات عندما يلمس الجهاز اللوحي جهازًا آخر"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"السماح بتبادل البيانات عندما يلمس الهاتف جهازًا آخر"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"إيقاف"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"غير متوفر بسبب إيقاف تشغيل NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"عندما يتم تشغيل هذه الميزة، يمكنك إرسال محتوى التطبيق إلى جهاز به اتصال NFC عن طريق الإمساك بالجهازين بالقرب من بعضهما. ويمكنك على سبيل المثال إرسال صفحات المتصفح ومقاطع فيديو YouTube وجهات اتصال الأشخاص، والمزيد. "\n" "\n"ما عليك سوى الجمع بين الجهازين (من الخلف عادة) ولمس الشاشة. وسيحدد التطبيق ما يتم إرساله."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"عندما يتم تشغيل هذه الميزة، يمكنك إرسال محتوى التطبيق إلى جهاز به اتصال NFC عن طريق الإمساك بالجهازين بالقرب من بعضهما. ويمكنك على سبيل المثال إرسال صفحات المتصفح ومقاطع فيديو YouTube وجهات اتصال الأشخاص، والمزيد. \n \nما عليك سوى الجمع بين الجهازين (من الخلف عادة) ولمس الشاشة. وسيحدد التطبيق ما يتم إرساله."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"اكتشاف خدمة الشبكة"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"السماح للتطبيقات على الأجهزة الأخرى باكتشاف التطبيقات على هذا الجهاز"</string>
-    <string name="wifi_quick_toggle_title" msgid="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="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="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="8116564886303972764">"أدخل رقم التعريف الشخصي <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_in_progress" msgid="2944576520214787628">"عملية WPS قيد التقدم فعلاً ويمكن أن يستغرق اكتمالها فترة قد تصل إلى دقيقتين"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"تم الاتصال بشبكة Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>."</string>
+    <string name="wifi_wps_in_progress" msgid="3372311348221357944">"إعداد WPS قيد التقدم فعلاً ويمكن أن يستغرق اكتماله فترة قد تصل إلى دقيقتين"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"أخفقت عملية WPS. يرجى إعادة المحاولة خلال بضع دقائق."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"إعداد أمان جهاز التوجيه اللاسلكي (WEP) ليس متوافقًا"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"إعداد أمان جهاز التوجيه اللاسلكي (TKIP) ليس متوافقًا"</string>
     <string name="wifi_wps_failed_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>
@@ -564,6 +621,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>
@@ -571,8 +631,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_advanced_titlebar" msgid="1627063574532930090">"إعدادات Wi-Fi المتقدمة"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"نطاق تردد Wi-Fi"</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="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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"جارٍ البحث…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"إعادة تسمية الجهاز"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"أجهزة النظراء"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"المجموعات المحفوظة في الذاكرة"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"تعذر الاتصال."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"تعذرت إعادة تسمية الجهاز."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"هل تريد قطع الاتصال؟"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"في حالة قطع الاتصال، سيتم إنهاء اتصالك بـ <xliff:g id="PEER_NAME">%1$s</xliff:g> و<xliff:g id="PEER_COUNT">%2$s</xliff:g> من الأجهزة الأخرى."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"هل تريد إلغاء الدعوة؟"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"هل تريد إلغاء الدعوة للاتصال بـ <xliff:g id="PEER_NAME">%1$s</xliff:g>؟"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"نقطة اتصال Wi-Fi المحمولة"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"حذف هذه المجموعة؟"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"نقطة اتصال Wi-Fi المحمولة"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"تأثيرات موسيقية"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"مستوى صوت الرنين"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"اهتزاز عند تشغيل الوضع صامت"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"التنبيه الافتراضي"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"صوت الإشعار الافتراضي"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"ضوء الإعلام بالنبض"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"نغمة الرنين"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"التنبيه"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"استخدام مستوى صوت المكالمة الواردة للتنبيهات"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"اختيار نغمة رنين رسالة التنبيه"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"صوت الإشعار الافتراضي"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"الوسائط"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"تعيين مستوى الصوت للموسيقى ومقاطع الفيديو"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"المنبّه"</string>
@@ -671,15 +743,16 @@
     <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="3848608373818910549">"شاشة التوقف"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"يتم البدء عند الدخول في وضع السكون في حالة الاتصال بمصدر الطاقة"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"معطلة"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"شاشة التوقف المحددة"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"وقت التنشيط"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"بعد انقضاء مدة <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> من الخمول"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"أبدًا"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"لم لا تجرِّب!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"البدء أيضًا عند الإرساء"</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">"للتحكم في ما يحدث عندما يتم إرساء الهاتف و/أو عند السكون، شغّل \"حلم اليقظة\"."</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>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"رقم التعريف الشخصي لبطاقة SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"رقم التعريف الشخصي غير صحيح"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"أرقام التعريف الشخصي غير متطابقة"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"لا يمكن تغيير رقم التعريف الشخصي."\n"يحتمل أن يكون رقم التعريف الشخصي غير صحيح."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"لا يمكن تغيير رقم التعريف الشخصي.\nيحتمل أن يكون رقم التعريف الشخصي غير صحيح."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"تم تغيير رقم التعريف الشخصي لبطاقة SIM بنجاح"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"لا يمكن تغيير حالة تأمين بطاقة SIM."\n"يحتمل أن يكون رقم التعريف الشخصي غير صحيح."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"لا يمكن تغيير حالة تأمين بطاقة SIM.\nيحتمل أن يكون رقم التعريف الشخصي غير صحيح."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"موافق"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"إلغاء"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"حالة الجهاز اللوحي"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"إصدار النطاق الأساسي"</string>
     <string name="kernel_version" msgid="9192574954196167602">"إصدار النواة"</string>
     <string name="build_number" msgid="3075795840572241758">"رقم الإصدار"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"حالة SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"غير متاح"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"الحالة"</string>
     <string name="device_status" msgid="607405385799807324">"الحالة"</string>
@@ -733,12 +807,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">"نوع شبكة الجوال"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"معلومات مشغل شبكة الجوال"</string>
     <string name="status_data_state" msgid="5503181397066522950">"حالة شبكة الجوال"</string>
     <string name="status_service_state" msgid="2323931627519429503">"حالة الخدمة"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"قوة الإشارة"</string>
     <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>
@@ -748,14 +823,16 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"وحدة تخزين USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"بطاقة SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"متاح"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"متاح (للقراءة فقط)"</string>
     <string name="memory_size" msgid="6629067715017232195">"المساحة الإجمالية"</string>
     <string name="memory_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>
     <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>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"إلغاء تحميل بطاقة SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"إلغاء تركيب وحدة تخزين USB الداخلية"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"محو بطاقة SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"محو كل البيانات على وحدة تخزين USB الداخلية، مثل الموسيقى والصور"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"محو كل البيانات على بطاقة SD، مثل الموسيقى والصور"</string>
-    <string name="read_only" msgid="6702420168629076340">" (للقراءة فقط)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"هل تريد محو البيانات المؤقتة؟"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"يؤدي ذلك إلى محو البيانات المؤقتة لكل التطبيقات."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"وظيفة MTP أو PTP نشطة"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"إلغاء تحميل وحدة تخزين USB؟"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"هل تريد إلغاء تحميل بطاقة SD؟"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"في حالة إلغاء تحميل وحدة تخزين USB، ستتوقف بعض التطبيقات التي تستخدمها وربما لا يتم توفيرها حتى يتم إعادة تحميل وحدة تخزين USB."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"الكاميرا (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"يتيح لك نقل الصور باستخدام برامج الكاميرا، ونقل أي ملفات على أجهزة كمبيوتر لا تدعم MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"تثبيت أدوات نقل الملفات"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"مستخدمون آخرون"</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>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"إعادة الضبط بحسب بيانات المصنع"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"محو كل البيانات على الجهاز اللوحي"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"مسح جميع بيانات الهاتف"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"يؤدي ذلك إلى مسح جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لجهازك اللوحي، بما في ذلك:"\n\n<li>"حسابك في Google"</li>\n<li>"النظام وبيانات التطبيقات والإعدادات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"يؤدي ذلك إلى مسح جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لهاتفك، بما في ذلك:"\n\n<li>"حسابك في Google"</li>\n<li>"النظام وبيانات التطبيقات والإعدادات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"تم تسجيل دخولك حاليًا في الحسابات التالية:"\n</string>
+    <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>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"لمحو الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يجب مسح "<b>"بطاقة SD"</b>"."</string>
@@ -897,10 +979,15 @@
     <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="manage_mobile_plan_title" msgid="7588182101738043593">"إدارة خطة الجوّال"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"مشغل SIM غير معروف"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"ليس لدى %1$s موقع ويب معروف لإدارة حسابات"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"الرجاء إدخال بطاقة SIM وإعادة التشغيل"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"الرجاء الاتصال بالإنترنت"</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>
@@ -917,6 +1004,7 @@
     <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="copyright_title" msgid="865906688917260647">"حقوق الطبع والنشر"</string>
     <string name="license_title" msgid="1990487604356037871">"الترخيص"</string>
     <string name="terms_title" msgid="7697580845616764642">"البنود والشروط"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"تغيير رقم التعريف الشخصي لإلغاء التأمين"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"تأكيد النقش المحفوظ"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"أعد المحاولة:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"ارسم نقش إلغاء التأمين"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"رسم نمط إلغاء القفل:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"اضغط على \"القائمة\" للمساعدة."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"تحرير الإصبع عند الانتهاء."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"صل <xliff:g id="NUMBER">%d</xliff:g> من النقاط على الأقل. حاول مرة أخرى:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"كيفية رسم نقش إلغاء تأمين"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"المحاولات غير الصحيحة كثيرة للغاية!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"حاول مرة أخرى خلال <xliff:g id="NUMBER">%d</xliff:g> ثانية."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"إلغاء"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"التالي"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"تأمين الجهاز اللوحي"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"تأمين الهاتف"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"يمكنك حماية الجهاز اللوحي من الاستخدام غير المصرح به من خلال إنشاء نقش شخصي لإلغاء تأمين الشاشة. استخدم إصبعك لتوصيل النقاط بأي ترتيب في الشاشة التالية. يلزمك توصيل أربع نقاط على الأقل."\n\n"هل أنت مستعد للبدء؟ المس \"التالي\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"يمكنك حماية الهاتف من الاستخدام غير المصرح به من خلال إنشاء نقش شخصي لإلغاء تأمين الشاشة. استخدم إصبعك لتوصيل النقاط لتوصيل أربع نقاط على الأقل بأي ترتيب في الشاشة التالية. "\n\n"هل أنت مستعد للبدء؟ المس \"التالي\"."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"لم يتم تثبيت التطبيق على هاتفك."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"إدارة التطبيقات"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"إدارة التطبيقات المثبتة وإزالتها"</string>
     <string name="applications_settings" msgid="1721442176406964682">"التطبيقات"</string>
@@ -981,9 +1064,11 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"السماح بتثبيت التطبيقات من مصادر غير معروفة"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"تكون بيانات جهازك اللوحي وبياناتك الشخصية أكثر عرضة للهجوم من خلال التطبيقات مجهولة المصادر. أنت توافق على أنك المسؤول الوحيد عن أي ضرر لجهازك اللوحي أو أي فقدان للبيانات ينتج عن استخدام هذه التطبيقات."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"تكون بيانات هاتفك وبياناتك الشخصية أكثر عرضة للهجوم من خلال التطبيقات مجهولة المصادر. أنت توافق على أنك المسؤول الوحيد عن أي ضرر لهاتفك أو أي فقدان للبيانات ينتج عن استخدام هذه التطبيقات."</string>
+    <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="application_info_label" msgid="5736524913065714880">"معلومات التطبيق"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"عن التطبيق"</string>
     <string name="storage_label" msgid="8700867073480107253">"التخزين"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"تشغيل بشكل افتراضي"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"الإعدادات الافتراضية"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"بيانات وحدة تخزين USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"بطاقة SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"إزالة"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"إزالة لجميع المستخدمين"</string>
+    <string name="install_text" msgid="884360662922471113">"تثبيت"</string>
     <string name="disable_text" msgid="6544054052049395202">"تعطيل"</string>
     <string name="enable_text" msgid="9217362512327828987">"تمكين"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"محو البيانات"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"عرض العمليات المخزنة مؤقتًا"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"إعادة تعيين تفضيلات التطبيقات"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"هل تريد إعادة تعيين تفضيلات التطبيقات؟"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"سيؤدي هذا إلى إعادة تعيين جميع تفضيلات:"\n\n" "<li>"التطبيقات المعطلة"</li>\n" "<li>"إشعارات التطبيقات المعطلة"</li>\n" "<li>"التطبيقات الافتراضية للإجراءات"</li>\n" "<li>"قيود بيانات الخلفية للتطبيقات"</li>\n\n" لن تفقد أي بيانات للتطبيقات."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"سيؤدي هذا إلى إعادة تعيين جميع تفضيلات:\n\n "<li>"التطبيقات المعطلة"</li>\n" "<li>"إشعارات التطبيقات المعطلة"</li>\n" "<li>"التطبيقات الافتراضية للإجراءات"</li>\n" "<li>"قيود بيانات الخلفية للتطبيقات"</li>\n\n" لن تفقد أي بيانات للتطبيقات."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"إعادة تعيين التطبيقات"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"إدارة المساحة"</string>
     <string name="filter" msgid="2018011724373033887">"تصفية"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"اختر خيارات التصفية"</string>
     <string name="filter_apps_all" msgid="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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"في بطاقة SD"</string>
     <string name="disabled" msgid="9206776641295849915">"معطل"</string>
+    <string name="not_installed" msgid="1475144352069281880">"لم يتم التثبيت."</string>
     <string name="no_applications" msgid="7336588977497084921">"ليست هناك أية تطبيقات."</string>
     <string name="internal_storage" msgid="1584700623164275282">"وحدة التخزين الداخلية"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"وحدة تخزين USB"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> و<xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>، <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>، <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"قد يكلفك هذا التطبيق مالاً:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"إرسال رسالة قصيرة SMS مميزة"</string>
     <string name="computing_size" msgid="1599186977475211186">"جارٍ الحساب..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"يتعذر حساب حجم الحزمة."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"ليست لديك أية تطبيقات لجهات خارجية مثبتة."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"تغيير موقع التثبيت المفضل للتطبيقات الجديدة"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"هل تريد تعطيل التطبيق المضمن؟"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"إذا تم تعطيل التطبيق المضمن، فقد تعمل التطبيقات الأخرى بشكل غير صحيح."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"هل تريد حذف البيانات وتعطيل التطبيق؟"</string>
+    <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>
@@ -1089,11 +1185,13 @@
     <string name="service_started_by_app" msgid="818675099014723551">"البدء بواسطة تطبيق."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> مجانية"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"متاح <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="service_foreground_processes" msgid="7583975676795574276">"مستخدَم: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory" msgid="6609961111091483458">"ذاكرة الوصول العشوائي"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"المستخدم: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"تمت إزالة المستخدم"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"عملية <xliff:g id="NUMPROCESS">%1$d</xliff:g> وخدمة <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"عملية <xliff:g id="NUMPROCESS">%1$d</xliff:g> و<xliff:g id="NUMSERVICES">%2$d</xliff:g> من الخدمات"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> من العمليات وخدمة <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"إعدادات لوحة المفاتيح الفعلية"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"اضغط على مفتاح Space مرتين لإدراج \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"جعل كلمات المرور مرئية"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></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>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"للتبديل، اضغط على ctrl-مسافة"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"افتراضي"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"تخطيطات لوحة المفاتيح"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"قاموس المستخدم"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"قاموس شخصي"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"القواميس الشخصية"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"القاموس الشخصي"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"إضافة"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"إضافة إلى القاموس"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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="bt_hci_snoop_log" msgid="3340699311158865670">"تمكين سجل تطفل بواجهة وحدة تحكم المضيف عبر بلوتوث"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"التقاط حزم واجهة وحدة تحكم المضيف في ملف عبر بلوتوث"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"تحديد وقت التشغيل"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"تحديد وقت التشغيل"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"هل تريد إعادة التشغيل لتغيير وقت التشغيل من <xliff:g id="OLD">%1$s</xliff:g> إلى <xliff:g id="NEW">%2$s</xliff:g>؟"</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>
+    <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>
-    <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_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="enable_terminal_title" msgid="95572094356054120">"تطبيق طرفي محلي"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"تمكين تطبيق طرفي يوفر إمكانية الدخول إلى واجهة النظام المحلية"</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>
@@ -1234,29 +1345,43 @@
     <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_toggle_large_text_title" msgid="6618674985313017711">"نص كبير"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"زر التشغيل ينهي الاتصال"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"نطق كلمات المرور"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"مهلة اللمس مع الاستمرار"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"تحسين إمكانية الدخول إلى الويب"</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>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"إيقاف"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"عندما يتم تشغيل هذه الميزة، يمكنك بسرعة تمكين ميزات إمكانية الدخول بخطوتين:\n\nالخطوة الأولى: اضغط مع الاستمرار على زر التشغيل إلى أن تسمع صوتًا أو تشعر باهتزاز.\n\nالخطوة الثانية: المس مع الاستمرار إصبعين إلى أن تسمع تأكيدًا صوتيًا.\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_toggle_speak_password_preference_title" msgid="5986628515113204844">"نطق كلمات المرور"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"مهلة اللمس مع الاستمرار"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"الإعدادات"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"تشغيل"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"إيقاف"</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="accessibility_feature_state_on" msgid="2864292320042673806">"تشغيل"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"إيقاف"</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="print_settings" msgid="4742428530112487843">"الطباعة"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"إعدادات الطباعة"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"الخدمات"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"هل تريد استخدام <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"يمكن أن تستلم <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> مستندات تطبعها. قد تحتوي هذه المستندات على بيانات مهمة."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"لم يتم تثبيت أية خدمات"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"الإعدادات"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"إضافة طابعات"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"تشغيل"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"إيقاف"</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>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,20 +1418,22 @@
     <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_data_send" msgid="3875198715268918671">"تم إرسال بيانات الجوّال"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"تم تلقى بيانات الجوّال"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"تم إرسال بيانات Wi‑Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"تم تلقي بيانات Wi‑Fi"</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_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_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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <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="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>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"درجة الصوت"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"يؤثر في نبرة النص المنطوق"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"اللغة"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"اللغة غير محددة"</string>
     <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>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"السطوع <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"تلقائي"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"كامِل"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"نِصْف"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"إيقاف"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"تخزين بيانات الاعتماد"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"التثبيت من وحدة تخزين"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <string name="backup_section_title" msgid="7952232291452882740">"النسخ الاحتياطي والاستعادة"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"البيانات الشخصية"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"احتفاظ بنسخة لبياناتي"</string>
-    <string name="backup_data_summary" msgid="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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"استعادة الإعدادات والبيانات التي تم نسخها احتياطيًا عند تثبيت أحد التطبيقات"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"إعداد تقرير بالأخطاء"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"سيجمع هذا معلومات حول حالة جهازك الحالي لإرسالها كرسالة إلكترونية. سيستغرق وقتًا قليلاً من بدء عرض تقرير بالأخطاء وحتى يكون جاهزًا للإرسال، الرجاء الانتظار."</string>
-    <string name="report" msgid="302437572240018342">"تقرير"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"كلمة مرور احتياطية للكمبيوتر"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"النسخ الاحتياطية الكاملة لسطح المكتب غير محمية في الوقت الحالي"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"المس لتغيير كلمة مرور النسخ الاحتياطية الكاملة لسطح المكتب أو إزالتها"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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>
@@ -1482,7 +1626,7 @@
     <string name="background_data_summary" msgid="8328521479872763452">"يمكن للتطبيقات مزامنة وإرسال وتلقي البيانات في أي وقت"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"تعطيل بيانات الخلفية؟"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"يؤدي تعطيل بيانات الخلفية إلى إطالة عمر البطارية وتقليل استخدام البيانات. قد يكون هناك بعض التطبيقات التي ما زالت تستخدم اتصال بيانات الخلفية."</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"مزامنة بيانات التطبيق تلقائيًا"</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"مزامنة تلقائية لبيانات"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"المزامنة قيد التشغيل"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"المزامنة متوقفة"</string>
     <string name="sync_error" msgid="5060969083117872149">"خطأ في المزامنة"</string>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"التقويم"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"جهات الاتصال"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"مرحبًا بك في مزامنة Google!"</font>" "\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">"البيانات والمزامنة"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"تغيير كلمة المرور"</string>
@@ -1537,6 +1681,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>
@@ -1548,40 +1693,44 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"وميض أسطح النوافذ بالكامل عندما يتم تحديثها"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"إظهار تحديثات عرض GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"وميض العروض داخل النوافذ عندما يتم الرسم باستخدام وحدة معالجة الرسومات"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"عرض تحديثات طبقات الأجهزة"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"تشغيل وميض بالأخضر لطبقات الأجهزة عند تحديثها"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"تصحيح تجاوز حد وحدة معالجة الرسومات"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"عرض استخدام CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"عرض تراكب الشاشة لاستخدام CPU الحالي"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"فرض عرض رسومات GPU"</string>
     <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>
+    <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>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"مسح كل نشاط فور مغادرة المستخدم له"</string>
     <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>
@@ -1591,8 +1740,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">"الجيل الرابع"</string>
@@ -1607,11 +1756,11 @@
     <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" msgid="1466689968707308512">"قد تتسبب هذه الميزة في توقف تطبيق يعتمد على بيانات الخلفية عن العمل عند توفر شبكات جوال فقط."\n\n"يمكنك العثور على المزيد من عناصر التحكم المناسبة في استخدام البيانات من خلال الإعدادات المتوفرة داخل التطبيق."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"قد تتسبب هذه الميزة في توقف تطبيق يعتمد على بيانات الخلفية عن العمل عند توفر شبكات جوال فقط.\n\nيمكنك العثور على المزيد من عناصر التحكم المناسبة في استخدام البيانات من خلال الإعدادات المتوفرة داخل التطبيق."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="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>
@@ -1620,22 +1769,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" 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_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>
@@ -1661,12 +1813,16 @@
     <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>
     <string name="vpn_menu_edit" msgid="408275284159243490">"تعديل الملف الشخصي"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"حذف الملف الشخصي"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"شبكة ظاهرية خاصة (VPN) دائمة التشغيل"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"حدد ملفًا شخصيًا للشبكة الظاهرية الخاصة (VPN) للاتصال الدائم بها. لن يتم السماح بحركة مرور الشبكة إلا عند الاتصال بهذه الشبكة الظاهرية الخاصة."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"لا شيء"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"تتطلب الشبكة الظاهرية الخاصة (VPN) دائمة التشغيل عنوان IP لكل من الخادم ونظام أسماء النطاقات."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"ليس هناك اتصال بالشبكة. الرجاء إعادة المحاولة لاحقًا."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"الشهادة مفقودة. الرجاء تعديل الملف الشخصي."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"النظام"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"إلغاء"</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">"تحديثات إضافية للنظام"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"المستخدمون والقيود"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"المستخدمون"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"إضافة مستخدم"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"تعديل التفاصيل"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"معلومات المستخدم"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"الاسم"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"قيود المحتوى"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"رقم التعريف الشخصي مطلوب"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"تقييم المحتوى"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"تطبيقات النظام"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"التطبيقات المثبتة"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"إلغاء"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"إزالة مستخدم"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"طفل مزعج"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"معطّل"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"متساهل"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"فرض"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"المستخدمون"</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="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_confirm_remove_message" msgid="5284111415714437285">"هل تريد بالتأكيد إزالة المستخدم وجميع البيانات المرتبطة به من الجهاز؟"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"تغيير حجم الخط"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"القيود"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"إزالة القيود"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"تغيير رقم التعريف الشخصي"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"إظهار الإشعارات"</string>
     <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="user_restrictions_title" msgid="7745810037152772035">"قيود التطبيقات والمحتوى"</string>
+    <string name="user_rename" msgid="8523499513614655279">"إعادة تسمية"</string>
+    <string name="app_restrictions_custom_label" msgid="6160672982086584261">"تعيين قيود التطبيق"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"يتم التحكم فيه بواسطة <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"هذا التطبيق غير متوافق مع الملفات الشخصية المقيدة"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"يمكن لهذا التطبيق الدخول إلى حساباتك"</string>
+    <string name="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 eb58bcd..8671375 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,16 +218,37 @@
     <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="886742181977884584">"Медыя"</item>
+    <item msgid="7924928667052300589">"Прылада"</item>
+  </string-array>
+    <!-- no translation found for app_ops_summaries:41 (26109888160231211) -->
+    <!-- no translation found for app_ops_labels:41 (8584357129746649222) -->
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кароткі"</item>
     <item msgid="2560532955514699713">"Сярэдні"</item>
     <item msgid="2372711992605524591">"Доўгі"</item>
   </string-array>
+    <!-- no translation found for select_runtime_titles:0 (3574453009229338122) -->
+    <!-- no translation found for select_runtime_titles:1 (8978402910750533864) -->
+    <!-- no translation found for select_runtime_titles:2 (7839859333977894115) -->
+    <!-- no translation found for select_runtime_summaries:0 (6412880178297884701) -->
+    <!-- no translation found for select_runtime_summaries:1 (5131846588686178907) -->
+    <!-- no translation found for select_runtime_summaries:2 (4530003713865319928) -->
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Ніколі не правяраць"</item>
     <item msgid="6042769699089883931">"Праверка толькi для змесціва, абароненага DRM"</item>
@@ -253,6 +286,35 @@
     <item msgid="3170120558236848008">"Маштаб анімацыі 5x"</item>
     <item msgid="1069584980746680398">"Маштаб анімацыі 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Няма"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi i 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Няма"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Адключаны"</item>
+    <item msgid="7688197031296835369">"Паказаць вобласці з перабольшваннем"</item>
+    <item msgid="8332661909019981149">"Паказаць лічыльнік перабольшвання"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартны ліміт"</item>
     <item msgid="4071574792028999443">"Няма фонавых працэсаў"</item>
@@ -277,4 +339,9 @@
     <item msgid="4042143101664725090">"Тайм-аўт"</item>
     <item msgid="7664124146786465092">"Няўдала"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Запытацца"</item>
+    <item msgid="5077768429488260031">"Нiколi не дазваляць"</item>
+    <item msgid="1417929597727989746">"Заўсёды дазваляць"</item>
+  </string-array>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 3ecc39c..e38d0ff 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Так"</string>
     <string name="no" msgid="6731231425810196216">"Не"</string>
     <string name="create" msgid="3578857613172647409">"Стварыць"</string>
+    <string name="allow" msgid="3349662621170855910">"Дазволіць"</string>
+    <string name="deny" msgid="6947806159746484865">"Забараніць"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Невядома"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Зараз вы ў некалькіх (<xliff:g id="STEP_COUNT">%1$d</xliff:g>) кроках ад таго, каб стаць распрацоўшчыкам."</item>
+    <item quantity="other" msgid="6722953419953594148">"Зараз вы ў некалькіх (<xliff:g id="STEP_COUNT">%1$d</xliff:g>) кроках ад таго, каб стаць распрацоўшчыкам."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Цяпер вы - распрацоўшчык!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Не трэба, вы ўжо з\'яўляецеся распрацоўшчыкам."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"БЕСПРАВАДНАЯ ПЕРАДАЧА І СЕТКІ"</string>
     <string name="header_category_device" msgid="5781174212691167553">"ПРЫЛАДА"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"АСАБІСТЫЯ"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Зарадка"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Разрадка"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(бесправадныя сеткi)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Не зараджаецца"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не зараджаецца"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Поўная"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Адключана"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"Перам. ток"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"бесправадныя сеткi"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"Перам. ток+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Невядома"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Невядомы"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Невядомая памылка"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Халодны"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Бачнасць"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Зрабіць бачнай для ўсіх блізкіх прылад Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Бачна для ўсіх блізкіх прылад Bluetooth"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Не бачны для іншых прылад Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Бачная толькі для падключаных прылад"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Зрабіць прыладу бачнай"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Тайм-аўт бачнасці"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Настаўце час, на працягу якога прылада будзе даступная"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Блакаваць галасавы набор"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Забараніць выкарыстанне набіральніка Bluetooth, калі экран заблакаваны"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Прылады Bluetooth"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Паказаць атрыманыя файлы"</string>
     <string name="device_picker" msgid="8398232791303186677">"Выбiрае Bluetooth-прыладу"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Запыт дазволу Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Прыкладанне спрабуе ўключыць Bluetooth. Дазволіць?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Прыкладанне на планшэце хоча зрабіць яго бачным для іншых прылад Bluetooth на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Дазволіць?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Прыкладанне на тэлефоне хоча зрабіць яго бачным для іншых прылад Bluetooth на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Дазволіць?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Прыкладанне на планшэце хоча ўключыць зрабіць яго заўсёды бачным для іншых прылад. Дазволіць?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Прыкладанне на тэлефоне хоча зрабіць яго заўсёды бачным для іншых прылад Bluetooth. Дазволіць?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Прыкладанне на планшэце хоча зрабіць яго бачным для іншых прылад Bluetooth на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Дазволіць?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Прыкладанне з вашага тэлефона хоча ўключыць Bluetooth i зрабiць ваш тэлефон бачным для iншых прылад на <xliff:g id="TIMEOUT">%1$d</xliff:g> с. Дазволiць?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Прыкладанне на планшэце хоча ўключыць Bluetooth і зрабіць планшэт бачным для іншых прылад. Дазволіць?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Прыкладанне з вашага тэлефона хоча ўключыць Bluetooth i зрабiць ваш тэлефон бачным для iншых прылад. Дазволiць?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Прыкладанне iмкнецца ўключыць Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Прыкладанне iмкнецца зрабіць ваш планшэт бачным для іншых прылад Bluetooth на <xliff:g id="TIMEOUT">%1$d</xliff:g> с."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Прыкладанне iмкнецца зрабіць ваш тэлефон бачным для іншых прылад Bluetooth на <xliff:g id="TIMEOUT">%1$d</xliff:g> с."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Прыкладанне iмкнецца зрабіць ваш ​​планшэт бачным для іншых прылад з Bluetooth. Вы можаце змяніць гэта пазней у наладах Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Прыкладанне iмкнецца зрабіць ваш ​​тэлефон бачным для іншых прылад з Bluetooth. Вы можаце змяніць гэта пазней у наладах Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Прыкладанне iмкнецца ўключыць Bluetooth і зрабіць ваш ​​планшэт бачным для іншых прылад на <xliff:g id="TIMEOUT">%1$d</xliff:g> с."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Прыкладанне iмкнецца ўключыць Bluetooth і зрабіць ваш ​​тэлефон бачным для іншых прылад на <xliff:g id="TIMEOUT">%1$d</xliff:g> с."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Прыкладанне iмкнецца ўключыць Bluetooth і зрабіць ваш ​​планшэт бачным для іншых прылад. Вы можаце змяніць гэта пазней у наладах Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Прыкладанне iмкнецца ўключыць Bluetooth і зрабіць ваш ​​тэлефон бачным для іншых прылад. Вы можаце змяніць гэта пазней у наладах Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Уключэнне Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Адключэнне Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Аўтаматычнае падключэнне"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Проксі HTTP выкарыстоўваецца браўзэрам, але ён не можа выкарыстоўвацца іншымі прыкладаннямi"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Месцазнаходжанне:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Суседнія CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Звесткi ячэйкi:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Спробы перадачы дадзеных:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Служба GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роўмінг:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Вы страцілі падключэнне для перадачы дадзеных, таму што вы пакінулі сваю хатнюю сетку з адключаным параметрам перадачы дадзеных у роўмінгу."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Уключыць"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Калі вы дазваляеце перадачу дадзеных у роўмінгу, з вас можа спаганяцца плата."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"За перадачу дадзеных у роўмінгу з вас могуць спаганяцца немаленькiя сумы.\n\nГэты параметр распаўсюджваецца на ўсіх карыстальнікаў гэтага планшэта."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"За перадачу дадзеных у роўмінгу з вас могуць спаганяцца немаленькiя сумы.\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>
@@ -297,6 +307,10 @@
     <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">"Паказаць інфармацыю пра карыстальніка на экране блак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>
@@ -308,8 +322,8 @@
     <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">"Вы можаце зашыфраваць свае ўліковыя запісы, налады, спампаваныя прыкладанні і іх дадзеныя, мультымедыйныя і іншыя файлы. Пасля зашыфроўкі планшэта кожны раз пры ўключэнні трэба будзе ўводзіць лічбавы PIN-код ці пароль для яго расшыфроўкі. Вы не зможаце расшыфраваць планшэт, акрамя як скінуўшы налады дадзеных, пасля чаго выдаляцца ўсе дадзеныя."\n\n"Шыфраванне займае гадзіну ці больш. Трэба пачынаць з зараджаным акумулятарам і трымаць планшэт падлучаным да завяршэння шыфравання. Калі перапыніць працэс шыфравання, будуць страчаны ўсе або некаторыя вашы дадзеныя."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Вы можаце зашыфраваць свае ўліковыя запісы, налады, спампаваныя прыкладанні і іх дадзеныя, мультымедыйныя і іншыя файлы. Пасля зашыфроўкі тэлефона кожны раз пры ўключэнні трэба будзе ўводзіць лічбавы PIN-код ці пароль для яго расшыфроўкі. Вы не зможаце расшыфраваць тэлефон, акрамя як скінуўшы налады дадзеных, пасля чаго выдаляцца ўсе дадзеныя."\n\n"Шыфраванне займае гадзіну ці больш. Трэба пачынаць з зараджаным акумулятарам і трымаць тэлефон падлучаным да завяршэння шыфравання. Калі перапыніць працэс шыфравання, будуць страчаны ўсе або некаторыя вашы дадзеныя."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Вы можаце зашыфраваць свае ўліковыя запісы, налады, спампаваныя прыкладанні і іх дадзеныя, мультымедыйныя і іншыя файлы. Пасля зашыфроўкі планшэта кожны раз пры ўключэнні трэба будзе ўводзіць лічбавы PIN-код ці пароль для яго расшыфроўкі. Вы не зможаце расшыфраваць планшэт, акрамя як скінуўшы налады дадзеных, пасля чаго выдаляцца ўсе дадзеныя.\n\nШыфраванне займае гадзіну ці больш. Трэба пачынаць з зараджаным акумулятарам і трымаць планшэт падлучаным да завяршэння шыфравання. Калі перапыніць працэс шыфравання, будуць страчаны ўсе або некаторыя вашы дадзеныя."</string>
+    <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>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Паўтарыце спробу праз <xliff:g id="DELAY">^1</xliff:g> с."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Увядзіце пароль"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шыфраванне няўдалае"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шыфраванне было перапынена і не можа быць завершана. У выніку гэтага дадзеныя на вашым планшэце больш не даступныя."\n\n"Каб выкарыстоўваць планшэт далей, неабходна выканаць скід налад. Пры наладзе планшэта пасля перазагрузкі вы будзеце мець магчымасць аднавіць любыя дадзеныя, якія былі скапіяваны ў ваш уліковы запіс Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шыфраванне перапынена і не можа быць завершана. У выніку дадзеныя на вашым тэлефоне больш не даступныя."\n\n"Каб выкарыстоўваць тэлефон далей, неабходна выканаць скід налад. Пры наладзе тэлефона пасля перазагрузкі вы будзеце мець магчымасць аднавіць любыя дадзеныя, якія былі скапіяваныя ў ваш уліковы запіс Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шыфраванне было перапынена і не можа быць завершана. У выніку гэтага дадзеныя на вашым планшэце больш не даступныя.\n\nКаб выкарыстоўваць планшэт далей, неабходна выканаць скід налад. Пры наладзе планшэта пасля перазагрузкі вы будзеце мець магчымасць аднавіць любыя дадзеныя, якія былі скапіяваны ў ваш уліковы запіс Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шыфраванне перапынена і не можа быць завершана. У выніку дадзеныя на вашым тэлефоне больш не даступныя.\n\nКаб выкарыстоўваць тэлефон далей, неабходна выканаць скід налад. Пры наладзе тэлефона пасля перазагрузкі вы будзеце мець магчымасць аднавіць любыя дадзеныя, якія былі скапіяваныя ў ваш уліковы запіс Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Пераключэнне рэжыму ўводу"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Выберыце спосаб блак. экрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Блакав. рэз. капіяв."</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Змяніць PIN-код разблакавання"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Змяніць пароль разблакоўкі"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Пароль павінен быць не менш за пэўную колькасць знакаў: %d"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Мiнiмальная колькасць знакаў PIN-коду: %d"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-код павінен утрымлiваць не менш за пэўную колькасць лічбаў: %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">"Максiмальная колькасць знакаў, якую можа змяшчаць пароль: <xliff:g id="NUMBER">%d</xliff:g>"</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <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_empty_list_wifi_display_off" msgid="1225626898926363100">"Каб убачыць прылады, уключыце бесправадны дысплей."</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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Спалучаныя дысплеi"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Даступныя прылады"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Падключэнне"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Падключана"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Даступна"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Выкарыстоўваецца"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Налады экрана"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Адключыцца?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Будзе завершана вашай сувящь з прыладай :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Параметры бесправаднога дысплея"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Ігнараваць"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Гатова"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Назва"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Укл."</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Выкл."</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Выключана"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Дазволіць абмен дадзенымі, калі планшэт дакранаецца да іншай прылады"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Дазволіць абмен дадзенымі, калі тэлефон закранае іншыя прылады"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Адключана"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Недаступна, таму што NFC выключаная"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Калі гэтая функцыя ўключаная, вы можаце перадаваць змесціва прыкладання на іншыя сумяшчальныя з NFC прылады, утрымліваючы прылады блізка адна да адной. Напрыклад, вы можаце перадаваць старонкi з браўзэра, відэа з YouTube, кантакты і многае іншае."\n\n"Толькі злучыце прылады (звычайна заднімі бакамі) і дакраніцеся да экрана. Прыкладанне вызначыць, якая прылада падлучаецца."</string>
+    <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="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="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="8116564886303972764">"Увядзіце 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_in_progress" msgid="2944576520214787628">"WPS ужо запушчаны, гэта можа заняць да дзвюх хвілін"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Падключэнне да сеткі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS ужо запушчаны, гэта можа заняць да дзвюх хвілін"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Не атрымалася ўсталяваць WPS. Паўтарыце спробу праз некалькі хвілін."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Налады бяспекі бесправаднога маршрутызатара (WEP) не падтрымліваюцца"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Налады бяспекі бесправаднога маршрутызатара (TKIP) не падтрымліваюцца"</string>
     <string name="wifi_wps_failed_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>
@@ -564,6 +621,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>
@@ -571,8 +631,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_advanced_titlebar" msgid="1627063574532930090">"Пашыраны Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Дыяпазон частот Wi-Fi"</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="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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Пошук..."</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Пераназваць прыладу"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Піры"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Захаваныя групы"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Не атрымалася падключыцца."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Не атрымалася перайменаваць прыладу."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Адключыцца?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Калі вы адключыцеся, падключэнне да прылады <xliff:g id="PEER_NAME">%1$s</xliff:g> і іншых (<xliff:g id="PEER_COUNT">%2$s</xliff:g>) не перапынiцца."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Адмяніць запрашэнне?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Вы жадаеце адмяніць запрашэнне на падлучэнне да прылады <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Партатыўная кропка доступу Wi-Fi"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Iгнараваць гэту групу?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Партатыўная кропка доступу Wi-Fi"</string>
+    <string name="wifi_tether_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Музычныя эфекты"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Гучнасць званка"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вібрацыя ў бязгучным рэжыме"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Паведамленні па змаўчанні"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Гук паведамлення па змаўчаннi"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Імпульснае святло апавяшчэння"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Рынгтон"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Апавяшчэнне"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Выкарыстоўваць гучнасць уваходных выклікаў для паведамленняў"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Выберыце мелодыю апавяшчэння"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Гук паведамлення па змаўчаннi"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Мультымедыя"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Вызначыць гучнасць для музыкі і відэа"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Будзільнік"</string>
@@ -671,15 +743,16 @@
     <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="3848608373818910549">"Застаўка экрана"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Запусціцца у спячым рэжыме, калі будзе падлучаны да электрасілкавання"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Адключана"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Абраны модуль"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Хуткасць актывацыі"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Час прастою: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Ніколі"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Паспрабуйце!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Таксама запускаць ў прыстыкаваным стане"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Мроi"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Калі падключаны, у рэжыме сну цi зараджаецца"</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">"Каб кантраляваць тое, што адбываецца, калі тэлефон падкючаны або ў стане сну, уключыце \"Мроi\"."</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>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN-код SIM-карты"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Няправільны PIN-код"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN-код не супадае"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Немагчыма змяніць PIN-код."\n"Магчыма, няправільны PIN-код."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Немагчыма змяніць PIN-код.\nМагчыма, няправільны PIN-код."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN-код SIM-карты паспяхова зменены"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Немагчыма змяніць стан блакавання SIM-карты."\n"Магчыма, няправільны PIN-код."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Немагчыма змяніць стан блакавання SIM-карты.\nМагчыма, няправільны PIN-код."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"ОК"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Адмяніць"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Стан планшэта"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Версія baseband"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Вэрсія ядра"</string>
     <string name="build_number" msgid="3075795840572241758">"Нумар зборкі"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Стан SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Недаступны"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Стан"</string>
     <string name="device_status" msgid="607405385799807324">"Стан"</string>
@@ -733,12 +807,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">"Тып мабільнай сеткі"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Звесткi пра аператара"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Стан мабільнай сеткі"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Стан"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"Магутнасць сігналу"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-назапашвальнік"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-карта"</string>
     <string name="memory_available" msgid="5052397223077021181">"Маецца"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Даступна (толькі для чытання)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Агульнае месца"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Вядзецца падлік..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Прыкладанні (дадзеныя і медыя-змесціва прыкладання)"</string>
@@ -756,6 +832,7 @@
     <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_cache_usage" msgid="6704293333141177910">"Кэшаваныя дадзеныя"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Адключыць сумеснае сховішча"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Адключыць SD-карту"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Адключыць унутраны USB-назапашвальнiк"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Сцерці SD-карту"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Сцірае ўсе дадзеныя на ўнутраным USB-назапашвальнiку (напрыклад, музыку і фатаграфіі)"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Сцірае ўсе дадзеныя на SD-карце (напрыклад, музыку і фатаграфіі)"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Толькі чытанне)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Ачысціць кэшаваныя дадзеныя?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Гэта ачысціць кэшаваныя дадзеныя для ўсіх прыкладанняў."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Функцыя MTP або PTP актыўная"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Адключыць USB-назапашвальнiк"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Адключыць SD-карту"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Калі вы выдалiце USB-назапашвальнiк, некаторыя прыкладанні, якія вы выкарыстоўваеце, спыняцца і могуць быць недаступныя, пакуль вы зноў не ўсталюеце USB-назапашвальнiк."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Камера (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Дазваляе перадаваць фатаграфіі з дапамогай праграмнага забеспячэння камеры і перадаваць любыя файлы на кампутарах, якія не падтрымліваюць MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Устанавіць сродкі перадачы файлаў"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Iншыя карыстальнікi"</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>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <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>"унутранага сховiшча вашага планшэта"</b>" , у тым ліку: "\n\n<li>"ваш улiковы запiс Google"</li>\n<li>"сістэмныя дадзеныя, а таксама дадзеныя прыкладанняў і налады"</li>\n<li>"спампаваныя прыкладанні"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Гэта дазволіць сцерці ўсе дадзеныя з "<b>"унутранага сховiшча вашага тэлефона"</b>" , у тым ліку: "\n\n<li>"ваш улiковы запiс Google"</li>\n<li>"сістэмныя дадзеныя, а таксама дадзеныя прыкладанняў і налады"</li>\n<li>"спампаваныя прыкладанні"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"У дадзены момант вы зайшлі ў наступныя ўліковыя запісы:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Гэта дазволіць сцерці ўсе дадзеныя з "<b>"унутранага сховiшча вашага планшэта"</b>" , у тым ліку: \n\n"<li>"ваш улiковы запiс Google"</li>\n<li>"сістэмныя дадзеныя, а таксама дадзеныя прыкладанняў і налады"</li>\n<li>"спампаваныя прыкладанні"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Гэта дазволіць сцерці ўсе дадзеныя з "<b>"унутранага сховiшча вашага тэлефона"</b>" , у тым ліку: \n\n"<li>"ваш улiковы запiс Google"</li>\n<li>"сістэмныя дадзеныя, а таксама дадзеныя прыкладанняў і налады"</li>\n<li>"спампаваныя прыкладанні"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"У дадзены момант вы зайшлі ў наступныя ўліковыя запісы:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музыка"</li>\n<li>"Фатаграфіі"</li>\n<li>"Іншыя дадзеныя карыстальніка"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Каб выдаліць музыку, фатаграфіі і іншыя дадзеныя карыстальніка, трэба ачысціць "<b>"USB-назапашвальнік"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Каб выдаліць музыку, фатаграфіі і іншыя дадзеныя карыстальніка, трэба выдаліць інфармацыю з "<b>"SD-карты"</b>"."</string>
@@ -897,10 +979,20 @@
     <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>
+    <!-- no translation found for manage_mobile_plan_title (7588182101738043593) -->
+    <skip />
+    <!-- no translation found for mobile_unknown_sim_operator (9101230468757324260) -->
+    <skip />
+    <!-- no translation found for mobile_no_provisioning_url (2399426808423775711) -->
+    <skip />
+    <!-- no translation found for mobile_insert_sim_card (9052590985784056395) -->
+    <skip />
+    <!-- no translation found for mobile_connect_to_internet (1733894125065249639) -->
+    <skip />
     <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>
@@ -917,6 +1009,7 @@
     <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">"Нарматыўныя звесткi"</string>
     <string name="copyright_title" msgid="865906688917260647">"Аўтарскія правы"</string>
     <string name="license_title" msgid="1990487604356037871">"Ліцэнзія"</string>
     <string name="terms_title" msgid="7697580845616764642">"Правілы і ўмовы"</string>
@@ -944,7 +1037,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Змяніць PIN-код разблакавання"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Пацвердзіце захаваную камбінацыю"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Паспрабуйце яшчэ:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Выканайце камбінацыю разблакоўкі"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Выканайце камбінацыю разблакiроўкі"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Націсніце \"Меню\", каб атрымаць даведку."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Адпусціце палец, калі скончыце."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Злучыце па меншай меры <xliff:g id="NUMBER">%d</xliff:g> кропак. Паспрабуйце яшчэ раз:"</string>
@@ -966,12 +1059,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Як зрабіць камбінацыю разблакоўкі"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Занадта шмат няўдалых спробаў"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Паўтарыце спробу праз <xliff:g id="NUMBER">%d</xliff:g> секунд."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Адмяніць"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Далей"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Абарона планшэта"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Абарона тэлефона"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Абараніце свой планшэт ад несанкцыянаванага выкарыстання, стварыўшы персанальную камбінацыю разблакоўкі экрана. Пальцам злучыце кропкі на наступным экране ў любым парадку. Вы павінны злучыць як мінімум чатыры кропкі."\n\n"Гатовы? Нацiснiце \"Далей\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Абараніце свой тэлефон ад несанкцыянаванага выкарыстання, стварыўшы персанальную камбінацыю разблакоўкі экрана. На наступным экране злучыце ў любым парадку не менш за чатыры кропкi. "\n" "\n" Гатовы пачаць? Націсніце \"Далей\"."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Прыкладанне не ўсталявана на вашым тэлефоне."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Кіраванне прыкладаннямі"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Кіраванне ўсталяванымi прыкладаннямi і iх выдаленне"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Прыкладаннi"</string>
@@ -981,6 +1069,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Дазволіць усталёўку прыкладанняў з невядомых крыніц"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Планшэт і асабістыя дадзеныя больш уразлівыя да нападаў прыкладанняў з невядомых крыніц. Вы згаджаецеся, што нясеце поўную адказнасць за любыя пашкоджанні планшэта ці страту дадзеных, якія могуць паўстаць у працэсе выкарыстання гэтых прыкладанняў."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Тэлефон і асабістыя дадзеныя больш уразлівыя для нападаў прыкладанняў з невядомых крыніц. Вы згаджаецеся, што нясеце поўную адказнасць за любыя пашкоджанні тэлефона ці страты дадзеных, якія могуць паўстаць у працэсе выкарыстання гэтых прыкладанняў."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Праверыць прыкладаннi"</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="application_info_label" msgid="5736524913065714880">"Звесткі пра прыкладанне"</string>
@@ -1001,6 +1091,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Дадзеныя USB-сховішча"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-карта"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Выдаліць"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Выдалiць для ўсіх карыстальнікаў"</string>
+    <string name="install_text" msgid="884360662922471113">"Усталяваць"</string>
     <string name="disable_text" msgid="6544054052049395202">"Адключыць"</string>
     <string name="enable_text" msgid="9217362512327828987">"Уключанае"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Ачысціць дадзеныя"</string>
@@ -1019,17 +1111,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Паказаць кэшаваныя працэсы"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Скід налад прыкладання"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Скінуць налады прыкладання?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Гэта дазволіць скінуць усе налады для:"\n\n<li>"адключаных прыкладанняў"</li>\n<li>"адключаных паведамленняў прыкладанняў"</li>\n<li>"прыкладанняў па змаўчанні для дзеянняў"</li>\n<li>"абмежаванняў фонавых дадзеных для прыкладанняў"</li>\n\n"Вы не страціце дадзеныя прыкладанняў."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Гэта дазволіць скінуць усе налады для:\n\n"<li>"адключаных прыкладанняў"</li>\n<li>"адключаных паведамленняў прыкладанняў"</li>\n<li>"прыкладанняў па змаўчанні для дзеянняў"</li>\n<li>"абмежаванняў фонавых дадзеных для прыкладанняў"</li>\n\n"Вы не страціце дадзеныя прыкладанняў."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Скід прыкладанняў"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Кіраванне вольным месцам"</string>
     <string name="filter" msgid="2018011724373033887">"Фільтр"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Выберыце параметры фільтра"</string>
     <string name="filter_apps_all" msgid="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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На SD-карце"</string>
     <string name="disabled" msgid="9206776641295849915">"Адключанае"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Не ўсталявана"</string>
     <string name="no_applications" msgid="7336588977497084921">"Няма прыкладанняў."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Унутраная памяць"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-назапашвальнік"</string>
@@ -1054,6 +1148,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> і <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Гэта прыкладанне можа спаганяць з вас сродкi:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Адправiць платную SMS"</string>
     <string name="computing_size" msgid="1599186977475211186">"Вылічэнне..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Не атрымалася вызначыць памер пакета."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"У вас няма ўсталяваных прыкладанняў ад іншых пастаўшчыкоў."</string>
@@ -1077,8 +1173,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Змяніць пераважнае месца ўсталявання новых прыкладанняў"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Адключыць убудаванае прыкладанне?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Пасля адключэння ўбудаванага прыкладання іншыя прыкладанні могуць дрэнна працаваць."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Выдаліць дадзеныя і адключыць прыкладанне?"</string>
+    <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>
@@ -1094,6 +1195,8 @@
     <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">"Карыстальнiк: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Аддалены карыстальнiк"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"Працэсаў: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; службаў: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"Працэсаў: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; службаў: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"Працэсаў: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; службаў: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
@@ -1128,7 +1231,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Налады фізічнай клавіятуры"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Двойчы націсніце прабел, каб уставіць \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Зрабіць паролі бачнымі"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Гэты метад уводу можа збіраць увесь тэкст, які ўводзіцца, у тым лiку такiя персанальныя дадзеныя, як паролі і нумары крэдытных карт. Ён выкарыстоўваецца прыкладаннем <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Выкарыстоўваць гэты метад уводу?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Гэты iнструмент праверкi арфаграфіі можа збiраць увесь ўводзімы тэкст, у тым ліку асабістыя дадзеныя, такія як паролі і нумары крэдытных карт. Яно паходзіць ад прыкладання <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Выкарыстоўваць гэты iнструмент?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Налады"</string>
@@ -1144,9 +1246,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Каб перакл., націсніце Ctrl-Space"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Па змаўчанні"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Раскладкі клавіятуры"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Карыстальніцкі слоўнік"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Асабісты слоўнік"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Асабістыя слоўнікі"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Персанальны слоўнік"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Дадаць"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Дадаць у слоўнік"</string>
@@ -1157,6 +1257,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>
@@ -1197,24 +1299,43 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Экран ніколі не ўвайдзе ў рэжым сну падчас зарадкі"</string>
+    <!-- no translation found for bt_hci_snoop_log (3340699311158865670) -->
+    <skip />
+    <!-- no translation found for bt_hci_snoop_log_summary (730247028210113851) -->
+    <skip />
+    <!-- no translation found for select_runtime_title (649783802363155346) -->
+    <skip />
+    <!-- no translation found for select_runtime_dialog_title (5314872813037493958) -->
+    <skip />
+    <!-- no translation found for select_runtime_warning_message (1937574953265648165) -->
+    <skip />
     <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 прызначана толькі для мэтаў распрацоўкі. Яна можа выкарыстоўвацца, каб капіяваць дадзеныя паміж кампутарам і прыладай, усталёўваць прыкладанні на прыладзе без папярэдняга апавяшчэння і чытаць дадзеныя дзённ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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Праверце прыкладаннi, усталяваныя з дапамогай ADB/ADT, на нестабiльныя паводзiны."</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>
-    <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_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="enable_terminal_title" msgid="95572094356054120">"Лакальны тэрмінал"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Уключэнне прыкладання тэрмінала, якое прапануе доступ да лакальнай абалонкі"</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>
@@ -1234,29 +1355,53 @@
     <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_toggle_large_text_title" msgid="6618674985313017711">"Вялікі шрыфт"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Нац. на кнопку сілкавання зав. выклік"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Прамовіць паролі"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Дакраніцеся і затрымайце"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Павышэнне даступнасці вэб-сайтаў"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Жэсты павелiчэння"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Калi гэта функцыя ўключана, можна наблiжаць i аддаляць, тройчы нацiснуўшы на экран.\n\nНаблiзiйшы, можна:\n"<ul><li>"Панарама: працягнiце два цi больш пальцаў па экране."</li>\n<li>"Дадаць узровень наблiжэння: звядзiце пальцы або развядзiце ў розныя бакi."</li></ul>\n\n"Таксама можна часова павялiчыць тое, што пад пальцам, тройчы нацiснуўшы i ўтрымлiваючы. У павялiчаным стане можна працягнуць палец, каб адкрыць iншыя часткi экрана. Паднiмiце палец, каб вярнуцца да папярэдняга.\n\nМайце на ўвазе: патройнае нацiсканне працуе паўсюль, акрамя клавiятуры i панэлi навiгацыi."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Цэтлiк даступнасцi"</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_description" msgid="750438015254396963">"Калі гэта функцыя ўключана, вы можаце хутка ўключыць функцыі доступу ў два крокі:\n\n.Крок 1: Націсніце і ўтрымлівайце кнопку сілкавання, пакуль не пачуеце гук ці не адчуце вібрацыю.\n\nКрок 2: Дакраніцеся да экрану двума пальцамі і ўтрымлівайце іх, пакуль не пачуеце гук пацверджання.\n\nКалі прылада мае некалькіх карыстальнікаў, скарыстайцеся гэтым цэтлiкам на экране блакіроўкi, каб часова дазволіць доступ, пакуль прылада не будзе разблакіравана."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Вялікі шрыфт"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Павелiчэнне экрану"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Аўтаматычнае абнаўленне павелiчэння экрана"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Абнаўленне павелiчэння экрану падчас перахода з прыкладання"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Нац. на кнопку сілкавання зав. выклік"</string>
+    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Прамовіць паролі"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Дакраніцеся і затрымайце"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Налады"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"На"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Адключаны"</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="accessibility_feature_state_on" msgid="2864292320042673806">"На"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Адключана"</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>
+    <!-- no translation found for print_settings (4742428530112487843) -->
+    <skip />
+    <!-- no translation found for print_settings_title (4911263339115736689) -->
+    <skip />
+    <!-- no translation found for print_services_title (1088097751249445946) -->
+    <skip />
+    <!-- no translation found for print_service_security_warning_title (2338435517408144841) -->
+    <skip />
+    <!-- no translation found for print_service_security_warning_summary (919299459931111450) -->
+    <skip />
+    <!-- no translation found for print_no_services_installed (8443039625463872294) -->
+    <skip />
+    <!-- no translation found for print_menu_item_settings (6591330373682227082) -->
+    <skip />
+    <!-- no translation found for print_menu_item_add_printers (2890738028215834012) -->
+    <skip />
+    <!-- no translation found for print_feature_state_on (8098901852502441048) -->
+    <skip />
+    <!-- no translation found for print_feature_state_off (7294876968403966040) -->
+    <skip />
     <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">"Адсутнiчаюць дадзеныя пра выкарыстанне акумулятара."</string>
@@ -1268,14 +1413,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>
@@ -1283,7 +1428,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>
@@ -1293,11 +1438,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Атрыманыя дадзеныя"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Мабільныя дадзеныя адпраўлены"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Атрыманы мабільныя дадзеныя"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Дадзеныя ў сетцы Wi-Fi адпраўлены"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Атрыманы дадзеныя ў сетцы Wi-Fi"</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>
@@ -1306,7 +1453,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>
@@ -1315,8 +1462,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>
@@ -1324,6 +1471,7 @@
     <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="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>
@@ -1350,6 +1498,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Тон"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Уплывае на тон вуснага тэксту"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Мова"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Мова не выбрана"</string>
     <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>
@@ -1361,6 +1510,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>
@@ -1378,8 +1528,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Яркасць: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"аўта"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"поўная"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"палова"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"выкл."</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Сховішча ўліковых дадзеных"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Усталяваць з назапашвальніка"</string>
@@ -1390,6 +1554,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>
@@ -1411,14 +1578,11 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Рэзервовае капіяванне і аднаўленне"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Асабістыя дадзеныя"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Рэзервовае капіяванне дадзеных"</string>
-    <string name="backup_data_summary" msgid="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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Пры пераўсталяваннi прыкладання аднавіць рэзервовую копію налад і дадзеных"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Справаздача пра памылку"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Будзе збiрацца iнфармацыя пра бягучы стан прылады, якая будзе адпраўляцца на электронную пошту. Стварэнне справаздачы пра памылкi зойме некаторы час."</string>
-    <string name="report" msgid="302437572240018342">"Справаздача"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Пароль для рэзервовага капіявання працоўнага стала"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Поўнае рэзервовае капіраванне рабочага стала зараз не абаронена"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Выберыце, каб змяніць або выдаліць пароль для поўнага рэзервовага капіравання рабочага стала"</string>
@@ -1426,7 +1590,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>
@@ -1442,10 +1606,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>
@@ -1467,9 +1631,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>
@@ -1497,7 +1661,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Каляндар"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Кантакты"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Вітаем у службе сінхранізацыі Google!"</font>" "\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">"Параметры сiнхранiзацыi прыкладання"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Сынхранізацыя дадзеных"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Змяніць пароль"</string>
@@ -1537,6 +1701,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>
@@ -1548,36 +1713,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Мігаць ўсёй паверхней акна пры абнаўленні"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Паказ. абн. выгляду GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Мігнуць вакном пры чарчэнні з дапамогай GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Паказаць абнаўленнi апаратнага пласта"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Апаратныя пласты набываюць зялёны колер, калi абнаўляюцца"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Адладка перамалёўкі GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Паказаць выкарыстанне ЦП"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Наклад на экран з бягучым выкарыстаннем працэсара"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Прымусовае адлюстраванне GPU"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Мадэляванне другасных дысплеяў"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Прыкладаннi"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Не трымаць дзеянні"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Знішч. кож.дзеянне, як толькі карыст.пакідае яго"</string>
     <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>
@@ -1591,8 +1760,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>
@@ -1607,11 +1776,11 @@
     <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" msgid="1466689968707308512">"Гэта функцыя можа перашкаджаць працы прыкладанняў, якiя залежаць ад фонавых дадзеных, толькi калі даступныя мабільныя сеткі."\n\n"Вы можаце знайсці больш адпаведнае прымяненне дадзеным у наладах прыкладання."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Гэта функцыя можа перашкаджаць працы прыкладанняў, якiя залежаць ад фонавых дадзеных, толькi калі даступныя мабільныя сеткі.\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"Каб выбраць, якія віды інфармацыі сінхранiзаваць у кожным уліковым запісе, перайдзіце ў меню: Налады &gt; Уліковыя запісы."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Любыя змены, унесеныя ва ўліковы запіс на вэб-сайце, будуць аўтаматычна скапіраваныя ў памяць тэлефона."\n\n"Некаторыя ўліковыя запісы таксама могуць аўтаматычна капіраваць любыя змены ў тэлефоне, якія вы робіце на вэб-сайце. Уліковы запіс Google працуе наступным чынам."\n\n"Каб выбраць, якія віды інфармацыі сінхранiзаваць у кожным уліковым запісе, перайдзіце ў меню: Налады &gt; Уліковыя запісы."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Любыя змены, унесеныя ва ўліковы запіс на вэб-сайце, будуць аўтаматычна скапіраваны ў памяць планшэта.\n\nНекаторыя ўліковыя запісы таксама могуць аўтаматычна капіраваць любыя змены ў тэлефоне, якія вы робіце на вэб-сайце. Уліковы запіс Google працуе наступным чынам.\n\nКаб выбраць, якія віды інфармацыі сінхранiзаваць у кожным уліковым запісе, перайдзіце ў меню: Налады &gt; Уліковыя запісы."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Любыя змены, унесеныя ва ўліковы запіс на вэб-сайце, будуць аўтаматычна скапіраваныя ў памяць тэлефона.\n\nНекаторыя ўліковыя запісы таксама могуць аўтаматычна капіраваць любыя змены ў тэлефоне, якія вы робіце на вэб-сайце. Уліковы запіс Google працуе наступным чынам.\n\nКаб выбраць, якія віды інфармацыі сінхранiзаваць у кожным уліковым запісе, перайдзіце ў меню: Налады &gt; Уліковыя запісы."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Адключыць аўтасінхр. дадзеных?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Гэта дасць магчымасць захаваць трафік і акумулятар, але вам трэба будзе сінхранiзаваць кожны ўліковы запіс уручную, каб збіраць свежую інфармацыю. І вы не будзеце атрымліваць апавяшчэнні, калі з\'явяцца абнаўленні."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Дата скіду цыкла выкарыстання"</string>
@@ -1620,22 +1789,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">"Ваша падключэнне для перадачы дадзеных будзе завершана пасля дасягнення пэўнага л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_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" 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Выдаленыя прыкладанні і карыстальнiкi"</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>, як вызначана на планшэце. Плата за выкарыстанне дадзеных у вашага аператара можа адрозн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>
@@ -1667,6 +1839,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Дадаць профіль VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Рэдагаваць профiль"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Выдаліць профіль"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Заўсёды ўключаны VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Дазволiць, каб VPN заўсёды заставаўся падключаным да сеткi, можна будзе толькi пасля падключэння да гэтага VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Няма"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Заўсёды ўключаны VPN патрабуе IP-адрас для сервера і DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Падключэнне да сеткi адсутнічае. Паўтарыце спробу пазней."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Сертыфікат адсутнічае. Адрэдагуйце профіль."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Сістэма"</string>
@@ -1685,24 +1861,90 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Адмена"</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">"Дадатк. абнаўл. сістэмы"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Карыстальнікі і абмежаванні"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Карыстальнікі"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Дадаць карыстальніка"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Рэдагаваць інфармацыю"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Інфармацыя карыстальніка"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Імя"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Абмежаванні змесціва"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Запытваць PIN-код"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Рэйтынг змесціва"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Сістэмныя прыкладанні"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Усталяваныя прыкладанні"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Скасаваць"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Выдаліць карыстальніка"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Надакучлівае дзіця"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Выключана"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Дазвол"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Забеспячэнне"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Карыстальнікі"</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="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_confirm_remove_message" msgid="5284111415714437285">"Вы ўпэўнены, што хочаце выдаліць з прылады карыстальніка і ўсе звязаныя з iм дадзеныя?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Змяніць памер шрыфту"</string>
+    <!-- no translation found for restriction_settings_title (4233515503765879736) -->
+    <skip />
+    <!-- no translation found for restriction_menu_reset (2067644523489568173) -->
+    <skip />
+    <!-- no translation found for restriction_menu_change_pin (740081584044302775) -->
+    <skip />
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Паказваць паведамленні"</string>
     <string name="help_label" msgid="1107174367904110532">"Даведка"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Уліковы запіс для змесціва"</string>
+    <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>
+    <!-- no translation found for app_restrictions_custom_label (6160672982086584261) -->
+    <skip />
+    <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 4c8cc1c..2f75b39 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,16 +218,127 @@
     <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="886742181977884584">"Мултимедия"</item>
+    <item msgid="7924928667052300589">"Устройство"</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>
+    <item msgid="5124443975763747838">"бутони за мултимедия"</item>
+    <item msgid="4547883971364273343">"фокусиране на звука"</item>
+    <item msgid="2603878814882344450">"основна сила на звука"</item>
+    <item msgid="7136963238377062018">"сила на звука за глас"</item>
+    <item msgid="4270236897655923007">"сила на звука при звънене"</item>
+    <item msgid="6325739889222559394">"сила на звука за мултимедия"</item>
+    <item msgid="5762123934816216821">"сила на звука на будилника"</item>
+    <item msgid="785049718065337473">"сила на звука за известия"</item>
+    <item msgid="6700305533746877052">"сила на звука за Bluetooth"</item>
+    <item msgid="2029227495214047094">"оставяне в будно състояние"</item>
+    <item msgid="26109888160231211">"наблюдение на местоположението"</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>
+    <item msgid="5753789168376302997">"Бутони за мултимедия"</item>
+    <item msgid="3265262911688671938">"Фокусиране на звука"</item>
+    <item msgid="2098976479485046797">"Основна сила на звука"</item>
+    <item msgid="5660213838861789350">"Сила на звука за глас"</item>
+    <item msgid="7983336752371254444">"Сила на звука при звънене"</item>
+    <item msgid="7878027809189330917">"Сила на звука за мултимедия"</item>
+    <item msgid="7260546305036218513">"Сила на звука на будилника"</item>
+    <item msgid="9103719301075748925">"Сила на звука при известие"</item>
+    <item msgid="7025966722295861512">"Сила на звука за Bluetooth"</item>
+    <item msgid="4665183401128289653">"Оставяне в будно състояние"</item>
+    <item msgid="8584357129746649222">"Местоположение"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кратко"</item>
     <item msgid="2560532955514699713">"Средно"</item>
     <item msgid="2372711992605524591">"Продължително"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (отстраняване на грешки)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Използване на Dalvik"</item>
+    <item msgid="5131846588686178907">"Използване на ART"</item>
+    <item msgid="4530003713865319928">"Използване на версията на ART за отстраняване на грешки"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Никога да не се проверява"</item>
     <item msgid="6042769699089883931">"Проверка само за DRM съдържание"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Скала на анимацията 5x"</item>
     <item msgid="1069584980746680398">"Скала на анимацията 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Няма"</item>
+    <item msgid="688482401508173818">"720 x 480 mdpi"</item>
+    <item msgid="1725473474827398815">"1 280 x 720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1 920 x 1 080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1 280 x 720 tvdpi и 1 920 x 1 080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Без"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Изключено"</item>
+    <item msgid="7688197031296835369">"Области за преизчертаване: Показв."</item>
+    <item msgid="8332661909019981149">"Брояч на преизчертаване: Показване"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартно ограничение"</item>
     <item msgid="4071574792028999443">"Няма процеси на заден план"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Време за изчакване"</item>
     <item msgid="7664124146786465092">"Неуспешно"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Да се пита"</item>
+    <item msgid="5077768429488260031">"Никога да не се разрешава"</item>
+    <item msgid="1417929597727989746">"Винаги да се разрешава"</item>
+  </string-array>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index bd36fcf..72221bb 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">" Да"</string>
     <string name="no" msgid="6731231425810196216">"Не"</string>
     <string name="create" msgid="3578857613172647409">"Създаване"</string>
+    <string name="allow" msgid="3349662621170855910">"Разрешаване"</string>
+    <string name="deny" msgid="6947806159746484865">"Отказ"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Неизвестно"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Вече сте на <xliff:g id="STEP_COUNT">%1$d</xliff:g> стъпка от това, да бъдете програмист."</item>
+    <item quantity="other" msgid="6722953419953594148">"Вече сте на <xliff:g id="STEP_COUNT">%1$d</xliff:g> стъпки от това, да бъдете програмист."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Вече сте програмист!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Не е необходимо – вече сте програмист."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"КАБЕЛНИ И БЕЗЖИЧНИ МРЕЖИ"</string>
     <string name="header_category_device" msgid="5781174212691167553">"УСТРОЙСТВО"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"ЛИЧНИ"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Зарежда се"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Изпразване"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(безжично)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Не се зарежда"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не се зарежда"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Пълна"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Изкл."</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"безжично"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Неизвестни"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Неизвестен"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Неизвестна грешка"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Студено"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Откриваемо"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Видимо за всички у-ва с Bluetooth в района (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Видимо за всички устройства с Bluetooth в района"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Не е видимо за други устройства с Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Видимо само за сдвоени устройства"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Устройството да стане откриваемо"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Време за изчакване за видимост"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Задаване на време, за което устройството ще бъде откриваемо"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заключване на гласовото набиране"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Предотвратява употребата на набирането за Bluetooth при заключен екран"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth устройства"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Показване на получени файлове"</string>
     <string name="device_picker" msgid="8398232791303186677">"Инструмент за избор на устройство с Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Заявка за разрешение на Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Приложение иска да включи Bluetooth. Ще разрешите ли това?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Приложение на таблета ви иска да го направи откриваем от други устройства с Bluetooth за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Ще разрешите ли това?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Приложение на телефона ви иска да го направи откриваем от други устройства с Bluetooth за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Ще разрешите ли това?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Приложение на таблета ви иска да го направи „винаги откриваем“ от други устройства с Bluetooth. Ще разрешите ли това?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Приложение на телефона ви иска го направи „винаги откриваем“ от други устройства с Bluetooth. Ще разрешите ли това?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Приложение на таблета ви иска да включи Bluetooth и да го направи откриваем от други устройства за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Ще разрешите ли това?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Приложение на телефона ви иска да включи Bluetooth и да го направи откриваем от други устройства за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди. Ще разрешите ли това?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Приложение на таблета ви иска да включи Bluetooth и да го направи откриваем от други устройства. Ще разрешите ли това?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Приложение на телефона ви иска да включи Bluetooth и да го направи откриваем от други устройства. Ще разрешите ли това?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Приложение иска да включи Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Приложение иска да направи таблета ви видим за други устройства с Bluetooth за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Приложение иска да направи телефона ви видим за други устройства с Bluetooth за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Приложение иска да направи таблета ви видим за други устройства с Bluetooth. Можете да промените това по-късно от настройките за функцията."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Приложение иска да направи телефона ви видим за други устройства с Bluetooth. Можете да промените това по-късно от настройките за функцията."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Приложение иска да включи Bluetooth и да направи таблета ви видим за други устройства за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Приложение иска да включи Bluetooth и да направи телефона ви видим за други устройства за <xliff:g id="TIMEOUT">%1$d</xliff:g> секунди."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Приложение иска да включи Bluetooth и да направи таблета ви видим за други устройства. Можете да промените това по-късно от настройките за функцията."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Приложение иска да включи Bluetooth и да направи телефона ви видим за други устройства. Можете да промените това по-късно от настройките за функцията."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth се включва..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth се изключва…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Автоматично свързване"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP прокси сървърът се използва от браузъра, но не и от други приложения."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Местоположение:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Идентификация на съседно обаждане:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Клетъчна информация:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Опити за данни:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS услуга:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роуминг:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Изгубихте връзката за данни, защото сте оставили домашната си мрежа с изключен роуминг на данни."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Включване"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Разрешаването на роуминг на данни може да доведе до висока такса за роуминг!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Разрешаването на роуминг на данни може да доведе до високи такси!\n\nНастройката засяга всички потребители на този таблет."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Разрешаването на роуминг на данни може да доведе до високи такси!\n\nНастройката засяга всички потребители на този телефон."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Да се разреши ли роуминг на данни?"</string>
     <string name="networks" msgid="6333316876545927039">"Избор на оператора"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Избиране на мрежов оператор"</string>
@@ -297,6 +307,10 @@
     <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>
@@ -308,8 +322,8 @@
     <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>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Опитайте отново след <xliff:g id="DELAY">^1</xliff:g> секунди."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Въведете паролата си"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифроването не бе успешно"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифроването бе прекъснато и не може да завърши. В резултат на това вече няма достъп до данните на таблета ви."\n\n"За да възобновите използването му, трябва да възстановите фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, на които е направено резервно копие в профила ви в Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифроването бе прекъснато и не може да завърши. В резултат на това вече няма достъп до данните на телефона ви."\n\n"За да възобновите използването му, трябва да възстановите фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, на които е направено резервно копие в профила ви в Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифроването бе прекъснато и не може да завърши. В резултат на това вече няма достъп до данните на таблета ви.\n\nЗа да възобновите използването му, трябва да възстановите фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, на които е направено резервно копие в профила ви в Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифроването бе прекъснато и не може да завърши. В резултат на това вече няма достъп до данните на телефона ви.\n\nЗа да възобновите използването му, трябва да възстановите фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, на които е направено резервно копие в профила ви в Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Превключване на метода на въвеждане"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Закл. на екрана: Избор"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Резервно заключване"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промяна на PIN кода за отключване"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Промяна на паролата за отключване"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Паролата трябва да е поне %d знака"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN кодът трябва да е поне %d знака"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"ПИН кодът трябва да е поне %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>
@@ -406,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>
@@ -480,6 +503,28 @@
     <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_empty_list_wifi_display_off" msgid="1225626898926363100">"За да видите устройства, включете безжичния дисплей."</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_paired_devices" msgid="7395326840730024303">"Сдвоени дисплеи"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Налични устройства"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Установява се връзка"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Установена е връзка"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Налице"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Използва се"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Настройки за дисплея"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Да се изключи ли?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Това ще прекрати връзката ви със:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Опции на безжичния дисплей"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Забравяне"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Готово"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Име"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Вкл."</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Изкл."</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Деактивирано"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Разрешаване на обмен на данни, когато таблетът докосва друго устройство"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Разрешаване на обмен на данни, когато телефонът докосва друго устройство"</string>
@@ -488,56 +533,68 @@
     <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">"Задаване и управление на безжични точки за достъп"</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="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="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="8116564886303972764">"Въведете ПИН кода <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_in_progress" msgid="2944576520214787628">"Настройката на WPS вече е в ход и завършването й може да отнеме до две минути"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Свързахте се с Wi‑Fi мрежата <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Настройката на WPS вече е в ход и завършването й може да отнеме до две минути"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Стартирането на WPS не бе успешно. Моля, опитайте отново след няколко минути."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Защитната настройка (WEP) на безжичния маршрутизатор не се поддържа"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Защитната настройка (TKIP) на безжичния маршрутизатор не се поддържа"</string>
     <string name="wifi_wps_failed_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>
@@ -564,6 +621,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>
@@ -571,8 +631,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_advanced_titlebar" msgid="1627063574532930090">"Разширени настройки за Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Честотен спектър за Wi-Fi"</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="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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Търси се…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Преименуване на устройството"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Съответни устройства"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Запомнени групи"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Не можа да се свърже."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Преименуването на устройството не бе успешно."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Да се изключи ли?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Ако прекъснете връзката, ще се прекрати и установената със:  <xliff:g id="PEER_NAME">%1$s</xliff:g> и още  <xliff:g id="PEER_COUNT">%2$s</xliff:g> устройства."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Да се анулира ли поканата?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Искате ли да анулирате поканата за свързване с/ъс <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Преносима точка за достъп през Wi-Fi"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Да се забрави ли тази група?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Преносима точка за достъп до Wi‑Fi"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Музикални ефекти"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Сила на звука при звънене"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вибрира при тих режим"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Стандартно известяване"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Стандартен звук за известяване"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Пулсиране на светлината за известия"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Мелодия"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Известие"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Използване на силата на звука при вх. обаждане за известия"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Избор на мелодия за известия"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Стандартен звук за известяване"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Медия"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Задаване на сила на звука за музика и видеоклипове"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Будилник"</string>
@@ -671,15 +743,16 @@
     <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="3848608373818910549">"Наслада от екрана"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Ще стартира от спящ режим при включено захранване"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Деактивирано"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Отбрана наслада"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Кога да се активира"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"След <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Никога"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Изпробвайте!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Да се стартира и при свързване с докинг станция"</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">"За да контролирате какво се случва, когато телефонът е свързан с докинг станция и/или е в спящ режим, включете „Мечта“."</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>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN за SIM карта"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Неправилен ПИН"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"ПИН кодовете не са идентични"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"ПИН кодът не може да се промени."\n"Възможен неправилен ПИН."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"ПИН кодът не може да се промени.\nВъзможен неправилен ПИН."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Успешна промяна на PIN за SIM карта"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Не може да се промени състоянието на заключване на SIM картата."\n"Възможен неправилен ПИН."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Не може да се промени състоянието на заключване на SIM картата.\nВъзможен неправилен ПИН."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Отказ"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Състояние на таблета"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Версия на радиомодула"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Версия на ядрото"</string>
     <string name="build_number" msgid="3075795840572241758">"Номер на версията"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Състояние на SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Не е налично"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Състояние"</string>
     <string name="device_status" msgid="607405385799807324">"Състояние"</string>
@@ -733,12 +807,13 @@
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"Идентификатор на карта с ИС"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Тип мобилна мрежа"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Информация за оператора"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Състояние на мобилната мрежа"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Състояние на услуга"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"Сила на сигнала"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB хранилище"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD карта"</string>
     <string name="memory_available" msgid="5052397223077021181">"На разположение"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Налице (само за четене)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Общо място"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Изчислява се..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Приложения (данни за приложения и медийно съдърж.)"</string>
@@ -756,6 +832,7 @@
     <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_cache_usage" msgid="6704293333141177910">"Кеширани данни"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Спиране на сподел. хран."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Деактивиране на SD карта"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Спиране на вътрешното USB"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Изтриване на SD картата"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Изтрива всички данни във вътрешното USB хранилище, като музика и снимки"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Изтрива всички данни в SD картата, като музика и снимки"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Само за четене)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Да се изчистят ли кешираните данни?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Това ще изчисти кешираните данни за всички прил."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Активна е функция за MTP или PTP"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Да се спре ли USB хран.?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Да се спре ли SD картата?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Ако спрете USB хранилището, някои използвани от вас приложения ще спрат и може да бъдат недостъпни, докато не го свържете отново."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Камера (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Позволява ви да прехвърляте снимки чрез софтуера за камера и файлове на компютри, които не поддържат MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Инсталиране на инструменти за прехвърляне на файлове"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Други потребители"</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>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Възстановяване на фабричните настройки"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Изтрива всички данни на таблета"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Изтрива всички данни на телефона"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на таблета ви, включително:"\n\n<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на телефона ви, включително:"\n\n<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Понастоящем сте влезли в следните профили:"\n</string>
+    <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>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"За да изчистите музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"SD картата"</b>"."</string>
@@ -897,10 +979,15 @@
     <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="manage_mobile_plan_title" msgid="7588182101738043593">"Управление на мобилния план"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Неизвестен SIM оператор"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Няма известен администриращ уебсайт за %1$s"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Моля, поставете SIM карта и рестартирайте"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Моля, свържете се с интернет"</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>
@@ -917,6 +1004,7 @@
     <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="copyright_title" msgid="865906688917260647">"Авторски права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценз"</string>
     <string name="terms_title" msgid="7697580845616764642">"Общи условия"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Промяна на PIN кода за отключване"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Потвърждаване на запазена фигура"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Опитайте отново:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Начертайте фигура за отключване"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Начертайте фигура за отключване:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Натиснете „Меню“ за помощ"</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Махнете пръста си, когато сте готови"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Свържете поне <xliff:g id="NUMBER">%d</xliff:g> точки. Опитайте отново:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Как се чертае фигура за отключване"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Твърде много грешни опити!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Опитайте отново след <xliff:g id="NUMBER">%d</xliff:g> секунди."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Отказ"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Напред"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Подсигуряване на таблета ви"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Защитаване на телефона ви"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Защитете таблета си от неупълномощена употреба, като създадете лична фигура за отключване на екрана. Плъзнете пръст, за да свържете в произволен ред точките на следващия екран. Трябва да свържете поне четири точки. "\n\n"Готови ли сте да започнете? Докоснете „Напред“."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Защитете телефона си от неупълномощена употреба, като създадете лична фигура за отключване на екрана. Плъзнете пръст, за да свържете в произволен ред поне 4 точки на следващия екран. "\n\n"Готови ли сте да започнете? Докоснете „Напред“."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Приложението не е инсталирано на телефона ви."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Управление на приложенията"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управление и премахване на инсталирани приложения"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Приложения"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Разрешаване на инсталирането на приложения от неизвестни източници"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Таблетът и личните ви данни са по-уязвими на атака от приложения от неизвестни източници. Приемате, че носите цялата отговорност в случай на повреда на таблета или при загуба на данни вследствие използването на такива приложения."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Данните на телефона ви и личната ви информация са по-уязвими на атака от приложения от неизвестни източници. Приемате, че носите цялата отговорност в случай на повреда на телефона или при загуба на данни вследствие използването на такива приложения."</string>
+    <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="application_info_label" msgid="5736524913065714880">"Информация за приложението"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Данни за USB хранилището"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD карта"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Деинсталиране"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Деинсталиране за всички потребители"</string>
+    <string name="install_text" msgid="884360662922471113">"Инсталиране"</string>
     <string name="disable_text" msgid="6544054052049395202">"Деактивиране"</string>
     <string name="enable_text" msgid="9217362512327828987">"Активиране"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Изчистване на данни"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Кеширани процеси"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Нулиране"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Да се нулират предпоч.?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Това ще нулира всички предпочитания за:"\n\n" "<li>"деактивираните приложения;"</li>\n" "<li>"известията за деактивирани приложения;"</li>\n" "<li>"стандартните приложения за действия;"</li>\n" "<li>"ограниченията на данните на заден план за приложенията."</li>\n\n" Няма да загубите данни от приложенията."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Това ще нулира всички предпочитания за:\n\n "<li>"деактивираните приложения;"</li>\n" "<li>"известията за деактивирани приложения;"</li>\n" "<li>"стандартните приложения за действия;"</li>\n" "<li>"ограниченията на данните на заден план за приложенията."</li>\n\n" Няма да загубите данни от приложенията."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Нулиране на приложенията"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Управление на място"</string>
     <string name="filter" msgid="2018011724373033887">"Филтриране"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Избор на филтриращи опции"</string>
     <string name="filter_apps_all" msgid="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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На SD карта"</string>
     <string name="disabled" msgid="9206776641295849915">"Деактивирано"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Не е инсталирано"</string>
     <string name="no_applications" msgid="7336588977497084921">"Няма приложения."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Вътр. хранилище"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB хранилище"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> и <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Това приложение може да ви таксува пари:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Изпращане на импулсен SMS"</string>
     <string name="computing_size" msgid="1599186977475211186">"Изчислява се..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Размерът на пакета не можа да бъде изчислен."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Нямате никакви инсталирани приложения на трети страни."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Промяна на предпочитаното място за инсталиране на нови приложения"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Да се деакт. ли вград. прил.?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Ако деактивирате вградено приложение, е възможно други да не функционират правилно."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Да се изтрият ли данните и да се деактивира приложението?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Потребител: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Премахнат потребител"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> процес и <xliff:g id="NUMSERVICES">%2$d</xliff:g> услуга"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> процес и <xliff:g id="NUMSERVICES">%2$d</xliff:g> услуги"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> процеса и <xliff:g id="NUMSERVICES">%2$d</xliff:g> услуга"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Настройки за физическа клавиатура"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Натискане на интервал два пъти, за вмъкване на „.“"</string>
     <string name="show_password" msgid="3001113966880559611">"Нека паролите да са видими"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></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>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"За превключване натиснете „Ctrl“-интервал"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"По подразбиране"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Клавиатурни подредби"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Потребителски речник"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Личен речник"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Лични речници"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Личен речник"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Добавяне"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Добавяне в речника"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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="bt_hci_snoop_log" msgid="3340699311158865670">"Активиране на регистрационния файл за анализ на пакетите в команден ред за Bluetooth с протокола HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Заснемане на всички пакети за Bluetooth с протокола HCI във файла"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Избор на изпълним модул"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Избор на изпълним модул"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Да се рестартира ли за промяна на изпълнимия модул от „<xliff:g id="OLD">%1$s</xliff:g>“ на „<xliff:g id="NEW">%2$s</xliff:g>“?"</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>
+    <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>
-    <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_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="enable_terminal_title" msgid="95572094356054120">"Локален терминал"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Актив. на прил. за терминал с достъп до локалния команден ред"</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>
@@ -1234,29 +1345,43 @@
     <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_toggle_large_text_title" msgid="6618674985313017711">"Голям текст"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Край на обажд.: Бутон за захранване"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Изговаряне на паролите"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Докосване и дълго задържане"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Достъпност в мрежата: Подобряване"</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>
+    <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_toggle_speak_password_preference_title" msgid="5986628515113204844">"Изговаряне на паролите"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Забавяне при докосване и задържане"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Настройки"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Включено"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Изключено"</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="accessibility_feature_state_on" msgid="2864292320042673806">"Вкл."</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Изкл."</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="print_settings" msgid="4742428530112487843">"Отпечатване"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Настройки за отпечатване"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Услуги"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Да се използва ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> може да получава отпечатваните от вас документи. Възможно е те да съдържат поверителни данни."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Няма инсталирани услуги"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Настройки"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Добавяне на принтери"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Включено"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Изключено"</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>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Получени данни"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Мобилните данни са изпратени"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Мобилните данни са получени"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Данните през Wi-Fi са изпратени"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Данните през Wi-Fi са получени"</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>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <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="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>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Височина"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Отразява се на тона на изговорения текст"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Език"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Езикът не е избран"</string>
     <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>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Яркост: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"автоматична"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"пълна"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"наполовина"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"изключена"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Хранилище за идент. данни"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Инсталиране от хранилището"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Резервни копия и възстановяване"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Лични данни"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Създаване на резервно копие на данните ми"</string>
-    <string name="backup_data_summary" msgid="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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"При повторно инсталиране на приложение да се възстановят настройките и данните от резервното копие"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Получаване на сигнал за програмна грешка"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"По този начин ще се събере информация за текущото състояние на устройството ви, която да се изпрати като имейл съобщение. След стартирането на процеса ще мине известно време, докато сигналът за програмна грешка бъде готов за подаване. Моля, имайте търпение."</string>
-    <string name="report" msgid="302437572240018342">"Подаване на сигнал"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Наст. комп.: Парола"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Понастоящем пълните резервни копия за настолен компютър не са защитени"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Докоснете, за да промените или премахнете паролата за пълни резервни копия на настолния компютър"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Примигв. на целите повърхности на прозорците при актуализирането им"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Показване на актуализациите на изгледа от GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Примигв. на изгледи в прозорците при начертаване с GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Актуализации на слоевете на хардуера"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Примигв. на слоевете на хардуера в зелено при актуал."</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Отстран. на проблеми, свързани с преизчертаване от ГП"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Употреба на процесора"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Наслагване на екрана показва употр. на процесора"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Принудително изобразяване"</string>
     <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>
+    <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>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Унищож. на всяка дейност при напускане от потребител"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <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" msgid="1466689968707308512">"Тази функция може да доведе до спиране на работата на приложение, което зависи от данните на заден план, когато са налице само мобилни мрежи."\n\n"Можете да намерите по-подходящи контроли за използването на данните в наличните в приложението настройки."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Тази функция може да доведе до спиране на работата на приложение, което зависи от данните на заден план, когато са налице само мобилни мрежи.\n\nМожете да намерите по-подходящи контроли за използването на данните в наличните в приложението настройки."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="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>
@@ -1620,22 +1769,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" 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_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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Потребителски профил за VPN: Добавяне"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Редактиране на потребителския профил"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Изтриване на потребителския профил"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Винаги включена виртуална частна мрежа"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Изберете потребителски профил за виртуална частна мрежа (VPN), за да останете винаги свързани с нея. Мрежовият трафик ще бъде разрешен само при връзка с тази VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Няма"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Винаги включената виртуална частна мрежа (VPN) изисква IP адрес както за сървъра, така и за DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Няма връзка с мрежата. Моля, опитайте отново по-късно."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Липсва сертификат. Моля, редактирайте потребителския профил."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Система"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Отказ"</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">"Допълнителни системни актуализации"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Потребители и ограничения"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Потребители"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Потребител: Добавяне"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Подробности: Редактиране"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Потребителска информация"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Име"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Ограничения за съдържанието"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Изисква се ПИН"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Класиф. на съдържанието"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Системни приложения"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Инсталирани приложения"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Отхвърляне"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Потребител: Премахв."</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Досадно дете"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Деактивирано"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Разрешаващо"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Налагане"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Потребители"</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="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_confirm_remove_message" msgid="5284111415714437285">"Наистина ли искате да премахнете потребителя и всички свързани данни от устройството?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Промяна на размера на шрифта"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Ограничения"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Oграничения: Премахване"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Промяна на ПИН кода"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Известия: Показване"</string>
     <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="user_restrictions_title" msgid="7745810037152772035">"Прилож. и съдържание: Ограничения"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ПРЕИМЕНУВАНЕ"</string>
+    <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Ограничения за приложения: Задаване"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Контролирани от <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Това приложение не се поддържа от потребителски профили с ограничена функционалност"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Това приложение има достъп до профилите ви"</string>
+    <string name="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 f8366f8..938f74d 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -60,7 +60,7 @@
     <item msgid="4322676235684793329">"30 minuts"</item>
   </string-array>
   <string-array name="entries_font_size">
-    <item msgid="8166647333858618801">"Petit"</item>
+    <item msgid="8166647333858618801">"Petita"</item>
     <item msgid="1932071435506638315">"Normal"</item>
     <item msgid="38373998008112077">"Gran"</item>
     <item msgid="7786168277516233536">"Enorme"</item>
@@ -70,13 +70,17 @@
     <item msgid="2361722960903353554">"Lenta"</item>
     <item msgid="1145554631248513562">"Normal"</item>
     <item msgid="7553665153391107454">"Ràpida"</item>
-    <item msgid="2538100882620724753">"Molt ràpid"</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>
     <item msgid="2692137425242433765">"Baixa"</item>
     <item msgid="3332408460740717754">"Normal"</item>
-    <item msgid="4907380534957572531">"Alta"</item>
+    <item msgid="4907380534957572531">"Alt"</item>
     <item msgid="4699640516390840297">"Molt alt"</item>
   </string-array>
   <string-array name="wifi_status">
@@ -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">"Sempre"</item>
-    <item msgid="844721238536786870">"Només quan està endollat"</item>
+    <item msgid="844721238536786870">"Només quan s\'estigui carregant"</item>
     <item msgid="2990218920631468642">"Mai (augmenta l\'ús de dades)"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Sempre"</item>
-    <item msgid="7433294150916905997">"Només quan està endollat"</item>
+    <item msgid="7433294150916905997">"Només quan s\'estigui carregant"</item>
     <item msgid="1390404486722375028">"Mai"</item>
   </string-array>
   <string-array name="wifi_frequency_band_entries">
@@ -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>
@@ -188,7 +200,7 @@
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Desactivat"</item>
     <item msgid="3165868966179561687">"Alerta"</item>
-    <item msgid="6038758039030476855">"Vibra"</item>
+    <item msgid="6038758039030476855">"Vibració"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Cap"</item>
@@ -206,16 +218,127 @@
     <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="886742181977884584">"Multimèdia"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"botons multimèdia"</item>
+    <item msgid="4547883971364273343">"enfocament de l\'àudio"</item>
+    <item msgid="2603878814882344450">"volum general"</item>
+    <item msgid="7136963238377062018">"volum de la veu"</item>
+    <item msgid="4270236897655923007">"volum del to"</item>
+    <item msgid="6325739889222559394">"volum multimèdia"</item>
+    <item msgid="5762123934816216821">"volum de l\'alarma"</item>
+    <item msgid="785049718065337473">"volum de notificació"</item>
+    <item msgid="6700305533746877052">"volum del Bluetooth"</item>
+    <item msgid="2029227495214047094">"actiu"</item>
+    <item msgid="26109888160231211">"supervisa la ubicació"</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>
+    <item msgid="5753789168376302997">"Botons de multimèdia"</item>
+    <item msgid="3265262911688671938">"Enfocament de l\'àudio"</item>
+    <item msgid="2098976479485046797">"Volum general"</item>
+    <item msgid="5660213838861789350">"Volum de la veu"</item>
+    <item msgid="7983336752371254444">"Volum del to"</item>
+    <item msgid="7878027809189330917">"Volum de multimèdia"</item>
+    <item msgid="7260546305036218513">"Volum de l\'alarma"</item>
+    <item msgid="9103719301075748925">"Volum de notificació"</item>
+    <item msgid="7025966722295861512">"Volum de Bluetooth"</item>
+    <item msgid="4665183401128289653">"Actiu"</item>
+    <item msgid="8584357129746649222">"Ubicació"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curt"</item>
-    <item msgid="2560532955514699713">"Mitjana"</item>
+    <item msgid="2560532955514699713">"Mitjà"</item>
     <item msgid="2372711992605524591">"Llarg"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (depuració)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Fes servir Dalvik"</item>
+    <item msgid="5131846588686178907">"Fes servir ART"</item>
+    <item msgid="4530003713865319928">"Fes servir la compilació de depuració ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"No comprovis mai"</item>
     <item msgid="6042769699089883931">"Comprova només el contingut DRM"</item>
@@ -228,34 +351,63 @@
   </string-array>
   <string-array name="window_animation_scale_entries">
     <item msgid="8134156599370824081">"Animació desactivada"</item>
-    <item msgid="6624864048416710414">"Animació a escala 0,5x"</item>
-    <item msgid="2219332261255416635">"Animació a escala 1x"</item>
-    <item msgid="3544428804137048509">"Animació a escala 1,5x"</item>
-    <item msgid="3110710404225974514">"Animació a escala 2x"</item>
+    <item msgid="6624864048416710414">"Escala d\'animació 0,5x"</item>
+    <item msgid="2219332261255416635">"Escala d\'animació 1x"</item>
+    <item msgid="3544428804137048509">"Escala d\'animació 1,5x"</item>
+    <item msgid="3110710404225974514">"Escala d\'animació 2x"</item>
     <item msgid="4402738611528318731">"Animació a escala 5x"</item>
-    <item msgid="6189539267968330656">"Animació a escala 10x"</item>
+    <item msgid="6189539267968330656">"Escala d\'animació 10x"</item>
   </string-array>
   <string-array name="transition_animation_scale_entries">
     <item msgid="8464255836173039442">"Animació desactivada"</item>
-    <item msgid="3375781541913316411">"Animació a escala 0,5x"</item>
-    <item msgid="1991041427801869945">"Animació a escala 1x"</item>
-    <item msgid="4012689927622382874">"Animació a escala 1,5x"</item>
-    <item msgid="3289156759925947169">"Animació a escala 2x"</item>
-    <item msgid="7705857441213621835">"Animació a escala 5x"</item>
-    <item msgid="6660750935954853365">"Animació a escala 10x"</item>
+    <item msgid="3375781541913316411">"Escala d\'animació 0,5x"</item>
+    <item msgid="1991041427801869945">"Escala d\'animació 1x"</item>
+    <item msgid="4012689927622382874">"Escala d\'animació 1,5x"</item>
+    <item msgid="3289156759925947169">"Escala d\'animació 2x"</item>
+    <item msgid="7705857441213621835">"Escala d\'animació 5x"</item>
+    <item msgid="6660750935954853365">"Escala d\'animació 10x"</item>
   </string-array>
   <string-array name="animator_duration_scale_entries">
     <item msgid="6039901060648228241">"Animació desactivada"</item>
-    <item msgid="1138649021950863198">"Animació a escala 0,5x"</item>
-    <item msgid="4394388961370833040">"Animació a escala 1x"</item>
-    <item msgid="8125427921655194973">"Animació a escala 1,5x"</item>
+    <item msgid="1138649021950863198">"Escala d\'animació 0,5x"</item>
+    <item msgid="4394388961370833040">"Escala d\'animació 1x"</item>
+    <item msgid="8125427921655194973">"Escala d\'animació 1,5x"</item>
     <item msgid="3334024790739189573">"Animació a escala 2x"</item>
     <item msgid="3170120558236848008">"Animació a escala 5x"</item>
     <item msgid="1069584980746680398">"Animació a escala 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Cap"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi i 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Cap"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (gràfics)"</item>
+    <item msgid="1340692776955662664">"Pila de trucades a glGetError"</item>
+  </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Desactivada"</item>
+    <item msgid="675719912558941285">"Àrea retall no rectangular en blau"</item>
+    <item msgid="1064373276095698656">"Ressalta ordres de dibuix provats 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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Desactiva"</item>
+    <item msgid="7688197031296835369">"Mostra les àrees modificades"</item>
+    <item msgid="8332661909019981149">"Mostra comptador modificacions"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Límit estàndard"</item>
-    <item msgid="4071574792028999443">"Cap procés de fons"</item>
+    <item msgid="4071574792028999443">"Sense processos en segon pla"</item>
     <item msgid="4810006996171705398">"Com a màxim 1 procés"</item>
     <item msgid="8586370216857360863">"Com a màxim 2 processos"</item>
     <item msgid="836593137872605381">"Com a màxim 3 processos"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Temps d\'espera esgotat"</item>
     <item msgid="7664124146786465092">"Incorrecte"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Pregunta-ho"</item>
+    <item msgid="5077768429488260031">"No permetis mai"</item>
+    <item msgid="1417929597727989746">"Permet sempre"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4e87ab2..e3e5d46 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -19,8 +19,16 @@
     <string name="yes" msgid="4676390750360727396">"Sí"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="create" msgid="3578857613172647409">"Crea"</string>
+    <string name="allow" msgid="3349662621170855910">"Permet"</string>
+    <string name="deny" msgid="6947806159746484865">"Denega"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconegut"</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"Sense fil i xarxes"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Ara només et queda <xliff:g id="STEP_COUNT">%1$d</xliff:g> pas per convertir-te en desenvolupador"</item>
+    <item quantity="other" msgid="6722953419953594148">"Ara només et queden <xliff:g id="STEP_COUNT">%1$d</xliff:g> passos per convertir-te en desenvolupador"</item>
+  </plurals>
+    <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>
     <string name="header_category_system" msgid="2073558547468647128">"SISTEMA"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"S\'està carregant"</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_discharging" msgid="6222697503392774475">"S\'està descarregant"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(sense fil)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"No s\'està carregant"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"No s\'està carregant"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Plena"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Desconnectada"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"sense fil"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"CA+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Desconegut"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Desconegut"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Error desconegut"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Fred"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectable"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible per a tots els dispositius Bluetooth propers (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible per a tots els dispositius Bluetooth propers"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"No visible per a altres dispositius Bluetooth"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ocult per a altres dispositius Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Només visible per als dispositius sincronitzats"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Fes que el dispositiu es pugui detectar"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Temps d\'espera de la visib."</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Defineix durant quanta estona podrà detectar-se el dispositiu"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloqueja el marcatge per veu"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedeix l\'ús del marcador Bluetooth quan la pantalla estigui bloquejada"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositius Bluetooth"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostra els fitxers rebuts"</string>
     <string name="device_picker" msgid="8398232791303186677">"Selector de dispositiu Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Sol·licitud de permís de Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Una aplicació vol activar el Bluetooth. Vols permetre-ho?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Una aplicació de la teva tauleta vol permetre que altres dispositius amb Bluetooth puguin descobrir la teva tauleta durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons. Vols permetre-ho?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Una aplicació del teu telèfon vol permetre que altres dispositius amb Bluetooth puguin descobrir el teu telèfon durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons. Vols permetre-ho?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Una aplicació de la teva tauleta vol permetre que altres dispositius amb Bluetooth puguin \"descobrir-la sempre\". Vols permetre-ho?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Una aplicació del teu telèfon vol permetre que altres dispositius amb Bluetooth puguin \"descobrir sempre\" el teu telèfon. Vols permetre-ho?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Una aplicació de la tauleta vol activar Bluetooth i permetre que altres dispositius puguin descobrir-la durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons. Vols permetre-ho?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Una aplicació del teu telèfon vol activar el Bluetooth i vol permetre que altres dispositius puguin descobrir el teu telèfon durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons. Ho vols permetre?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Una aplicació de la teva tauleta vol activar el Bluetooth i permetre que altres dispositius puguin descobrir-la. Vols permetre-ho?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Una aplicació del teu telèfon vol activar el Bluetooth i permetre que altres dispositius puguin descobrir el teu telèfon. Vols permetre-ho?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Una aplicació vol activar el Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Una aplicació vol que la tauleta sigui visible per a la resta de dispositius amb Bluetooth durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Una aplicació vol que el telèfon sigui visible per a la resta de dispositius amb Bluetooth durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Una aplicació vol que la tauleta sigui visible per a altres dispositius amb Bluetooth. Més endavant podràs canviar la configuració de Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Una aplicació vol que el telèfon sigui visible per a altres dispositius amb Bluetooth. Més endavant podràs canviar la configuració de Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Una aplicació vol activar el Bluetooth i fer que la tauleta sigui visible per a la resta de dispositius durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Una aplicació vol activar el Bluetooth i fer que el telèfon sigui visible per a la resta de dispositius durant <xliff:g id="TIMEOUT">%1$d</xliff:g> segons."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Una aplicació vol activar el Bluetooth i fer que la tauleta sigui visible per a la resta de dispositius. Més endavant podràs canviar la configuració de Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Una aplicació vol activar el Bluetooth i fer que el telèfon sigui visible per a la resta de dispositius. Més endavant podràs canviar la configuració de Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"S\'està activant el Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"S\'està desactivant Bluetooth??"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Connexió automàtica"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador utilitza un servidor intermediari HTTP, però pot ser que la resta d\'aplicacions no."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicació:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID veí:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informació mòbil:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Intents de dades:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Servei GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinerància:"</string>
@@ -259,33 +267,35 @@
     <string name="settings_shortcut" msgid="3936651951364030415">"Drecera de configuració"</string>
     <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">"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="wireless_networks_settings_title" msgid="3643009077742794212">"Connexions sense fil i xarxes"</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">"Connecta\'t als serveis de dades en itinerància"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"Connecta\'t als serveis de dades en itinerància"</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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Heu perdut la connectivitat de dades perquè heu abandonat la xarxa local amb la itinerància de dades desactivada."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Activa-la"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Si permets la itinerància de dades, els costos poden ser elevats."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Si permets la itinerància de dades, és possible que se t\'apliquin càrrecs per itinerància significatius.\n\nAquesta configuració afecta tots els usuaris de la tauleta."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Si permets la itinerància de dades, és possible que se t\'apliquin càrrecs per itinerància significatius.\n\nAquesta configuració afecta tots els usuaris del telèfon."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Vols permetre la itinerància de dades?"</string>
     <string name="networks" msgid="6333316876545927039">"Selecció d\'operador"</string>
     <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>
     <string name="zone_auto" msgid="334783869352026648">"Zona horària automàtica"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Utilitza la zona horària proporcionada per la xarxa"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Utilitza la zona horària proporcionada per la xarxa"</string>
-    <string name="date_time_24hour" msgid="1193032284921000063">"Utilitza el format de 24 hores"</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">"Seleccioneu 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">"Tria el format de 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>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Informació de propietari"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -304,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_summary" product="tablet" msgid="6291564408810586">"Demana un PIN numèric o una contrasenya per desencriptar la tauleta cada vegada que l\'engeguis"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Demana un PIN numèric o una contrasenya per desencriptar el telèfon cada vegada que l\'engeguis"</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\nEl 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\nEl 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>
@@ -325,10 +339,10 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Torna-ho a provar d\'aquí a <xliff:g id="DELAY">^1</xliff:g> segons."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Escriu la contrasenya"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"S\'ha produït un error en encriptar"</string>
-    <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_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\nPer 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\nPer 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>
@@ -337,7 +351,7 @@
     <string name="unlock_backup_info_summary" msgid="108524727803788172">"Si Desbloqueig facial no pot veure\'t, com vols desbloquejar?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Cap"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
-    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Diapositiva"</string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Lliscar"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"No hi ha seguretat"</string>
     <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Desbloqueig facial"</string>
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Nivell de seguretat baix, experimental"</string>
@@ -349,7 +363,7 @@
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Nivell de seguretat alt"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Desactivada per administrador, política d\'encriptació o emmagatzematge de credencials"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Cap"</string>
-    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Diapositiva"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Lliscar"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Desbloqueig facial"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Patró"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Canvia el PIN de desbloqueig"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Canvia la contrasenya de desbloqueig"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"La contrasenya ha de tenir almenys %d caràcters"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"El PIN ha de tenir almenys %d caràcters"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"El PIN ha de tenir almenys %d dígits"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Quan estiguis, toca \"Continua\""</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continua"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"La contrasenya ha de tenir menys de <xliff:g id="NUMBER">%d</xliff:g> caràcters."</string>
@@ -403,9 +417,18 @@
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancel·la"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Següent"</string>
     <string name="lock_setup" msgid="3355847066343753943">"S\'ha completat la configuració."</string>
-    <string name="device_admin_title" msgid="3562216873644263804">"Administració del dispositiu"</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="device_admin_title" msgid="3562216873644263804">"Administració de dispositius"</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>
@@ -469,75 +492,109 @@
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"No està connectat al servidor de transferència de fitxers"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connectat a dispositiu d\'entrada"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connectat al dispositiu per a accés a Internet"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Compartint la connexió local a Internet amb el dispositiu"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"S\'està compartint la connexió a Internet amb el dispositiu"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilitza per a l\'àudio del mitjà"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilitza-ho per a l\'àudio del telèfon"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilitza per a la transferència de fitxers"</string>
     <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilitza per a entrada"</string>
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilitza\'l per a l\'accés a Internet"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Configuració de la base"</string>
-    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Utilitza la base per a l\'àudio"</string>
+    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Ús del connector per a l\'àudio"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Com a telèfon amb altaveu"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per a música i contingut multimèdia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recorda la configuració"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Pantalles sincronitzades"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dispositius disponibles"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"S\'està connectant"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Connectada"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponible"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"En ús"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Mostra la configuració"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Vols desconnectar-te?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Això posarà fi a la teva connexió amb:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Opcions de la pantalla sense fils"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Oblida"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Fet"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Nom"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Activada"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Desactivada"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Desactivada"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permet l\'intercanvi de dades quan el telèfon toqui un altre dispositiu"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permet l\'intercanvi de dades quan la tauleta toqui un altre dispositiu"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permet l\'intercanvi de dades quan el telèfon toqui un altre dispositiu"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Preparat per transmetre el contingut de l\'aplicació mitjançant NFC"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Preparat per compartir contingut d\'aplicacions mitjançant NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desactivada"</string>
-    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"No disponible perquè NFC està desactivada"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"No disponible perquè la funció NFC està desactivada"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Quan aquesta funció està activada, pots transferir contingut d\'aplicacions a un altre dispositiu habilitat per a NFC si els col·loques l\'un a prop de l\'altre. Per exemple, pots transferir pàgines del navegador, vídeos de YouTube, contactes de persones 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. L\'aplicació determina què es transfereix."</string>
+    <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\nCol·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">"Evita les males connexions"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"No facis servir una xarxa Wi-Fi tret que tingui una bona connexió a Internet"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Mantén la Wi-Fi durant el repòs"</string>
+    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Només connexions estables"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"No utilitzis una xarxa Wi-Fi tret que tingui una bona connexió a Internet"</string>
+    <string name="wifi_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="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_wps_pin" msgid="6426448256268695933">"Introducció de PIN de WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi directe"</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="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="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="8116564886303972764">"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_in_progress" msgid="2944576520214787628">"La configuració de WPS ja s\'està executant i pot trigar fins a dos minuts a completar-se"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"La configuració de seguretat de l\'encaminador sense fils (TKIP) no és compatible"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Error d\'autenticació. Torna-ho a provar."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"S\'ha detectat una altra sessió de WPS. Torna-ho a provar d\'aquí a una estona."</string>
     <string name="wifi_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>
@@ -564,19 +621,30 @@
     <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\nVols 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">"Oblida"</string>
+    <string name="wifi_forget" msgid="8168174695608386644">"Esborra"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"No s\'ha pogut oblidar la xarxa"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Desa"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"No s\'ha pogut desar la xarxa"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancel·la"</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_skip_anyway" msgid="6965361454438011190">"Omet de totes maneres"</string>
+    <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\nLa 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\nLa configuració del telèfon pot necessitar una gran quantitat d\'activitat de xarxa."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"S\'està cercant..."</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Canvia el nom del dispositiu"</string>
-    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Dispositius homòlegs"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Altres dispositius"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Grups recordats"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"No s\'ha pogut connectar."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"S\'ha produït un error en canviar el nom del dispositiu."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Vols desconnectar?"</string>
@@ -602,36 +671,39 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Si et desconnectes, finalitzarà la teva connexió amb <xliff:g id="PEER_NAME">%1$s</xliff:g> i amb <xliff:g id="PEER_COUNT">%2$s</xliff:g> dispositius més."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Punt de connexió Wi-fi portàtil"</string>
-    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Punt de connexió portàtil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> actiu"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error de punt de connexió 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">"Punt de connexió 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_p2p_delete_group_message" msgid="834559380069647086">"Vols oblidar aquest grup?"</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="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">"Visualització"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"So"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"To del telèfon"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
-    <string name="all_volume_title" msgid="4296957391257836961">"Volums"</string>
+    <string name="all_volume_title" msgid="4296957391257836961">"Volum"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efectes musicals"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volum del timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibra quan estigui en silenci"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Notificació predeterminada"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Llum de notificació d\'impulsos"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"So de notificació predeterminat"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Llum de notificació"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"To"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificació"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilitza el volum de trucada entrant per a les notificacions"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Tria un to de notificació"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"So de notificació predeterminat"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Multimèdia"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Defineix el volum de la música i els vídeos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarma"</string>
-    <string name="dock_settings_summary" msgid="455802113668982481">"Configuració d\'àudio per a la base connectada"</string>
+    <string name="dock_settings_summary" msgid="455802113668982481">"Configuració d\'àudio del connector adjunt"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"So en marcar el número"</string>
-    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Toca sons"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"So en tocar"</string>
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"So de bloqueig de pantalla"</string>
-    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibració en contacte"</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>
@@ -639,28 +711,28 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Silencia la música i altres fitxers multimèdia"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Silencia les notificacions"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Silencia les alarmes"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibra quan soni"</string>
-    <string name="dock_settings" msgid="1820107306693002541">"Base"</string>
-    <string name="dock_settings_title" msgid="9161438664257429372">"Configuració de la base"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar en sonar"</string>
+    <string name="dock_settings" msgid="1820107306693002541">"Connector"</string>
+    <string name="dock_settings_title" msgid="9161438664257429372">"Configuració del connector"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Àudio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Configuració de la base d\'escriptori connectada"</string>
-    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Configuració de la base de cotxe connectada"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Configuració del connector del cotxe adjunt"</string>
     <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tauleta no acoblada"</string>
-    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telèfon no acoblat a la base"</string>
-    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Configuració de la base connectada"</string>
-    <string name="dock_not_found_title" msgid="3290961741828952424">"No s\'ha trobat la base"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telèfon no connectat"</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Configuració del connector adjunt"</string>
+    <string name="dock_not_found_title" msgid="3290961741828952424">"No s\'ha trobat el connector"</string>
     <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Has de connectar la tauleta abans de configurar l\'àudio de connexió."</string>
     <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Has de connectar el telèfon abans de configurar l\'àudio de connexió."</string>
-    <string name="dock_sounds_enable_title" msgid="885839627097024110">"So d\'inserció del connector"</string>
-    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reprodueix so en inserir o retirar la tauleta de la base"</string>
-    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reprodueix un so en inserir o treure el telèfon de la base"</string>
-    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"No reprodueixis so en inserir o en retirar la tauleta de la base"</string>
-    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"No reprodueixis cap so en inserir o treure el telèfon de la base"</string>
+    <string name="dock_sounds_enable_title" msgid="885839627097024110">"So en inserir el connector"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reprodueix so en inserir o retirar la tauleta del connector"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reprodueix so en inserir o treure el telèfon del connector"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"No reprodueixis so en inserir o en retirar la tauleta del connector"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"No reprodueixis cap so en inserir o treure el telèfon del connector"</string>
     <string name="account_settings" msgid="6403589284618783461">"Comptes"</string>
     <string name="search_settings" msgid="1910951467596035063">"Cerca"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gestiona la configuració i l\'historial de cerca"</string>
-    <string name="display_settings" msgid="7965901687241669598">"Visualització"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"Gira la pantalla automàticament"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Pantalla"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Pantalla giratòria"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Canvia l\'orientació automàticament en girar la tauleta"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Canvia d\'orientació automàticament en girar el telèfon"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Canvia l\'orientació automàticament en girar la tauleta"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fons de pantalla"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecciona fons de pantalla de"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Pantalla de caramel"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Es posarà en repòs quan estigui connectat a l\'alimentació elèctrica"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Desactivat"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Caramels seleccionats"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Moment de l\'activació"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'estat inactiu"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Mai"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Prova-ho!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Inicia\'l també quan estigui connectat"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Estalvi de pantalla"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Quan el dispositiu estigui en un connector o inactiu i carregant-se"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Els dos casos"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Mentre es carrega"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quan el dispositiu estigui en un connector"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desactivat"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Per comprovar què passa quan el telèfon està connectat o en mode de suspensió, activa l\'estalvi de pantalla."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quan s\'ha d\'activar"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Comença ara mateix"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Configuració"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillantor automàtica"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Mida del tipus de lletra"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Mida de la lletra"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN de la SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN incorrecte"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Els codis PIN no coincideixen"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"No es pot canviar el PIN."\n"És possible que sigui incorrecte."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"No es pot canviar el PIN.\nÉs possible que sigui incorrecte."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN de la SIM canviat correctament"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"No es pot canviar l\'estat de bloqueig de la targeta SD."\n"És possible que el PIN sigui incorrecte."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"No es pot canviar l\'estat de bloqueig de la targeta SD.\nÉs possible que el PIN sigui incorrecte."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"D\'acord"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancel·la"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estat de la tauleta"</string>
@@ -714,8 +787,9 @@
     <string name="model_number" msgid="3765737700545384794">"Número de model"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"Id. de l\'equip"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Versió de banda base"</string>
-    <string name="kernel_version" msgid="9192574954196167602">"Versió de nucli"</string>
+    <string name="kernel_version" msgid="9192574954196167602">"Versió del kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Número de compilació"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Estat de SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"No disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estat"</string>
     <string name="device_status" msgid="607405385799807324">"Estat"</string>
@@ -733,12 +807,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>
+    <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>
@@ -748,14 +823,16 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Emmagatzematge USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Targeta SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"Disponible"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Disponible (només de lectura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espai total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"S\'està calculant..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicacions (dades d\'apl. i contingut multimèdia)"</string>
+    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicacions (dades aplicacions i contingut multimèdia)"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multimèdia"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Baixades"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imatges, vídeos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Àudio (música, tons, podcasts, etc.)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"Varis"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"Diversos"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Dades emmagatzemades a la memòria cau"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desactiva emmagatzematge"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desactiva la targeta SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desactiva emmagatzematge USB intern"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Esborra la targeta SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Esborra totes les dades de l\'emmagatzematge USB intern, com música i fotos."</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Esborra totes les dades de la targeta SD, com ara la música i les fotos"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Només de lectura)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Vols esborrar dades emmagatzemades a la memòria cau?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"S\'esborraran les dades de les aplicacions a la memòria cau."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"La funció MTP o PTP està activa"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Vols desactivar l\'emmagatzematge USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Vols desactivar la targeta SD?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Si desactives l\'emmagatzematge USB, algunes aplicacions que estàs utilitzant s\'aturaran i és possible que no estiguin disponibles fins que tornis a activar-lo."</string>
@@ -785,14 +864,15 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desactivació en procés"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"S\'està acabant l\'espai d\'emmag."</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"És possible que algunes funcions del sistema, com ara la sincronització, no funcionin bé. Prova d\'alliberar espai: suprimeix o desfixa elements, com ara aplicacions o contingut multimèdia."</string>
-    <string name="storage_menu_usb" msgid="5708207885333243384">"Connexió USB de l\'equip"</string>
-    <string name="storage_title_usb" msgid="679612779321689418">"Connexió USB de l\'equip"</string>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Connexió USB a l\'ordinador"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Connexió USB a l\'ordinador"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Connexió com a"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositiu multimèdia (MTP)"</string>
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Et permet transferir fitxers multimèdia a Windows o utilitzant l\'aplicació de transferència de fitxers d\'Android a Mac (consulta www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Càmera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Et permet transferir fotos amb programari de la càmera i transferir qualsevol fitxer en els equips que no són compatibles amb MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instal·la eines de transferència de fitxers"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Altres usuaris"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estat de la bateria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivell de la bateria"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -822,6 +902,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>
@@ -834,12 +916,12 @@
     <string name="restore_default_apn" msgid="8178010218751639581">"S\'està restaurant la configuració predeterminada d\'APN."</string>
     <string name="menu_restore" msgid="8260067415075573273">"Restableix al valor predeterminat"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"S\'ha completat el restabliment de configuració predeterminada d\'APN."</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"Restabliment de dades de fàbrica"</string>
+    <string name="master_clear_title" msgid="5907939616087039756">"Restableix dades de fàbrica"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Esborra totes les dades de la tauleta"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Esborra totes les dades del telèfon"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" de la teva tauleta, 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, 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_accounts" product="default" msgid="6412857499147999073">\n\n"Actualment has iniciat la sessió als comptes següents:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" de la tauleta, és a dir:\n\n"<li>"El teu compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" del teu telèfon, és a dir:\n\n"<li>"El teu compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualment has iniciat la sessió als comptes següents:\n"</string>
     <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>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Si vols suprimir música, imatges i altres dades de l\'usuari, cal que esborris la "<b>"targeta SD"</b>"."</string>
@@ -854,7 +936,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>
@@ -871,36 +953,41 @@
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Has de dibuixar el teu patró de desbloqueig per confirmar que vols esborrar la targeta SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Configuració de trucada"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configura la bústia, la desviació de trucades, les trucades en espera i l\'identificador"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Connexió compart. per USB"</string>
-    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Punt de connexió portàtil"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Connex. compar. Bluetooth"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Connexió compartida"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Connex. comp. i punt accés"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Ancoratge d\'USB"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Zona Wi-Fi portàtil"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Ancoratge de Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Ancoratge a xarxa"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Ancoratge a la xarxa i zona Wi-Fi"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"Ancoratge a la xarxa d\'USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB connectat, marqueu-ho per ancorar a la xarxa"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"Ancoratge d\'USB"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB connectat, sense ancoratge a la xarxa"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Ancorat a la xarxa"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"No es pot connectar si l\'emmagatzematge USB està en ús"</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"No es pot fer l\'ancoratge a la xarxa si l\'emmagatzematge USB està en ús"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB no connectat"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Error d\'ancoratge a la xarxa USB"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Connex. compar. Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"S\'està compartint la connexió a Internet"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Error d\'ancoratge d\'USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Ancoratge de Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Compartint la connexió a Internet de la tauleta"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Compartint la connexió a Internet del telèfon"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Compartint la connexió a Internet de la tauleta amb 1 disp."</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Compartint la connexió a Internet del telèfon amb 1 disp."</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Compartint la connexió a Internet amb <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositius"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Compartint la connexió a Internet de la tauleta amb 1 dispositiu"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Compartint la connexió a Internet del telèfon amb 1 dispositiu"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"S\'està compartint la connexió a Internet d\'aquesta tauleta amb <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositius"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Compartint la connexió a Internet amb <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> dispositius"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"No s\'està compartint la connexió a Internet"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"No s\'està compartint la connexió a Internet"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Sense connexió"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"No es comparteix la connexió a Internet d\'aquesta tauleta"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"No es comparteix la connexió a Internet d\'aquest telèfon"</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"No ancorat"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="6285122039489881969">"No es poden ancorar a la xarxa més de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositius."</string>
-    <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> no compartirà connexió."</string>
+    <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Es desactivarà l\'ancoratge de xarxa de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Xarxes mòbils"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Gestiona el pla per a mòbils"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operador de SIM desconegut"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s no té cap lloc web d\'administració conegut"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insereix la targeta SIM i reinicia"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Connecta a Internet"</string>
     <string name="location_title" msgid="1029961368397484576">"La meva ubicació"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"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ó per fer una estimació més ràpida de la teva ubicació. Es recopilaran dades 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_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="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>
@@ -909,14 +996,15 @@
     <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>
     <string name="about_settings_summary" msgid="3371517697156165959">"Mostra informació legal, estat, versió de programari"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informació legal"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Col·laboradors"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Informació de regulació"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Llicència"</string>
     <string name="terms_title" msgid="7697580845616764642">"Condicions d\'ús"</string>
@@ -930,7 +1018,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>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Canvia el PIN de desbloqueig"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmeu el patró desat"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Torna-ho a provar:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dibuixeu un perfil de desbloqueig"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Dibuixa un patró de desbloqueig:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Premeu Menú per obtenir ajuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Solteu el dit en acabar."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Connecteu <xliff:g id="NUMBER">%d</xliff:g> punts com a mínim. Torneu-ho a provar:"</string>
@@ -958,20 +1046,15 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Patró de desbloqueig"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Requereix un patró"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Cal dibuixar el patró per desbloquejar la pantalla"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Fes que la plantilla sigui visible"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibració en contacte"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"El botó d\'encesa es bloqueja a l\'instant"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Mostra el patró"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrar en tocar"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Bloqueja en engegar"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Defineix el patró de desbloqueig"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Canvia el patró de desbloqueig"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Com dibuixar un patró de desbloqueig"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Massa intents incorrectes"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Torneu-ho a provar d\'aquí a <xliff:g id="NUMBER">%d</xliff:g> segons."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Cancel·la"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Següent"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Seguretat de la tauleta"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Protecció del telèfon"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protegeix la tauleta de l\'ús no autoritzat: crea un patró personal de desbloqueig de la pantalla. Fes lliscar el dit per connectar els punts en l\'ordre que vulguis a la pantalla següent. Has de connectar un mínim de quatre punts. "\n\n"Estàs preparat per començar? Toca Següent."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protegeix el telèfon de l\'ús no autoritzat: crea un patró personal de desbloqueig de la pantalla. Fes lliscar el dit per connectar quatre punts com a mínim en l\'ordre que vulguis a la pantalla següent. "\n\n"Estàs preparat per començar? Toca Següent."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"L\'aplicació no està instal·lada al telèfon."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestiona les aplicacions"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestiona i elimina les aplicacions instal·lades"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplicacions"</string>
@@ -980,12 +1063,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 rebre atacs d\'aplicacions d\'origen desconegut. Acceptes que ets l\'única persona responsable per qualsevol dany que es produeixi al telèfon o per qualsevol pèrdua de dades que pugui produir-se com a conseqüència de 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 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 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>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dades de l\'emmagatzematge USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Targeta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstal·la"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Desinstal·la per a tots els usuaris"</string>
+    <string name="install_text" msgid="884360662922471113">"Instal·la"</string>
     <string name="disable_text" msgid="6544054052049395202">"Desactiva"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activa"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Esborra les dades"</string>
@@ -1017,19 +1104,21 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordena per mida"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Mostra els serveis que s\'estan executant"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostra processos cau"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"Restableix prefer. aplic."</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Restableix preferències"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vols rest. pref. aplic.?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Es restabliran totes les preferències per a:"\n\n" "<li>"Aplicacions desactivades"</li>\n" "<li>"Notificacions de l\'aplicació desactivades"</li>\n" "<li>"Aplicacions predeterminades per a accions"</li>\n" "<li>"Restriccions de dades de fons per a les aplicacions"</li>\n\n" No perdràs cap dada de l\'aplicació."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Es restabliran totes les preferències per a:\n\n "<li>"Aplicacions desactivades"</li>\n" "<li>"Notificacions de l\'aplicació desactivades"</li>\n" "<li>"Aplicacions predeterminades per a accions"</li>\n" "<li>"Restriccions de dades en segon pla per a aplicacions"</li>\n\n" No perdràs les dades de les aplicacions."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Restableix les aplicac."</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gestiona l\'espai"</string>
     <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_third_party" msgid="7786348047690140979">"S\'ha baixat"</string>
-    <string name="filter_apps_running" msgid="7767071454371350486">"S\'està executant"</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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"A la targeta SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Desactivada"</string>
+    <string name="not_installed" msgid="1475144352069281880">"No instal·lada"</string>
     <string name="no_applications" msgid="7336588977497084921">"No hi ha aplicacions."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Emmagatzematge intern"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Emmagatzematge USB"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> i <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Pot ser que aquesta aplicació comporti càrrecs:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Envia SMS prèmium"</string>
     <string name="computing_size" msgid="1599186977475211186">"S\'està calculant..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"No s\'ha pogut calcular la mida del paquet."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"No tens cap aplicació de tercers instal·lada."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Canvia la ubicació d\'instal·lació preferida per a les aplicacions noves"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Vols desact. aplic. integr.?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Si desactives una aplicació integrada, és possible que altres aplicacions no funcionin correctament."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Vols suprimir les dades i desactivar l\'aplicació?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Usuari: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"S\'ha eliminat l\'usuari"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procés i <xliff:g id="NUMSERVICES">%2$d</xliff:g> servei"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procés i <xliff:g id="NUMSERVICES">%2$d</xliff:g> serveis"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processos i <xliff:g id="NUMSERVICES">%2$d</xliff:g> servei"</string>
@@ -1114,8 +1212,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"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Idioma i entrada"</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>
@@ -1127,9 +1225,8 @@
     <string name="auto_punctuate" msgid="4595367243950425833">"Puntuació automàtica"</string>
     <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">"Fes que les contrasenyes siguin visibles"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></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="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 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>
@@ -1144,12 +1241,10 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Per canviar, prem Ctrl + barra espaiadora"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predeterminat"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Disposicions de teclat"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diccionari de l\'usuari"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Diccionari personal"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Diccionaris personals"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Diccionari personal"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Afegeix"</string>
-    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Addició al diccionari"</string>
+    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Afegir al diccionari"</string>
     <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"Frase"</string>
     <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Més opcions"</string>
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Menys opcions"</string>
@@ -1157,10 +1252,12 @@
     <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>
-    <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"No tens cap paraula al diccionari de l\'usuari. Pots afegir una paraula si toques el botó Afegeix ( + )."</string>
+    <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"No tens cap paraula al diccionari de l\'usuari. Per afegir una paraula, toca el botó Afegeix ( + )."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Per a tots els idiomes"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Més idiomes..."</string>
     <string name="testing" msgid="6584352735303604146">"Proves"</string>
@@ -1178,8 +1275,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>
@@ -1197,24 +1294,38 @@
     <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="enable_adb" msgid="7982306934419797485">"Depuració d\'USB"</string>
-    <string name="enable_adb_summary" msgid="4881186971746056635">"Mode de depuració quan l\'USB està connectat"</string>
-    <string name="keep_screen_on" msgid="1146389631208760344">"Mantén-te activat"</string>
-    <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla no se suspendrà mai mentre s\'estigui carregant"</string>
-    <string name="allow_mock_location" msgid="2787962564578664888">"Permet les ubicacions fictícies"</string>
-    <string name="allow_mock_location_summary" msgid="317615105156345626">"Permet les ubicacions fictícies"</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">"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="bt_hci_snoop_log" msgid="3340699311158865670">"Activa el registre de cerca HCI de Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Captura tots els paquets HCI de Bluetooth en un fitxer"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Selecciona temps execució"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Selecciona temps execució"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Vols tornar a iniciar per canviar el temps d\'execució de <xliff:g id="OLD">%1$s</xliff:g> a <xliff:g id="NEW">%2$s</xliff:g>?"</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 finalitat de la depuració d\'USB és només el desenvolupament. Fes-la servir per copiar dades entre l\'equip i el dispositiu, per instal·lar aplicacions al dispositiu sense notificacions i per llegir les dades del 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="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protecció de l\'emmagatz. 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="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\'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>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Si la targeta SD està protegida, 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_confirm_message" product="default" msgid="3858482712337574407">"Si la targeta SD està protegida, 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="enable_terminal_title" msgid="95572094356054120">"Terminal local"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Activa l\'aplicació de terminal que ofereix accés al shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Selecció de gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Selecció de widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vols crear el widget i permetre l\'accés?"</string>
@@ -1234,79 +1345,95 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configuració d\'accessibilitat"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Serveis"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Text gran"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"El botó d\'engegada finalitza la trucada"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Pronuncia contrasenyes"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Retard de Toca i mantén premut"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Millora l\'accessibilitat web"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gestos d\'ampliació"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Quan aquesta funció està activada, pots ampliar o allunyar si piques tres cops la pantalla.\n\nQuan ampliïs, pots fer el següent.\n"<ul><li>"Panoràmica: arrossega dos dits o més per la pantalla."</li>\n<li>"Ajustar el nivell de zoom: apropa dos o més dits o bé separa\'ls."</li></ul>\n\n"També pots ampliar de manera temporal el que tinguis a sota del dit si piques tres cops i mantens premut. En aquest estat ampliat, pots arrossegar el dit per explorar diverses parts de la pantalla. Aixeca el dit per tornar a l\'estat previ.\n\nNota: Pica tres cops per ampliar a tot arreu tret de la barra de navegació i el teclat."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Drecera d\'accessibilitat"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Activada"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desactiva"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Quan aquesta funció està activada, pots activar ràpidament les funcions d\'accessibilitat en dos passos.\n\nPas 1: mantén premut el botó d\'engegada fins que sentis un so o notis una vibració.\n\nPas 2: mantén premut amb dos dits fins que sentis una confirmació d\'àudio.\n\nSi el dispositiu té diversos usuaris, fer servir aquesta drecera a la pantalla de bloqueig activa temporalment l\'accessibilitat fins que es desbloqueja el dispositiu."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Text gran"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ampliació de pantalla"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualitza ampliació automàticament"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Actualitza augment pantalla a transicions aplic."</string>
+    <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_menu_item_settings" msgid="3344942964710773365">"Configuració"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Activat"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Desactivat"</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_on" msgid="2864292320042673806">"Activada"</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 que faran que el seu contingut sigui més accessible?"</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="print_settings" msgid="4742428530112487843">"Impressió"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Configuració d\'impressió"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Serveis"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vols fer servir <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> pot rebre els documents que imprimeixis. És possible que aquests documents continguin dades confidencials."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"No hi ha cap servei instal·lat"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Configuració"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Afegeix impressores"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Activat"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Desactivat"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Elements que han utilitzat la bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Dades d\'ús de bateria no disp."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Ús de la bateria des que s\'ha desconnectat"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Ús de la bateria des que s\'ha restablert"</string>
-    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> a la bateria"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> de bateria"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> des de la desconnexió"</string>
     <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>
     <string name="details_subtitle" msgid="32593908269911734">"Detalls d\'ús"</string>
-    <string name="controls_subtitle" msgid="390468421138288702">"Ajusta l\'ús d\'energia"</string>
+    <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">"Espera de cel·la"</string>
+    <string name="power_cell" msgid="6596471490976003056">"Dispositiu inactiu"</string>
     <string name="power_phone" msgid="5392641106474567277">"Trucades de veu"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tauleta inactiva"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telèfon inactiu"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total de CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer pla de la CPU"</string>
-    <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantenir despert"</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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Dades rebudes"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"S\'han enviat les dades mòbils"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"S\'han rebut les dades mòbils"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"S\'han enviat les dades Wi‑Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"S\'han rebut les dades Wi‑Fi"</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">"Temps activat"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Temps d\'activació"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Temps sense senyal"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Força l\'aturada"</string>
     <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>
@@ -1315,8 +1442,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>
@@ -1324,11 +1451,12 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Atura o desinstal·la l\'aplicació"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Controla el GPS manualment per evitar que les aplicacions el facin servir"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"L\'aplicació pot oferir paràmetres per reduir l\'ús de la bateria"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Bateria utilitzada per l\'usuari"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> des de la desconnexió"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Mentre es va desconnectar per darrera vegada durant <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Totals d\'ús"</string>
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Actualitza"</string>
-    <string name="process_kernel_label" msgid="3916858646836739323">"SO Android"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor multimèdia"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Entrada i sortida de veu"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configuració d\'entrada i sortida de veu"</string>
@@ -1350,17 +1478,19 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"To"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta el to del text parlat"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"No has seleccionat cap idioma"</string>
     <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">"Escolteu un exemple"</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>
@@ -1378,18 +1508,35 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Brillantor: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automàtica"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"completa"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"mitjà"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"desactivada"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Emmagatzematge de credencials"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instal·la des de l\'emmagatzematge"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instal·la des de la targeta SD"</string>
     <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 les credencials"</string>
-    <string name="credentials_reset_summary" msgid="3369361230171260282">"Elimina tots els certificats"</string>
-    <string name="trusted_credentials" msgid="4266945289534242402">"Credencials de confiança"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Esborra 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>
@@ -1406,28 +1553,25 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Has d\'establir un PIN o una contrasenya a la pantalla de bloqueig per poder fer servir l\'emmagatzematge de credencials."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"To d\'emergència"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Defineix el comportament quan es fa una trucada d\'emergència"</string>
-    <string name="privacy_settings" msgid="5446972770562918934">"Còpia de seguretat i restabliment"</string>
-    <string name="privacy_settings_title" msgid="4856282165773594890">"Còpia de seguretat i restabliment"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Còpia de seguretat i restauració"</string>
+    <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">"Fes una còpia de seguretat de les dades"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Fes una còpia de seguretat de les dades d\'aplicacions, de les contrasenyes Wi-Fi i d\'altres dades de configuració als servidors de Google"</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 de les quals s\'hagi fet una còpia de seguretat"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Agafa l\'informe d\'errors"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Recopilarà informació sobre l\'estat actual del dispositiu per enviar-la com a missatge de correu electrònic. Passarà un cert temps a partir del moment en què comenci a elaborar-se l\'informe d\'errors fins que no estigui llest per enviar; tingues paciència."</string>
-    <string name="report" msgid="302437572240018342">"Crea l\'informe"</string>
-    <string name="local_backup_password_title" msgid="3860471654439418822">"Contrasenya per a còpia de seguretat d\'escriptori"</string>
-    <string name="local_backup_password_summary_none" msgid="393503434408227110">"Actualment les còpies de seguretat d\'escriptori 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\'escriptori completes"</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 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, dels marcadors i d\'altres paràmetres i de les dades d\'aplicacions i, a més, esborrar totes les còpies que n\'hi hagi als servidors de Google?"</string>
-    <string name="device_admin_settings_title" msgid="1335557832906433309">"Configuració de l\'administració del dispositiu"</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>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administradors del dispositiu"</string>
@@ -1440,12 +1584,12 @@
     <string name="untitled_apn" msgid="1230060359198685513">"Sense títol"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"General"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notificacions"</string>
-    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"To i vibració de trucada"</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>
@@ -1455,7 +1599,7 @@
     <string name="wifi_setup_back" msgid="144777383739164044">"Enrere"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"Detalls de la xarxa"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"Connecta"</string>
-    <string name="wifi_setup_forget" msgid="2562847595567347526">"Oblida-ho"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Esborra"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"Desa"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"Cancel·la"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"S\'estan escanejant les xarxes..."</string>
@@ -1467,9 +1611,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; 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\nToca "<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>
@@ -1478,18 +1622,18 @@
     <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>
-    <string name="settings_backup_summary" msgid="7916877705938054035">"Fes una còpia de seguretat de la configuració"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"Còpia de seguretat de la configuració"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sincronitza ara"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Cancel·la la sincronització"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Toca per sincronitzar ara <xliff:g id="LAST_SYNC_TIME">
@@ -1497,87 +1641,92 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Calendari"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Contactes"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Benvingut a Google Sync!"</font>" "\n"La sincronització de dades que ha ideat Google per permetre l\'accés als contactes, a les cites i a molts més elements des de qualsevol lloc."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Et donem la benvinguda a Google Sync!"</font>" \nLa sincronització de dades que ha ideat Google per permetre l\'accés als contactes, a les cites i a molts més elements des de qualsevol lloc."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Configuració de la sincronització d\'aplicacions"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dades i sincronització"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Canvia la contrasenya"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"Configuració del compte"</string>
     <string name="remove_account_label" msgid="5921986026504804119">"Elimina el compte"</string>
-    <string name="header_add_an_account" msgid="756108499532023798">"Addició d\'un compte"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Afegeix un compte"</string>
     <string name="finish_button_label" msgid="481587707657751116">"Finalitza"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"Vols eliminar un compte?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Si elimines aquest compte, se\'n suprimiran tots els missatges, els contactes i les altres dades de la tauleta."</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Si elimines aquest compte, se\'n suprimiran tots els missatges, els contactes i les altres dades del telèfon."</string>
-    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Hi ha aplicacions que requereixen aquest compte. Només pots eliminar-lo si restableixes la tauleta a la configuració de fàbrica predeterminada (la qual cosa suprimirà totes les teves dades personals) a Configuració &gt; Còpia de seguretat i restabliment."</string>
-    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Hi ha aplicacions que requereixen aquest compte. Només pots eliminar-lo si restableixes el telèfon a la configuració de fàbrica predeterminada (la qual cosa suprimirà totes les teves dades personals) a Configuració &gt; Còpia de seguretat i restabliment."</string>
+    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Hi ha aplicacions que requereixen aquest compte. Només pots eliminar-lo si restableixes la tauleta a la configuració de fàbrica predeterminada (la qual cosa suprimirà totes les teves dades personals) a Configuració &gt; Còpia de seguretat i restauració."</string>
+    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Hi ha aplicacions que requereixen aquest compte. Només pots eliminar-lo si restableixes el telèfon a la configuració de fàbrica predeterminada (la qual cosa suprimirà totes les teves dades personals) a Configuració &gt; Còpia de seguretat i restauració."</string>
     <string name="provider_label" msgid="7724593781904508866">"Subscripcions de tramesa automàtica"</string>
     <!-- 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>
     <string name="enter_password" msgid="4131758584074246224">"Escriu la contrasenya per desxifrar l\'emmagatzematge"</string>
     <string name="try_again" msgid="4272075051293936921">"Torna-ho a provar."</string>
     <string name="delete" msgid="4219243412325163003">"Suprimeix"</string>
-    <string name="misc_files" msgid="6720680815969643497">"Fitxers varis"</string>
+    <string name="misc_files" msgid="6720680815969643497">"Fitxers diversos"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"s\'han seleccionat <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Selecciona-ho tot"</string>
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Comprovació HDCP"</string>
-    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Defineix comport. comprov. HDCP"</string>
+    <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Defineix comprovació HDCP"</string>
     <string name="debug_debugging_category" msgid="6781250159513471316">"Depuració"</string>
-    <string name="debug_app" msgid="8349591734751384446">"Selecciona l\'aplicació per depurar"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Aplicació per depurar"</string>
     <string name="debug_app_not_set" msgid="718752499586403499">"No s\'ha definit cap aplicació per depurar"</string>
     <string name="debug_app_set" msgid="2063077997870280017">"Aplicació per depurar: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="select_application" msgid="5156029161289091703">"Selecció de l\'aplicació"</string>
     <string name="no_application" msgid="2813387563129153880">"Cap"</string>
     <string name="wait_for_debugger" msgid="1202370874528893091">"Espera el depurador"</string>
-    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Apl. depuració espera que s\'adjunti la depuració abans d\'exec."</string>
+    <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">"Centelleig en pant. quan aplicacions fan operacions llargues a fil princ."</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">"Superposició de pantalla mostra dades actuals toc"</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 comentaris visuals per tocs"</string>
-    <string name="show_screen_updates" msgid="5470814345876056420">"Mostra actual. superfície"</string>
-    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Flash a superf. de finestres sencer. en act."</string>
-    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Mostra act. vis. de GPU"</string>
-    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash visual. dins de finestres en pres. amb GPU"</string>
-    <string name="disable_overlays" msgid="2074488440505934665">"Desact. superposicions HW"</string>
-    <string name="disable_overlays_summary" msgid="3578941133710758592">"Usa sempre GPU per a la composició de la pantalla"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Activa les traces"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Selecc. traces activades"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Actualment no hi ha cap traça activada"</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="debug_layout" msgid="5981361776594526155">"Mostra límits de format"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Mostra la ubicació dels tocs a la pantalla"</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">"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>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Depura modificacions GPU"</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_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">"Superposició de pantalla mostra ús actual de CPU"</string>
-    <string name="force_hw_ui" msgid="6426383462520888732">"Força representac. GPU"</string>
-    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Força l\'ús de GPU per a la 2a presentació"</string>
-    <string name="track_frame_time" msgid="6146354853663863443">"Perfil representació GPU"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Mesura temps repres. a adb shell dumpsys gfxinfo"</string>
-    <string name="window_animation_scale_title" msgid="6162587588166114700">"Finestra escala animació"</string>
-    <string name="transition_animation_scale_title" msgid="387527540523595875">"Transició escala animació"</string>
-    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Escala durada d\'animació"</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  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 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">"No conservis les activitats"</string>
-    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destrueix activitats tan aviat com usuari en surt"</string>
-    <string name="app_process_limit_title" msgid="4280600650253107163">"Límit de processos en segon pla"</string>
-    <string name="show_all_anrs" msgid="28462979638729082">"Mostra totes les ANR"</string>
-    <string name="show_all_anrs_summary" msgid="641908614413544127">"Mostra el diàleg L\'aplicació no respon per a les aplicacions de fons"</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">"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 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>
@@ -1585,14 +1734,14 @@
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Dia del mes per restablir el cicle d\'ús de dades:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"Cap aplic. ha util. dades durant el període."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Primer pla"</string>
-    <string name="data_usage_label_background" msgid="3225844085975764519">"Fons"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Segon pla"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"restringit"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Vols desactivar les dades mòbils?"</string>
     <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>
@@ -1603,15 +1752,15 @@
     <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 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_auto_sync_on_dialog_title" msgid="2438617846762244389">"Activar sincronit. autom. dades?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Els canvis que facis als teus comptes al web es copiaran automàticament a la tauleta."\n\n"És possible que alguns comptes també copiïn els canvis de la tauleta al web. Un compte de Google funciona així."\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 copiaran automàticament al telèfon."\n\n"És possible que alguns comptes també copiïn els canvis del telèfon al web. Un compte de Google funciona així."\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_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\nPots 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\nAlguns comptes com ara els comptes de Google també reflectiran al web els canvis que facis a la tauleta.\n\nPer 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\nAlguns comptes, com ara els comptes de Google, també reflectiran al web els canvis que hagis fet al telèfon.\n\nPer 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_off_dialog_title" msgid="9013139130490125793">"Vols desactivar sinc. au. dades?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Es conservaran les dades i l\'ús de bateria, però hauràs de sincronitzar els comptes manualment per recopilar la informació recent. I no rebràs notificacions quan hi hagi actualitzacions."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de restabliment del cicle d\'ús"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Defineix l\'advertiment d\'ús de dades"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Defineix el límit d\'ús de dades"</string>
     <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 referència?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Si restringeixes les dades mòbils de fons, hi ha aplicacions i serveis que no funcionaran si no estàs connectat a una xarxa Wi-Fi."</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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"La teva connexió de dades mòbil es desactivarà quan s\'arribi al límit especificat.\n\nCom 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\nCom 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 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\nAquesta 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\nAquesta 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Aplicacions i usuaris eliminats"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> rebuts, <xliff:g id="SENT">%2$s</xliff:g> enviats"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: ús aproximat de <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>: ú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. Pot ser que algunes aplicacions tinguin restringit l\'ús d\'aquestes xarxes quan funcionen en segon pla. Pot ser que les aplicacions també avisin abans d\'utilitzar aquestes xarxes per a baixades 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>
@@ -1648,7 +1800,7 @@
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Certificat d\'usuari IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Certificat de CA IPSec"</string>
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Certificat de servidor IPSec"</string>
-    <string name="vpn_show_options" msgid="7182688955890457003">"Mostra les opcions avançades"</string>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Mostra opcions avançades"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Dominis de cerca DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Servidors DNS (per exemple, 8.8.8.8)"</string>
     <string name="vpn_routes" msgid="3818655448226312232">"Desviament de rutes (per exemple, 10.0.0.0/8)"</string>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Addició d\'un perfil de VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Edita el perfil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Suprimeix el perfil"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN sempre activada"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecciona un perfil de VPN per estar-hi sempre connectat. El trànsit de la xarxa només es permetrà quan estigui connectada a aquesta VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Cap"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Per tenir la VPN sempre activada cal una adreça IP per al servidor i per al DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"No hi ha cap connexió de xarxa. Torna-ho a provar més tard."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Falta un certificat. Edita el perfil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
@@ -1680,29 +1836,91 @@
     <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>
-    <string name="user_settings_title" msgid="5189224330534906766">"Usuaris i restriccions"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Usuaris"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Afegeix un usuari"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Edita els detalls"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Informació de l\'usuari"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Nom"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Restriccions de contingut"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"PIN necessari"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Classificació del contingut"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Aplicacions del sistema"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Aplicacions instal·lades"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Descarta"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Elimina l\'usuari"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Nen trapella"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Desactivat"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissiu"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"En aplicació"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Usuaris"</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="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\nQuan hagis creat un usuari nou, aquesta persona haurà de dur a terme un procés de configuració.\n\nQualsevol 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\nQualsevol 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_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_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_confirm_remove_message" msgid="5284111415714437285">"Estàs segur que vols eliminar l\'usuari i totes les dades associades del dispositiu?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Canvi del cos de lletra"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Restriccions"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Suprimeix restriccions"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Canvia el PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostra les notificacions"</string>
     <string name="help_label" msgid="1107174367904110532">"Ajuda"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Compte per al contingut"</string>
+    <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="6160672982086584261">"Defineix les restriccions d\'aplicacions"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controlades per <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Aquesta aplicació no és compatible amb perfils restringits."</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Aquesta aplicació pot accedir als teus comptes"</string>
+    <string name="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 e01d331..fda9dcd 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,16 +218,127 @@
     <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="886742181977884584">"Média"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"tlačítka médií"</item>
+    <item msgid="4547883971364273343">"zaměření zvuku"</item>
+    <item msgid="2603878814882344450">"hlavní hlasitost"</item>
+    <item msgid="7136963238377062018">"hlasitost hlasu"</item>
+    <item msgid="4270236897655923007">"hlasitost vyzvánění"</item>
+    <item msgid="6325739889222559394">"hlasitost médií"</item>
+    <item msgid="5762123934816216821">"hlasitost budíku"</item>
+    <item msgid="785049718065337473">"hlasitost oznámení"</item>
+    <item msgid="6700305533746877052">"hlasitost Bluetooth"</item>
+    <item msgid="2029227495214047094">"Zakázat režim spánku"</item>
+    <item msgid="26109888160231211">"sledovat polohu"</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>
+    <item msgid="5753789168376302997">"Tlačítka médií"</item>
+    <item msgid="3265262911688671938">"Zaměření zvuku"</item>
+    <item msgid="2098976479485046797">"Hlavní hlasitost"</item>
+    <item msgid="5660213838861789350">"Hlasitost hlasu"</item>
+    <item msgid="7983336752371254444">"Hlasitost vyzvánění"</item>
+    <item msgid="7878027809189330917">"Hlasitost médií"</item>
+    <item msgid="7260546305036218513">"Hlasitost budíku"</item>
+    <item msgid="9103719301075748925">"Hlasitost oznámení"</item>
+    <item msgid="7025966722295861512">"Hlasitost Bluetooth"</item>
+    <item msgid="4665183401128289653">"Zakázat režim spánku"</item>
+    <item msgid="8584357129746649222">"Poloha"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krátká"</item>
     <item msgid="2560532955514699713">"Střední"</item>
     <item msgid="2372711992605524591">"Dlouhá"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (režim ladění)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Použít program Dalvik"</item>
+    <item msgid="5131846588686178907">"Použít program ART"</item>
+    <item msgid="4530003713865319928">"Použít ladicí sestavení programu ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nikdy nekontrolovat"</item>
     <item msgid="6042769699089883931">"Kontrolovat jen obsah DRM"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Měřítko animace 5x"</item>
     <item msgid="1069584980746680398">"Měřítko animace 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Žádné"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi a 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Žádné"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Vypnuto"</item>
+    <item msgid="7688197031296835369">"Zobrazit překreslované oblasti"</item>
+    <item msgid="8332661909019981149">"Zobrazit počítadlo překreslení"</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>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Časový limit vypršel"</item>
     <item msgid="7664124146786465092">"Neúspěšné"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Zeptat se"</item>
+    <item msgid="5077768429488260031">"Nepovolit nikdy"</item>
+    <item msgid="1417929597727989746">"Vždy povolit"</item>
+  </string-array>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b60af8a..5333a22 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Ano"</string>
     <string name="no" msgid="6731231425810196216">"Ne"</string>
     <string name="create" msgid="3578857613172647409">"Vytvořit"</string>
+    <string name="allow" msgid="3349662621170855910">"Povolit"</string>
+    <string name="deny" msgid="6947806159746484865">"Odmítnout"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Neznámé"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Ještě <xliff:g id="STEP_COUNT">%1$d</xliff:g> klepnutí a bude z vás vývojář."</item>
+    <item quantity="other" msgid="6722953419953594148">"Ještě <xliff:g id="STEP_COUNT">%1$d</xliff:g> klepnutí a bude z vás vývojář."</item>
+  </plurals>
+    <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>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEZDRÁTOVÁ PŘIPOJENÍ A SÍTĚ"</string>
     <string name="header_category_device" msgid="5781174212691167553">"ZAŘÍZENÍ"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"OSOBNÍ"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Nabíjí se"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Vybíjí se"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(bezdrátové připojení)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Nenabíjí se"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nenabíjí se"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Plná"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Odpojeno"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"bezdrátové připojení"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Neznámé"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Neznámé"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Neznámá chyba"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Nejméně zajímavé"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Viditelné"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Viditelné pro všechna okolní zařízení Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Viditelné pro všechny okolní zařízení Bluetooth"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Neviditelné pro ostatní zařízení Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Viditelné pouze pro spárovaná zařízení"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Přepne zařízení do viditelného režimu"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Časový limit viditelnosti"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Nastavit dobu, po kterou bude zařízení ve viditelném režimu"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Uzamknout hlasové vytáčení"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zabránit použití vytáčení Bluetooth při uzamčené obrazovce"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Zařízení Bluetooth"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Zobrazit přijaté soubory"</string>
     <string name="device_picker" msgid="8398232791303186677">"Výběr zařízení Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Požadavek na povolení zařízení Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Aplikace chce zapnout připojení Bluetooth. Povolit?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Aplikace v tabletu chce nastavit tablet do viditelného režimu pro ostatní zařízení Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Povolit?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Aplikace v telefonu chce nastavit telefon do viditelného režimu pro ostatní zařízení Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Povolit?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Aplikace v tabletu chce trvale nastavit tablet do viditelného režimu pro ostatní zařízení Bluetooth. Povolit?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Aplikace v telefonu chce trvale nastavit telefon do viditelného režimu pro ostatní zařízení Bluetooth. Povolit?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Aplikace v tabletu chce zapnout připojení Bluetooth a nastavit tablet na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. do viditelného režimu. Povolit?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Aplikace v telefonu chce zapnout připojení Bluetooth a nastavit telefon do viditelného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Povolit?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Aplikace v tabletu chce zapnout Bluetooth a nastavit tablet do viditelného režimu pro ostatní zařízení. Povolit?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Aplikace v telefonu chce zapnout připojení Bluetooth a nastavit telefon do viditelného režimu. Povolit?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikace chce zapnout Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikace požaduje zviditelnění tabletu pro ostatní zařízení Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikace požaduje zviditelnění telefonu pro ostatní zařízení Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikace chce tablet zviditelnit pro ostatní zařízení Bluetooth. Toto můžete později změnit v nastavení Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Aplikace chce telefon zviditelnit pro ostatní zařízení Bluetooth. Toto můžete později změnit v nastavení Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Aplikace chce zapnout Bluetooth a na <xliff:g id="TIMEOUT">%1$d</xliff:g> s tablet zviditelnit pro ostatní zařízení."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Aplikace chce zapnout Bluetooth a na <xliff:g id="TIMEOUT">%1$d</xliff:g> s telefon zviditelnit pro ostatní zařízení."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Aplikace chce zapnout Bluetooth a zviditelnit tablet pro ostatní zařízení. Později to můžete změnit v nastavení Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Aplikace chce zapnout Bluetooth a zviditelnit telefon pro ostatní zařízení. Později to můžete změnit v nastavení Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Zapínání Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Vypínání rozhraní Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatické připojení"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Server proxy protokolu HTTP může používat prohlížeč, ale nesmí jej používat další aplikace."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Místo:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Sousední identifikátor CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokusy dat:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Služba GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Připojení datových služeb bylo přerušeno, protože jste opustili domovskou síť a máte vypnutý datový roaming."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Zapnout"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Pokud povolíte datový roaming, mohou vám být účtovány vysoké poplatky."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Pokud aktivujete datový roaming, mohou vám být za roaming účtovány nemalé poplatky.\n\nToto nastavení ovlivní všechny uživatele tohoto tabletu."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Pokud aktivujete datový roaming, mohou vám být za roaming účtovány nemalé poplatky.\n\nToto nastavení ovlivní všechny uživatele tohoto telefonu."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Povolit datový roaming?"</string>
     <string name="networks" msgid="6333316876545927039">"Výběr operátora"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Vybrat síťového operátora"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info o vlastníkovi"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Při každém zapnutí tabletu vyžadovat kód PIN nebo heslo za účelem dešifrování"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Při každém zapnutí telefonu vyžadovat kód PIN nebo heslo za účelem dešifrování"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrováno"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Účty, nastavení, stažené aplikace a jejich data, média a jiné soubory můžete zašifrovat. Po zašifrování tabletu je třeba při každém zapnutí zadat číselný kód PIN nebo heslo, kterým ho opět dešifrujete. Zašifrování tabletu lze zrušit pouze obnovením továrních dat, při kterém budou vymazána všechna vaše data."\n\n"Proces šifrování trvá hodinu i více. Začněte s nabitou baterií a ponechte tablet připojený ke zdroji napájení, dokud se šifrování nedokončí. Pokud proces šifrování přerušíte, může dojít ke ztrátě některých nebo všech vašich dat."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Účty, nastavení, stažené aplikace a jejich data, média a jiné soubory můžete zašifrovat. Po zašifrování musíte při každém zapnutí telefonu vložit číselný kód PIN nebo heslo, abyste ho opět dešifrovali. Zašifrování telefonu lze zrušit pouze obnovením továrních dat, při kterém budou vymazána všechna vaše data."\n\n"Proces zašifrování trvá hodinu i více. Začněte s nabitou baterií a ponechte telefon připojený ke zdroji napájení, dokud nebude šifrování dokončeno. Pokud proces šifrování přerušíte, může dojít ke ztrátě některých nebo všech vašich dat."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Účty, nastavení, stažené aplikace a jejich data, média a jiné soubory můžete zašifrovat. Po zašifrování tabletu je třeba při každém zapnutí zadat číselný kód PIN nebo heslo, kterým ho opět dešifrujete. Zašifrování tabletu lze zrušit pouze obnovením továrních dat, při kterém budou vymazána všechna vaše data.\n\nProces šifrování trvá hodinu i více. Začněte s nabitou baterií a ponechte tablet připojený ke zdroji napájení, dokud se šifrování nedokončí. Pokud proces šifrování přerušíte, může dojít ke ztrátě některých nebo všech vašich dat."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Účty, nastavení, stažené aplikace a jejich data, média a jiné soubory můžete zašifrovat. Po zašifrování musíte při každém zapnutí telefonu vložit číselný kód PIN nebo heslo, abyste ho opět dešifrovali. Zašifrování telefonu lze zrušit pouze obnovením továrních dat, při kterém budou vymazána všechna vaše data.\n\nProces zašifrování trvá hodinu i více. Začněte s nabitou baterií a ponechte telefon připojený ke zdroji napájení, dokud nebude šifrování dokončeno. Pokud proces šifrování přerušíte, může dojít ke ztrátě některých nebo všech vašich dat."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifrovat tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifrovat telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Nabijte baterii a zkuste to znovu."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Zkuste to znovu za: <xliff:g id="DELAY">^1</xliff:g> s."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Zadejte heslo"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifrování se nezdařilo"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifrování bylo přerušeno a nelze je dokončit. V důsledku toho již nebudou údaje v tabletu přístupné. "\n\n" Chcete-li tablet opět začít používat, je potřeba obnovit tovární nastavení. Po obnově budete moci v průběhu nastavení tabletu obnovit všechna data, která jsou zálohována v účtu Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifrování bylo přerušeno a nelze je dokončit. V důsledku toho již nebudou údaje v telefonu přístupné. "\n\n"Chcete-li telefon opět začít používat, je potřeba obnovit tovární nastavení. Po obnově budete moci v průběhu nastavení telefonu obnovit všechna data, která jsou zálohována v účtu Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifrování bylo přerušeno a nelze je dokončit. V důsledku toho již nebudou údaje v tabletu přístupné. \n\n Chcete-li tablet opět začít používat, je potřeba obnovit tovární nastavení. Po obnově budete moci v průběhu nastavení tabletu obnovit všechna data, která jsou zálohována v účtu Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifrování bylo přerušeno a nelze je dokončit. V důsledku toho již nebudou údaje v telefonu přístupné. \n\nChcete-li telefon opět začít používat, je potřeba obnovit tovární nastavení. Po obnově budete moci v průběhu nastavení telefonu obnovit všechna data, která jsou zálohována v účtu Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Přepnout metodu zadávání"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Vybrat zámek obrazovky"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Výběr záložního zámku"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Změna bezpečnostního kódu PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Změnit bezpečnostní heslo"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Heslo musí obsahovat nejméně %d znaky"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Kód PIN musí obsahovat nejméně %d znaky"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Počet číslic v kódu PIN musí být nejméně %d."</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Po dokončení se dotkněte tlačítka Pokračovat"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Pokračovat"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Heslo musí mít méně než <xliff:g id="NUMBER">%d</xliff:g> znaků."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Jako telefon pro hlasitý poslech"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pro hudbu a média"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamatovat nastavení"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Spárované displeje"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dostupná zařízení"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Připojování"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Připojené"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Dostupné"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Používá se"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Nastavení displeje"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Odpojit?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Tímto ukončíte připojení k zařízení:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Možnosti bezdrátového displeje"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Odstranit"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Hotovo"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Název"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Zapnuté"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Vypnuté"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Zakázané"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Povolit výměnu dat, pokud se tablet dotkne jiného zařízení"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Povolit výměnu dat, pokud se telefon dotkne jiného zařízení"</string>
@@ -488,61 +533,73 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Vypnuto"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Není k dispozici, protože je vypnuta funkce NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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\nPř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="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="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="8116564886303972764">"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_in_progress" msgid="2944576520214787628">"WPS probíhá a dokončení procesu může trvat až dvě minuty."</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Nastavení zabezpečení bezdrátového směrovače (TKIP) není podporováno"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Chyba ověření. Zkuste to prosím znovu."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Byla zjištěna další relace WPS. Zkuste prosím to znovu za několik minut."</string>
     <string name="wifi_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>
     <string name="wifi_speed" msgid="3526198708812322037">"Rychlost připojení"</string>
-    <string name="wifi_ip_address" msgid="1440054061044402918">"Adresa IP"</string>
+    <string name="wifi_ip_address" msgid="1440054061044402918">"IP adresa"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"Metoda EAP"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"Ověření Phase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certifikát CA"</string>
@@ -564,6 +621,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\nChcete 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>
@@ -571,12 +631,20 @@
     <string name="wifi_save" msgid="3331121567988522826">"Uložit"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Uložení sítě se nezdařilo."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Zrušit"</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_skip_anyway" msgid="6965361454438011190">"Přesto přeskočit"</string>
+    <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\nNastavení 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\nNastavení telefonu může vyžadovat přenos nemalého množství dat."</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>
-    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adresa IP"</string>
+    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP adresa"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Nastavení adresy IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Uložit"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Zrušit"</string>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Hledání…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Přejmenovat zařízení"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Partnerská zařízení"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Uložené skupiny"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Nelze připojit."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Zařízení se nepodařilo přejmenovat."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Odpojit?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Pokud se odpojíte, bude spojení se zařízením <xliff:g id="PEER_NAME">%1$s</xliff:g> a s <xliff:g id="PEER_COUNT">%2$s</xliff:g> dalšími zařízeními přerušeno."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Přenosný hotspot Wi-Fi"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Odstranit tuto skupinu?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Přenosný hotspot Wi-Fi"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Hudební efekty"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Hlasitost vyzvánění"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrovat v tichém režimu"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Výchozí oznámení"</string>
+    <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="9052854168612951170">"Zvolit vyzváněcí tón 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>
     <string name="media_volume_summary" msgid="5363248930648849974">"Umožňuje nastavit hlasitost hudby a videí"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Budík"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Doba nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vybrat tapetu:"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Dekorace displeje"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Pokud je zařízení připojeno ke zdroji, spustí se při přechodu do režimu spánku"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Vypnuto"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Vybraná dekorace"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Čas aktivace"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Doba nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nikdy"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Vyzkoušet"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Spustit i po vložení do doku"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Spořič obrazovky"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Při vložení do doku nebo při nabíjení v režimu spánku"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"V obou případech"</string>
+    <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 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>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost písma"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Velikost písma"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN SIM karty"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Nesprávný kód PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Kódy PIN nejsou shodné"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Kód PIN nelze změnit."\n"Možná jste zadali nesprávný kód PIN."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Kód PIN nelze změnit.\nMožná jste zadali nesprávný kód PIN."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN SIM karty byl úspěšně změněn."</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Stav zámku SIM karty nelze změnit."\n"Zřejmě jste zadali nesprávný kód PIN."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Stav zámku SIM karty nelze změnit.\nZřejmě jste zadali nesprávný kód PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Zrušit"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stav tabletu"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Verze základního pásma"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Verze jádra"</string>
     <string name="build_number" msgid="3075795840572241758">"Číslo sestavení"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Stav zabezpečení SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nedostupný"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stav"</string>
     <string name="device_status" msgid="607405385799807324">"Stav"</string>
@@ -733,12 +807,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">"Typ mobilní sítě"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Informace operátora"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Stav mobilní sítě"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Stav služby"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Úložiště USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Karta SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"K dispozici"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"K dispozici (pouze pro čtení)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Celková paměť"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Výpočet…"</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikace (data aplikací a multimediální obsah)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Fotografie, videa"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Zvuk (hudba, vyzvánění, podcasty atd.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Různé"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Data uložená v mezipaměti"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Odpojit sdílené úložiště"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Odpojit kartu SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Odpojit interní úložiště USB"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Smazat kartu SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Smaže všechna data v interním úložišti USB, například hudbu a fotografie"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Smaže všechna data na kartě SD, například hudbu nebo fotografie"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Pouze pro čtení)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Vymazat data uložená v mezipaměti?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Tímto vymažete z mezipaměti data všech aplikací."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Funkce MTP nebo PTP je aktivní"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Odpojit úložiště USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Odpojit kartu SD?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Pokud úložiště USB odpojíte, některé používané aplikace přestanou fungovat. Tyto aplikace pravděpodobně nebudou k dispozici, dokud úložiště USB znovu nepřipojíte."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Fotoaparát (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Umožňuje přenos fotografií pomocí softwaru fotoaparátu a přenos jakýchkoli souborů do počítačů, které nepodporují protokol MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalace nástrojů pro přenos souborů"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Další uživatelé"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stav baterie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Stav baterie"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Přístupové body"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Obnovení továrních dat"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Vymaže všechna data v tabletu"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Vymaže všechna data v telefonu"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" tabletu, mimo jiné následují:"\n\n<li>"váš účet Google,"</li>\n<li>"nastavení a data systému a aplikací,"</li>\n<li>"stažené aplikace."</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" telefonu, mimo jiné i následující:"\n\n<li>"váš účet Google,"</li>\n<li>"nastavení a data systému a aplikací,"</li>\n<li>"stažené aplikace."</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálně jste přihlášeni k těmto účtům:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" tabletu, mimo jiné následují:\n\n"<li>"váš účet Google,"</li>\n<li>"nastavení a data systému a aplikací,"</li>\n<li>"stažené aplikace."</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" telefonu, mimo jiné i následující:\n\n"<li>"váš účet Google,"</li>\n<li>"nastavení a data systému a aplikací,"</li>\n<li>"stažené aplikace."</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálně jste přihlášeni k těmto účtům:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Hudba"</li>\n<li>"Fotky"</li>\n<li>"Další uživatelské údaje"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"úložiště USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"kartu SD"</b>"."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"U zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude ukončeno sdílené připojení."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Nápověda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilní sítě"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Správa mobilního tarifu"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Neznámý operátor SIM karty"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s nemá žádný známý web pro správu účtů."</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vložte SIM kartu a restartujte zařízení."</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Připojte se prosím k internetu."</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>
@@ -917,6 +1004,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Zobrazí právní informace, stav a verzi softwaru"</string>
     <string name="legal_information" msgid="5769301644270604095">"Právní informace"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Přispěvatelé"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Regulační informace"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorská práva"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Smluvní podmínky"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Změna bezpečnostního kódu PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potvrďte uložené gesto"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Zkuste to znovu:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Proveďte gesto odemknutí"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Nakreslete své bezpečnostní gesto:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Nápovědu zobrazíte stisknutím klávesy Menu."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Na závěr zdvihněte prst z obrazovky."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Minimální počet spojených teček je <xliff:g id="NUMBER">%d</xliff:g>. Zkuste to znovu:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Gesto odemknutí obrazovky proveďte tímto způsobem"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Příliš mnoho neplatných pokusů."</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Sekundy zbývající do dalšího pokusu: <xliff:g id="NUMBER">%d</xliff:g>."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Zrušit"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Další"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Zabezpečení tabletu"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Zabezpečení telefonu"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Tablet můžete chránit před neoprávněným použitím pomocí osobního bezpečnostního gesta pro odemknutí obrazovky. Tečky na následující obrazovce spojte prstem v jakémkoli pořadí. Je potřeba spojit alespoň čtyři tečky. "\n\n"Jakmile budete připraveni začít, dotkněte se tlačítka Další."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Svůj telefon můžete chránit před neoprávněným použitím pomocí osobního gesta pro odemknutí obrazovky. Tečky na následující obrazovce spojte prstem v jakémkoli pořadí. Je třeba spojit alespoň čtyři tečky. "\n\n"Jakmile budete připraveni začít, dotkněte se tlačítka Další."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Aplikace není v telefonu nainstalována."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Spravovat aplikace"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Umožňuje spravovat a odebírat instalované aplikace"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplikace"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Povolit instalaci aplikací z neznámých zdrojů"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Data zařízení a osobní údaje jsou zranitelnější vůči útoku aplikací, které pochází z neznámých zdrojů. Souhlasíte s tím, že jste výhradně odpovědní za případné škody na zařízení a ztráty dat způsobené používáním těchto aplikací."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Váš telefon a osobní údaje jsou zranitelnější vůči útoku aplikací, které pochází z neznámých zdrojů. Souhlasíte s tím, že nesete osobní odpovědnost za jakékoli škody způsobené na vašem telefonu nebo za ztrátu dat v důsledku používání těchto aplikací."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Ověřovat aplikace"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Zakázat instalaci škodlivých aplikací nebo na ně upozornit"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Upřesnit nastavení"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Povolit další možnosti nastavení"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informace o aplikaci"</string>
@@ -1001,9 +1086,11 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Data úložiště USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Karta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Odinstalovat"</string>
-    <string name="disable_text" msgid="6544054052049395202">"Vypnout"</string>
-    <string name="enable_text" msgid="9217362512327828987">"Povolit"</string>
-    <string name="clear_user_data_text" msgid="5597622864770098388">"Mazání dat"</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">"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>
     <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Této aplikaci jste povolili vytváření widgetů a přístup k jejich datům."</string>
@@ -1019,33 +1106,35 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Zobrazit mezipaměť"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Obnovit nastavení apl."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Obnovit nastavení apl.?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Touto akcí obnovíte všechna nastavení pro:"\n\n" "<li>"deaktivované aplikace,"</li>\n" "<li>"deaktivovaná oznámení aplikací,"</li>\n" "<li>"výchozí aplikace k provádění akcí,"</li>\n" "<li>"omezení dat na pozadí pro aplikace."</li>\n\n" O žádná data aplikací nepřijdete."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Touto akcí obnovíte všechna nastavení pro:\n\n "<li>"deaktivované aplikace,"</li>\n" "<li>"deaktivovaná oznámení aplikací,"</li>\n" "<li>"výchozí aplikace k provádění akcí,"</li>\n" "<li>"omezení dat na pozadí pro aplikace."</li>\n\n" O žádná data aplikací nepřijdete."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Obnovit aplikace"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Správa paměti"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na kartě SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktivováno"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Není nainstalováno"</string>
     <string name="no_applications" msgid="7336588977497084921">"Žádné aplikace"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interní úložiště"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Úložiště USB"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Karta SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Přepočítávání velikosti..."</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Smazat data aplikace?"</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Vymazat data aplikace?"</string>
     <string name="clear_data_dlg_text" msgid="8847257251846779938">"Veškerá data (všechny soubory, nastavení, účty, databáze apod.) této aplikace budou trvale vymazána."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Zrušit"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="8333723538280257243">"Aplikaci se nepodařilo najít na seznamu nainstalovaných aplikací."</string>
-    <string name="clear_data_failed" msgid="1907582169616856698">"Nelze smazat data aplikace."</string>
+    <string name="clear_data_failed" msgid="1907582169616856698">"Nelze vymazat data aplikace."</string>
     <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"Odinstalovat aktualizace?"</string>
     <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Všechny aktualizace této aplikace systému Android budou odinstalovány."</string>
-    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Mazání dat"</string>
-    <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Nepodařilo se smazat data aplikace."</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Vymazat data"</string>
+    <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Nepodařilo se vymazat data aplikace."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Tato aplikace má přístup k následujícím funkcím tabletu:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Tato aplikace má přístup k následujícím funkcím telefonu:"</string>
     <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Tato aplikace může ve vašem tabletu používat následující oprávnění. Chcete-li zvýšit výkon a snížit využití paměti, některá tato oprávnění jsou dostupná v aplikaci <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, která se spouští v rámci stejného procesu jako aplikace <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> a <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Tato aplikace vám může účtovat poplatky:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Odesílání prémiových zpráv SMS"</string>
     <string name="computing_size" msgid="1599186977475211186">"Probíhá výpočet…"</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Nepodařilo se určit velikost balíčku."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Žádné aplikace třetích stran nejsou nainstalovány."</string>
@@ -1075,10 +1166,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>
@@ -1094,6 +1190,8 @@
     <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">"Uživatel: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Odebraný uživatel"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"procesy: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, služby: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"procesy: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, služby: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"procesy: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, služby: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Nastavení fyzické klávesnice"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Znak „.“ lze vložit dvojím stisknutím klávesy Mezerník."</string>
     <string name="show_password" msgid="3001113966880559611">"Zobrazovat hesla"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Prostřednictvím této vstupní metody zadávání dat lze shromažďovat zadaný text včetně osobních údajů, jako jsou hesla a čísla platebních karet. Metoda je poskytována aplikací <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Chcete tuto metodu zadávání dat použít?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Prostřednictvím této kontroly pravopisu lze shromažďovat zadaný text včetně osobních údajů, jako jsou hesla a čísla kreditních karet. Kontrola pravopisu je součástí aplikace <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Chcete tuto kontrolu pravopisu použít?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Nastavení"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Přepněte klávesami ctrl+mezerník"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Výchozí"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Rozložení klávesnice"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Uživatelský slovník"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Osobní slovník"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osobní slovníky"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Osobní slovník"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Přidat"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Přidat do slovníku"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Obrazovka se při nabíjení nepřepne do režimu spánku"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Povolit sledovací protokol Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zachytit všechny pakety Bluetooth HCI do souboru"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Výběr modulu runtime"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Výběr modulu runtime"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Chcete provést restart a změnit modul runtime z <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Povolit simulované polohy"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Povolit simulované polohy"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Kontrolovat škodlivost aplikací nainstalovaných pomocí nástroje ADB/ADT."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Chránit úložiště USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplikace musejí před čtením z úložiště USB žádat o povolení"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Chránit úložiště USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Pokud je úložiště USB chráněno, musejí aplikace před čtením dat z externího úložiště požádat o povolení."\n\n"Některé aplikace nemusejí fungovat, dokud je vývojáři neaktualizují."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Pokud je úložiště USB chráněno, musejí aplikace před čtením dat z externího úložiště požádat o povolení.\n\nNěkteré aplikace nemusejí fungovat, dokud je vývojáři neaktualizují."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Chránit kartu SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikace musejí před čtením z karty SD žádat o povolení"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Chránit kartu SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Pokud je karta SD chráněná, musejí aplikace před čtením dat z externího úložiště požádat o povolení."\n\n"Některé aplikace nemusejí fungovat, dokud je vývojáři neaktualizují."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Pokud je karta SD chráněná, musejí aplikace před čtením dat z externího úložiště požádat o povolení.\n\nNěkteré aplikace nemusejí fungovat, dokud je vývojáři neaktualizují."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Místní terminál"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktivovat terminálovou apl. pro místní přístup k prostředí shell"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Zvolte gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Zvolte widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vytvořit widget a povolit přístup?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Nastavení usnadnění"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Služby"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Systém"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Velký text"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Tlač. napájení ukončí hovor"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Vyslovovat hesla"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Prodleva dotyku a podržení"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Usnadnit přístup k webu"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gesta pro přiblížení obrazovky"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Je-li tato funkce zapnutá, můžete zobrazení přibližovat a oddalovat tak, že třikrát klepnete na obrazovku.\n\nPři přiblížení můžete provádět tyto činnosti:\n"<ul><li>"Posunutí: táhněte po obrazovce minimálně dvěma prsty."</li>\n<li>"Změna úrovně přiblížení: alespoň dva prsty stáhněte k sobě, nebo roztáhněte od sebe."</li></ul>\n\n"Také je možné dočasně zvětšit oblast pod prstem. Stačí na ni třikrát klepnout a podržet ji. V takto zvětšeném náhledu můžete přetáhnutím prstu prohlížet libovolné části obrazovky. Do předchozího zobrazení se vrátíte zdvihnutím prstu.\n\nPoznámka: Zvětšení trojitým klepnutím funguje ve všech částech obrazovky s výjimkou klávesnice a navigační lišty."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Zkratka usnadnění"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Zapnuto"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Vyp."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Je-li tato funkce zapnutá, můžete rychle ve dvou krocích aktivovat funkce usnadnění přístupu:\n\nKrok 1: Stiskněte tlačítko napájení a držte jej, dokud neuslyšíte zvuk nebo neucítíte vibraci.\n\nKrok 2: Dotkněte se obrazovky dvěma prsty a držte ji, dokud neuslyšíte potvrzovací zvuk.\n\nMá-li zařízení více uživatelů, pomocí této zkratky lze na uzamčené obrazovce dočasně aktivovat usnadnění přístupu, dokud zařízení nebude odemčeno."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Velký text"</string>
+    <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č. 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_menu_item_settings" msgid="3344942964710773365">"Nastavení"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Zapnuto"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"Zapnuto"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Vypnuto"</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="print_settings" msgid="4742428530112487843">"Tisk"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Nastavení tisku"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Služby"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Chcete použít službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"Služba <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> může přijímat dokumenty, které tisknete. Tyto dokumenty mohou obsahovat citlivá data."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Žádná služba není nainstalována"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Nastavení"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Přidat tiskárny"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Zapnuto"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Vypnuto"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterie"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Co využívá baterii"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Údaje o spotřebě nejsou známy."</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Přijatá data"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Odeslané mobilní datové přenosy"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Přijaté mobilní datové přenosy"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Odeslané datové přenosy Wi‑Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Přijaté datové přenosy Wi‑Fi"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Zvuk"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Doba zapnutí"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Ukončete aplikaci nebo ji odinstalujte"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"GPS můžete ručně nastavit, aby jej aplikace nemohly používat."</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"V aplikaci mohou být k dispozici nastavení ke snížení spotřeby"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Baterie spotřebovaná uživatelem"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odpojení"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Při posledním odpojení pro <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Využití baterie celkem"</string>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Výška"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Určuje rejstřík mluveného textu"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Jazyk"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nebyl vybrán jazyk"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Nastavení jazyka hlasu pro mluvený text"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Poslechnout příklad"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Přehrát krátkou ukázku syntézy řeči"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Jas <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automaticky"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"úplný"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"poloviční"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"vypnuto"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"Síť VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Úložiště pověření"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalovat z úložiště"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Při přeinstalaci aplikace obnovit zálohovaná nastavení a další data"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Zaznamenat zprávu o chybě"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Shromažďuje informace o aktuálním stavu zařízení. Tyto informace je následně možné poslat v e-mailové zprávě, chvíli však potrvá, než bude hlášení o chybě připraveno k odeslání. Buďte prosím trpěliví."</string>
-    <string name="report" msgid="302437572240018342">"Vytvořit zprávu"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Heslo pro zálohy v počítači"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Úplné zálohy v počítači nejsou v současné době chráněny"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tuto možnost vyberte, chcete-li změnit nebo odebrat heslo pro úplné zálohy v počítači"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nChcete-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>
@@ -1487,7 +1631,7 @@
     <string name="sync_disabled" msgid="8511659877596511991">"Synchronizace VYP."</string>
     <string name="sync_error" msgid="5060969083117872149">"Chyba synchronizace"</string>
     <string name="last_synced" msgid="4242919465367022234">"Poslední synchronizace <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
-    <string name="sync_in_progress" msgid="5151314196536070569">"Synchronizovat..."</string>
+    <string name="sync_in_progress" msgid="5151314196536070569">"Probíhá synchronizace..."</string>
     <string name="settings_backup" msgid="2274732978260797031">"Nastavení zálohování"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Zálohovat moje nastavení"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Synchronizovat"</string>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalendář"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kontakty"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Vítá vás aplikace Google Sync."</font>" "\n"Nový pohled společnosti Google na synchronizaci dat vám poskytuje přístup ke kontaktům, schůzkám a dalším informacím, ať jste kdekoli."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Vítá vás aplikace Google Sync."</font>" \nNový pohled společnosti Google na synchronizaci dat vám poskytuje přístup ke kontaktům, schůzkám a dalším informacím, ať jste kdekoli."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Nastavení synchronizace aplikací"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data a synchronizace"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Změnit heslo"</string>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Celý obsah okna při obnovení bliká."</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Zobrazit obnovení s GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Zobrazení v oknech vykreslovaná s GPU blikají."</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Zobr. aktual. HW vrstev"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Aktualizované HW vrstvy nechat zeleně blikat"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Ladění překreslování GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Zobrazit využití CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Překryvná vrstva s aktuálním využitím procesoru"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Vykreslování pomocí GPU"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulovat sekun. displeje"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikace"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Neukládat aktivity"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Rušit všechny činnosti, jakmile je uživatel zavře"</string>
     <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í datových přenosů na pozadí"</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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Zakázat data na pozadí v mobilních sítích. Používat jiné sítě."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Data na pozadí u aplikace omezíte nastavením limitu mob. dat."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Omezení datových přenosů na pozadí?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Pokud budou k dispozici pouze mobilní sítě, může tato funkce způsobit, že aplikace, které data na pozadí vyžadují, nebudou fungovat."\n\n"Vhodnější způsoby řízení využívání dat naleznete v nastaveních aplikace."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Pokud budou k dispozici pouze mobilní sítě, může tato funkce způsobit, že aplikace, které data na pozadí vyžadují, nebudou fungovat.\n\nVhodnější způsoby řízení využívání dat naleznete v nastavení aplikace."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Omezení dat na pozadí je k dispozici pouze v případě, že jste nastavili limit přenosu mobilních dat."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Zapnout aut. synchronizaci dat?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Změny, které v rámci svých účtů provedete na webu, se automaticky zkopírují do tabletu."\n\n"Některé účty také automaticky zkopírují změny provedené v tabletu na web. Tímto způsobem funguje například účet Google."\n\n"Typy informací, které se budou v jednotlivých účtech synchronizovat, nastavíte v části Nastavení &gt; Účty."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Změny, které v rámci svých účtů provedete na webu, se automaticky zkopírují do telefonu."\n\n"Některé účty také automaticky zkopírují změny provedené v telefonu na web. Tímto způsobem funguje například účet Google."\n\n"Typy informací, které se budou v jednotlivých účtech synchronizovat, nastavíte v části Nastavení &gt; Účty."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Změny, které v rámci svých účtů provedete na webu, se automaticky zkopírují do tabletu.\n\nNěkteré účty také automaticky zkopírují změny provedené v tabletu na web. Tímto způsobem funguje například účet Google.\n\nTypy informací, které se budou v jednotlivých účtech synchronizovat, nastavíte v části Nastavení &gt; Účty."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Změny, které v rámci svých účtů provedete na webu, se automaticky zkopírují do telefonu.\n\nNěkteré účty také automaticky zkopírují změny provedené v telefonu na web. Tímto způsobem funguje například účet Google.\n\nTypy informací, které se budou v jednotlivých účtech synchronizovat, nastavíte v části Nastavení &gt; Účty."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Vypnout aut. synchronizaci dat?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Toto nastavení šetří využití dat a baterii. Nejnovější informace však bude třeba získávat pomocí ruční synchronizace účtu a nebudete také dostávat oznámení o dostupných aktualizacích."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum obnovení cyklu sledování přenesených dat"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Nastavit upozornění na využití dat"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nastavení limitu datových přenosů"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Nastavuje se omezení datových přenosů"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Po dosažení stanoveného limitu bude datové připojení k síti zakázáno.\n\nProtož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\nProtož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" 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\nToto 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\nToto 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Odebrané aplikace a odebraní uživatelé"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"Přijato <xliff:g id="RECEIVED">%1$s</xliff:g>, odesláno <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>: využito asi <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>: 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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Přidat profil VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Upravit profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Smazat profil"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Trvalá síť VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Vyberte profil VPN, ke kterému chcete zůstat trvale připojeni. Síťový provoz bude povolen pouze v případě, že budete připojeni k této síti VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Žádná"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Trvalá síť VPN vyžaduje IP adresu pro server i DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Připojení k síti není k dispozici. Zkuste to prosím znovu později."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Chybí certifikát, upravte prosím profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Systém"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Zrušit"</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">"Další aktualizace systému"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Uživatelé a omezení"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Uživatelé"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Přidat uživatele"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Upravit podrobnosti"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Informace o uživateli"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Jméno"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Omezení obsahu"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Vyžadovat PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Klasifikace obsahu"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Systémové aplikace"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Nainstalované aplikace"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Zahodit"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Odebrat uživatele"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Uličník"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Zakázáno"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Mírné"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Přísné"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Uživatelé"</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="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\nKdyž vytvoříte nového uživatele, daná osoba bude muset projít procesem nastavení.\n\nKaž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\nKaž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_confirm_remove_message" msgid="5284111415714437285">"Opravdu chcete tohoto uživatele a veškerá k němu přidružená data odebrat ze zařízení?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Změna velikosti písma"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Omezení"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Odebrat omezení"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Změnit PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Zobrazit upozornění"</string>
     <string name="help_label" msgid="1107174367904110532">"Nápověda"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Účet pro obsah"</string>
+    <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="6160672982086584261">"Nastavit omezení aplikací"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Řízeno aplikací <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Tato aplikace v omezených profilech není podporována."</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Tato aplikace má přístup k vašim účtům"</string>
+    <string name="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 67bebe6..45cd4fb 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,16 +218,127 @@
     <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="886742181977884584">"Medier"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"medieknapper"</item>
+    <item msgid="4547883971364273343">"lydfokusering"</item>
+    <item msgid="2603878814882344450">"generel lydstyrke"</item>
+    <item msgid="7136963238377062018">"lydstyrke for stemme"</item>
+    <item msgid="4270236897655923007">"lydstyrke for ringetone"</item>
+    <item msgid="6325739889222559394">"lydstyrke for medier"</item>
+    <item msgid="5762123934816216821">"alarmlydstyrke"</item>
+    <item msgid="785049718065337473">"lydstyrke for underretninger"</item>
+    <item msgid="6700305533746877052">"lydstyrke for bluetooth"</item>
+    <item msgid="2029227495214047094">"hold aktiv"</item>
+    <item msgid="26109888160231211">"overvåg placering"</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>
+    <item msgid="5753789168376302997">"Medieknapper"</item>
+    <item msgid="3265262911688671938">"Lydfokusering"</item>
+    <item msgid="2098976479485046797">"Generel lydstyrke"</item>
+    <item msgid="5660213838861789350">"Lydstyrke for stemme"</item>
+    <item msgid="7983336752371254444">"Lydstyrke for ringetone"</item>
+    <item msgid="7878027809189330917">"Lydstyrke for medier"</item>
+    <item msgid="7260546305036218513">"Alarmlydstyrke"</item>
+    <item msgid="9103719301075748925">"Lydstyrke for underretninger"</item>
+    <item msgid="7025966722295861512">"Lydstyrke for bluetooth"</item>
+    <item msgid="4665183401128289653">"Hold aktiv"</item>
+    <item msgid="8584357129746649222">"Placering"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Mellem"</item>
     <item msgid="2372711992605524591">"Lang"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (debug)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Brug Dalvik"</item>
+    <item msgid="5131846588686178907">"Brug ART"</item>
+    <item msgid="4530003713865319928">"Brug ART debug build"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Kontroller aldrig"</item>
     <item msgid="6042769699089883931">"Kontroller kun for DRM-indhold"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Animationsskala 5x"</item>
     <item msgid="1069584980746680398">"Animationsskala 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Ingen"</item>
+    <item msgid="688482401508173818">"720 x 480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280 x 720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280 x 720 tvdpi og 1920 x 1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Ingen"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Fra"</item>
+    <item msgid="7688197031296835369">"Vis områder med overlap"</item>
+    <item msgid="8332661909019981149">"Vis antallet af overlap"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardgrænse"</item>
     <item msgid="4071574792028999443">"Ingen baggrundsprocesser"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Timeout"</item>
     <item msgid="7664124146786465092">"Mislykkedes"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Spørg"</item>
+    <item msgid="5077768429488260031">"Tillad aldrig"</item>
+    <item msgid="1417929597727989746">"Tillad altid"</item>
+  </string-array>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index cb070bf..f7f5276 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nej"</string>
     <string name="create" msgid="3578857613172647409">"Opret"</string>
+    <string name="allow" msgid="3349662621170855910">"Tillad"</string>
+    <string name="deny" msgid="6947806159746484865">"Afvis"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ukendt"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Du er nu <xliff:g id="STEP_COUNT">%1$d</xliff:g> skridt væk fra at være udvikler."</item>
+    <item quantity="other" msgid="6722953419953594148">"Du er nu <xliff:g id="STEP_COUNT">%1$d</xliff:g> skridt væk fra at være udvikler."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Nu er du udvikler."</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Det behøver du ikke. Du er allerede udvikler."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"TRÅDLØST OG NETVÆRK"</string>
     <string name="header_category_device" msgid="5781174212691167553">"ENHED"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PERSONLIG"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Oplader"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Aflader"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(trådløs)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Oplader ikke"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Oplader ikke"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Fuld"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Ikke sluttet til"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"trådløs"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Ukendt"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Ukendt"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Ukendt fejl"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Kold"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Søgbar"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Synlig for alle Bluetooth-enheder i nærheden (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Synlig for alle Bluetooth-enheder i nærheden"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ikke synlig for andre Bluetooth-enheder"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Kun synlig for parrede enheder"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gør enheden søgbar"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timeout for synlighed"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Indstil i hvor lang tid enheden vil være søgbar"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lås stemmeopkald"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Bloker brug af Bluetooth-opkald, når skærmen er låst"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-enheder"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Vis modtagne filer"</string>
     <string name="device_picker" msgid="8398232791303186677">"Valg af Bluetooth-enhed"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Anmodning om Bluetooth-tilladelse"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"En app ønsker at aktivere Bluetooth. Vil du tillade dette?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"En app på din tablet ønsker at gøre din tablet søgbar for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vil du tillade dette?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"En app på telefonen ønsker at gøre telefonen søgbar for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vil du tillade dette?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"En app på din tablet ønsker at gøre din tablet \"altid søgbar\" for andre Bluetooth-enheder. Vil du tillade dette?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"En app på telefonen ønsker at gøre din telefon \"altid søgbar\" for andre Bluetooth-enheder. Vil du tillade dette?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"En app på din tablet ønsker at slå Bluetooth til og gøre din tablet søgbar for andre enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vil du tillade dette?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"En app på telefonen forsøger at aktivere Bluetooth og gøre telefonen søgbar for andre enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vil du tillade dette?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"En app på din tablet ønsker at aktivere Bluetooth og gøre din tablet søgbar for andre enheder. Vil du tillade dette?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"En app på telefonen forsøger at aktivere Bluetooth og gøre telefonen søgbar for andre enheder. Vil du tillade dette?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"En app ønsker at aktivere Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"En app ønsker at gøre din tablet synlig for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"En app ønsker at gøre din telefon synlig for andre Bluetooth-enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"En app ønsker at gøre din tablet synlig for andre Bluetooth-enheder. Du kan ændre dette senere i Bluetooth-indstillinger."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"En app ønsker at gøre din telefon synlig for andre Bluetooth-enheder. Du kan ændre dette senere i Bluetooth-indstillinger."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"En app ønsker at aktivere Bluetooth og gøre din tablet synlig for andre enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"En app ønsker at aktivere Bluetooth og gøre din telefon synlig for andre enheder i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"En app ønsker at aktivere Bluetooth og gøre din tablet synlig for andre enheder. Du kan ændre dette senere i Bluetooth-indstillinger."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"En app ønsker at aktivere Bluetooth og gøre din telefon synlig for andre enheder. Du kan ændre dette senere i Bluetooth-indstillinger."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Aktiverer Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth slukker??"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Opret automatisk forbindelse"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-proxyen anvendes af browseren, men må ikke bruges af andre apps."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Placering:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Nabo-CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Mobiloplysninger:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataforsøg:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-tjeneste:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Du har mistet dataforbindelsen, fordi du har forladt dit hjemmenetværk med dataroaming slået fra."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Slå det til"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Når du tillader dataroaming, risikerer du at skulle betale høje gebyrer for roaming."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Når du tillader dataroaming, kan du blive udsat for væsentlige roamingudgifter.\n\nDenne indstilling påvirker alle brugere på denne tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Når du tillader dataroaming, kan du blive udsat for væsentlige roamingudgifter.\n\nDenne indstilling påvirker alle brugere på denne telefon."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Vil du tillade dataroaming?"</string>
     <string name="networks" msgid="6333316876545927039">"Valg af udbyder"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Vælg en netværksudbyder"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Ejeroplysninger"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Kræv en numerisk pinkode eller adgangskode for at dekryptere din tablet, hver gang du tænder for den"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Kræv en numerisk pinkode eller adgangskode for at dekryptere din telefon, hver gang du tænder for den"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krypteret"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Du kan kryptere dine konti, indstillinger, downloadede apps og deres data, medier og andre filer. Når du krypterer din tablet, skal du indtaste en numerisk pinkode eller adgangskode for at dekryptere den, hver gang du tænder for den. Du kan kun dekryptere din tablet ved at udføre en nulstilling af fabriksdata, som sletter alle dine data."\n\n"Krypteringen tager mindst en time. Når du starter krypteringen, skal batteriet være fuldt opladet, og du skal sørge for, at din tablet forbliver sluttet til strøm, indtil krypteringen er gennemført. Hvis du afbryder krypteringen, mister du nogle eller alle data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Du kan kryptere dine konti, indstillinger, downloadede apps og deres data, medier og andre filer. Når du krypterer din telefon, skal du indtaste en numerisk pinkode eller adgangskode for at dekryptere den, hver gang du tænder for den. Du kan kun  dekryptere din telefon ved at udføre en nulstilling af fabriksdata, som sletter alle dine data."\n\n"Krypteringen tager mindst en time. Når du starter krypteringen, skal batteriet være fuldt opladet, og du skal sørge for, at din telefon forbliver sluttet til strøm, indtil krypteringen er gennemført. Hvis du afbryder krypteringen, mister du nogle eller alle data."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Du kan kryptere dine konti, indstillinger, downloadede apps og deres data, medier og andre filer. Når du krypterer din tablet, skal du indtaste en numerisk pinkode eller adgangskode for at dekryptere den, hver gang du tænder for den. Du kan kun dekryptere din tablet ved at udføre en nulstilling af fabriksdata, som sletter alle dine data.\n\nKrypteringen tager mindst en time. Når du starter krypteringen, skal batteriet være fuldt opladet, og du skal sørge for, at din tablet forbliver sluttet til strøm, indtil krypteringen er gennemført. Hvis du afbryder krypteringen, mister du nogle eller alle data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Du kan kryptere dine konti, indstillinger, downloadede apps og deres data, medier og andre filer. Når du krypterer din telefon, skal du indtaste en numerisk pinkode eller adgangskode for at dekryptere den, hver gang du tænder for den. Du kan kun  dekryptere din telefon ved at udføre en nulstilling af fabriksdata, som sletter alle dine data.\n\nKrypteringen tager mindst en time. Når du starter krypteringen, skal batteriet være fuldt opladet, og du skal sørge for, at din telefon forbliver sluttet til strøm, indtil krypteringen er gennemført. Hvis du afbryder krypteringen, mister du nogle eller alle data."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Krypter tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Krypter telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Lad dit batteri op, og prøv igen."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Prøv igen om <xliff:g id="DELAY">^1</xliff:g> sekunder."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Indtast din adgangskode"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Kryptering mislykkedes"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krypteringen blev afbrudt og kan ikke fuldføres. Som følge heraf er dataene på din tablet ikke længere tilgængelige. "\n\n"Hvis du vil genoptage brugen af din  tablet, skal du udføre en nulstilling af fabriksdata. Når du konfigurerer din tablet efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krypteringen blev afbrudt og kan ikke fuldføres. Som følge heraf er dataene på din telefon ikke længere tilgængelige. "\n\n"Hvis du vil genoptage brugen af telefonen, skal du udføre en nulstilling af fabriksdata. Når du konfigurerer din telefon efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krypteringen blev afbrudt og kan ikke fuldføres. Som følge heraf er dataene på din tablet ikke længere tilgængelige. \n\nHvis du vil genoptage brugen af din  tablet, skal du udføre en nulstilling af fabriksdata. Når du konfigurerer din tablet efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krypteringen blev afbrudt og kan ikke fuldføres. Som følge heraf er dataene på din telefon ikke længere tilgængelige. \n\nHvis du vil genoptage brugen af telefonen, skal du udføre en nulstilling af fabriksdata. Når du konfigurerer din telefon efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Skift indtastningsmetode"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Vælg skærmlås"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Vælg backuplås"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Skift pinkode til at låse op"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Skift adgangskode til at låse op"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Adgangskoden skal være på mindst %d tegn"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Pinkoden skal være på mindst %d tegn"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Pinkoden skal være på mindst %d tegn"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Tryk på Fortsæt, når du er færdig"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsæt"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Adgangskoden skal være kortere end <xliff:g id="NUMBER">%d</xliff:g> tegn."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som højttalertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Til musik og medier"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Husk indstillinger"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Parrede skærme"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Mulige enheder"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Tilslutter"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Tilsluttet"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Tilgængelig"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"I brug"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Skærmindstillinger"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Vil du afbryde forbindelsen?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Dette vil afslutte din forbindelse til:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Indstillinger for trådløs skærm"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Glem"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Udført"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Navn"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Til"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Fra"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Deaktiveret"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tillad dataudveksling, når tabletten rører en anden enhed"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Tillad dataudveksling, når telefonen rører en anden enhed"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Fra"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Utilgængelig, fordi NFC er slukket"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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\nHold 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="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="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="8116564886303972764">"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_in_progress" msgid="2944576520214787628">"WPS er allerede i gang og kan tage op til to minutter at fuldføre"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Sikkerhedsindstillingen til trådløse routere (TKIP) understøttes ikke"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Godkendelsesfejl. Prøv igen."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"En anden WPS-session blev registreret. Prøv igen om et par minutter."</string>
     <string name="wifi_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>
@@ -564,6 +621,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\nVil 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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Gem"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Netværk kunne ikke gemmes"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Annuller"</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_skip_anyway" msgid="6965361454438011190">"Spring over alligevel"</string>
+    <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\nKonfiguration 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\nKonfiguration af telefonen kan kræve en betydelig mængde aktivitet på netværket."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Søger…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Omdøb enhed"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Peer-enheder"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Gemte grupper"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Der kunne ikke oprettes forbindelse."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Enheden kunne ikke omdøbes."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Vil du afbryde?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Hvis du afbryder, stoppes forbindelsen til <xliff:g id="PEER_NAME">%1$s</xliff:g> og <xliff:g id="PEER_COUNT">%2$s</xliff:g> andre enheder."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Bærbart Wi-Fi-hotspot"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vil du glemme denne gruppe?"</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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Musikeffekter"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Lydstyrke for opkald"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer ved lydløs"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Standardunderretning"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Standardlyd for underretninger"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Blinkende meddelelseslys"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringetone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Meddelelse"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Brug lydstyrke for indgående opkald til meddelelser"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Vælg ringetone ved meddelelser"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Standardlyd for underretninger"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Medier"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Angiv lydstyrke for musik og videoer"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Baggrund"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vælg baggrund fra"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Skærmdekoration"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Går i dvale, når tilsluttet strøm"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Deaktiveret"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Valgte dekoration"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Hvornår der skal aktiveres"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitet"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Aldrig"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Prøv det!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Aktivér også, når tilsluttet dockingstationen"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Dagdrøm"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Når enheden er tilsluttet en dockingstation eller i dvale og i færd med at oplade"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Enten eller"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Under opladning"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Når enheden er tilsluttet en dockingstation"</string>
+    <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 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>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Skriftstørrelse"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN-kode til SIM-kort"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Forkert pinkode"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Pinkoderne er ikke ens"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Pinkoden kan ikke ændres."\n"Pinkoden er muligvis forkert."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Pinkoden kan ikke ændres.\nPinkoden er muligvis forkert."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN-koden til SIM-kortet er ændret"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM-kortlåsens tilstand kan ikke ændres."\n"Det skyldes muligvis en forkert pinkode."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM-kortlåsens tilstand kan ikke ændres.\nDet skyldes muligvis en forkert pinkode."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annuller"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status for tabletcomputeren"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Basebandversion"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernesystem"</string>
     <string name="build_number" msgid="3075795840572241758">"Versionnummer"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Ikke tilgængelig"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -733,12 +807,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">"Mobilnetværk"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Oplysninger om udbyder"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Tilstand for mobilnetværk"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Tjenestetilstand"</string>
     <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>
@@ -748,14 +823,16 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-lager"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kort"</string>
     <string name="memory_available" msgid="5052397223077021181">"Tilgængelig"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Tilgængelig (skrivebeskyttet)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Plads i alt"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Beregner..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Apps (appdata og medieindhold)"</string>
     <string name="memory_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>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Demonter SD-kort"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Demonter det interne USB-lager"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Slet SD-kort"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Sletter alle data på det interne USB-lager, f.eks. musik og billeder"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Sletter alle data på telefonens SD-kort, f.eks. musik og billeder"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Skrivebeskyttet)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Vil du rydde cachelagrede data?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Dette vil rydde cachelagrede data for alle apps."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP- eller PTP-funktionen er aktiv"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Demonter USB-lager?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Vil du demontere SD-kortet?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Hvis du demonterer USB-lager, vil nogle af de kørende apps stoppe, og de kan være utilgængelige, indtil du monterer USB-lager igen."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Lader dig overføre fotos ved hjælp af kamera-software og overføre filer på computere, der ikke understøtter MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installer værktøjer til filoverførsel"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Andre brugere"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batteriniveau"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN\'er"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Gendannelse af fabriksdata"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Sletter alle data på tabletcomputeren"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Slet alle data på telefonen"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Dette sletter alle data fra tablettens "<b>"interne lager"</b>", f.eks.: "\n\n<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og applikationer"</li>\n<li>"downloadede applikationer"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Dette sletter alle data fra telefonens "<b>"interne lager"</b>", f.eks.: "\n\n<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og applikationer"</li>\n<li>"downloadede applikationer"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er i øjeblikket logget ind på disse konti:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Dette sletter alle data fra tablettens "<b>"interne lager"</b>", f.eks.: \n\n"<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og applikationer"</li>\n<li>"downloadede applikationer"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Dette sletter alle data fra telefonens "<b>"interne lager"</b>", f.eks.: \n\n"<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og applikationer"</li>\n<li>"downloadede applikationer"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er i øjeblikket logget ind på disse konti:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Billeder"</li>\n<li>"Andre brugerdata"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ryd musik, billeder og andre brugerdata ved at formatere "<b>"USB-lager"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Hvis du vil rydde musik, billeder og andre brugerdata, skal du formatere "<b>"SD-kortet"</b>"."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Tethering til <xliff:g id="DEVICE_NAME">%1$s</xliff:g> vil blive afbrudt."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjælp"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilnetværk"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Administrer mobilabonnement"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"SIM-kortudbyderen er ukendt"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s har intet kendt website til provisionering"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Indsæt SIM-kort, og genstart"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Opret forbindelse til internettet"</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>
@@ -910,13 +997,14 @@
     <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>
     <string name="about_settings_summary" msgid="3371517697156165959">"Vis juridiske oplysninger, status, softwareversion"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridiske oplysninger"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Bidragsydere"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Oplysninger om regler"</string>
     <string name="copyright_title" msgid="865906688917260647">"Ophavsret"</string>
     <string name="license_title" msgid="1990487604356037871">"Licens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Vilkår og betingelser"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Skift pinkode til at låse op"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bekræft gemt mønster"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Prøv igen:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Tegn et oplåsningsmønster"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Tegn et åbningsmønster:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tryk på Menu for at få hjælp."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Slip med fingeren, når du er færdig."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Forbind mindst <xliff:g id="NUMBER">%d</xliff:g> punkter. Prøv igen:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Sådan tegnes et oplåsningsmønster"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"For mange forkerte forsøg!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Prøv igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Annuller"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Næste"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sådan beskytter du din tabletcomputer"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Beskyt din telefon"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Beskyt din tablet mod uautoriseret brug ved at oprette et personligt mønster til at låse skærmen op. Brug din finger til at forbinde punkterne vilkårligt på den næste skærm. Du skal forbinde mindst fire punkter."\n\n"Er du klar? Tryk på Næste."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Beskyt din telefon mod uautoriseret brug ved at oprette et personligt mønster til at låse skærmen op. Brug fingeren til at forbinde mindst fire punkter i vilkårlig rækkefølge på næste skærmbillede. "\n\n"Når du er klar til at begynde, trykker du på Næste."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Applikationen er ikke installeret på din telefon."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrer apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrer og fjern installerede apps"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Apps"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Tillad installation af apps fra ukendte kilder"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Dine tabletdata og personlige data er mere sårbare over for angreb fra apps fra ukendte kilder. Du accepterer, at du alene er ansvarlig for eventuelle skader på din tablet eller tab af data, der kan skyldes brug af disse apps."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Din telefon og dine personlige data er mere sårbare over for angreb fra apps fra ukendte kilder. Du accepterer, at du alene er ansvarlig for eventuelle skader på din telefon eller tab af data, der kan skyldes brugen af disse apps."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Bekræft apps"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Forbyd eller advar mod potentielt skadelige apps inden installationen"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Avancerede indstillinger"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktivér flere indstillinger"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Oplysninger om appen"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-lagringsdata"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kort"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Afinstaller"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Afinstaller for alle brugere"</string>
+    <string name="install_text" msgid="884360662922471113">"Installer"</string>
     <string name="disable_text" msgid="6544054052049395202">"Deaktiver"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktivér"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Ryd data"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Cachelagrede processer"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Nulstil app-præferencer"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Nulstil app-præferencer?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Dette vil nulstille alle præferencer for:"\n\n<li>"deaktiverede apps"</li>\n<li>"underretninger om deaktiverede apps"</li>\n<li>"standardapplikationer til handlinger"</li>\n<li>"begrænsninger for baggrundsdata for apps"</li>\n\n"Du vil ikke miste nogen appdata."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Dette vil nulstille alle præferencer for:\n\n"<li>"deaktiverede apps"</li>\n<li>"underretninger om deaktiverede apps"</li>\n<li>"standardapplikationer til handlinger"</li>\n<li>"begrænsninger for baggrundsdata for apps"</li>\n\n"Du vil ikke miste nogen appdata."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Nulstil apps"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Administrer plads"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På SD-kort"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktiveret"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Ikke installeret"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ingen apps."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Internt lager"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-lager"</string>
@@ -1054,12 +1143,14 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> og <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Denne app kan koste penge:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Send en premium-sms"</string>
     <string name="computing_size" msgid="1599186977475211186">"Beregner..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Pakkestørrelsen kunne ikke beregnes."</string>
     <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>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Skift den foretrukne installationsplacering for nye apps"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Deaktiver indbygget app?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Hvis du deaktiverer en indbygget app, kan det medføre, at andre apps ikke fungerer korrekt."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Vil du slette data og deaktivere appen?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Bruger: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Fjernet bruger"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces og <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjeneste"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces og <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjenester"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processer og <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjeneste"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Indstillinger for fysisk tastatur"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Tryk på mellemrumstasten to gange for at indsætte punktum"</string>
     <string name="show_password" msgid="3001113966880559611">"Gør adgangskoder synlige"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Denne inputmetode kan muligvis indsamle al indtastet tekst, f.eks. personlige data såsom adgangskoder og kreditkortnumre. Den kommer fra appen <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Vil du anvende denne inputmetode?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Denne stavekontrol kan muligvis indsamle al den tekst, som du skriver, også personlige data som adgangskoder og kreditkortnumre. Den kommer fra appen <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Vil du bruge denne stavekontrol?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Indstillinger"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Tryk på Ctrl-Mellemrum for at skifte"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standard"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tastaturlayout"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Brugerordbog"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personlig ordbog"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personlige ordbøger"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personlig ordbog"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Tilføj"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Føj til ordbog"</string>
@@ -1157,6 +1252,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>
@@ -1164,7 +1261,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>
@@ -1197,24 +1294,38 @@
     <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="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>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktivér Bluetooth HCI snoop log"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Gem alle Bluetooth HCI-pakker i en fil"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Vælg kørsel"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Vælg kørsel"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Genstart for at skifte kørsel fra <xliff:g id="OLD">%1$s</xliff:g> til <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Imiterede placeringer"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillad imiterede placeringer"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Kontrollér apps, der er installeret via ADB/ADT, for skadelig adfærd."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Beskyt USB-lageret"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apps skal anmode om tilladelse til at læse USB-lageret"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vil du beskytte USB-lageret?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Når USB-lageret er beskyttet, skal apps anmode om tilladelse til at læse data fra et eksternt lager."\n\n" Nogle apps fungerer muligvis ikke, før de opdateres af deres udviklere."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Når USB-lageret er beskyttet, skal apps anmode om tilladelse til at læse data fra et eksternt lager.\n\n Nogle apps fungerer muligvis ikke, før de opdateres af deres udviklere."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Beskyt SD-kortet"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apps skal anmode om tilladelse til at læse SD-kortet"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vil du beskytte SD-kortet?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Når SD-kortet er beskyttet, skal apps anmode om tilladelse til at læse data fra et eksternt lager."\n\n"Nogle apps fungerer muligvis ikke, før de opdateres af deres udviklere."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Når SD-kortet er beskyttet, skal apps anmode om tilladelse til at læse data fra et eksternt lager.\n\nNogle apps fungerer muligvis ikke, før de opdateres af deres udviklere."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokal terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktivér terminalappen, der giver lokal shell-adgang"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Vælg gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Vælg widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vil du oprette en widget og tillade adgang?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Indstillinger for tilgængelighed"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Tjenester"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Stor tekst"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Afbryderknap afslutter opkald"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Indtal adgangskoder"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Tryk og hold nede"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Styrk tilgængeligheden på nettet"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Forstørrelsesbevægelser"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Når denne funktion er slået til, kan du zoome ind og ud ved at trykke tre gange på skærmen.\n\nMens der er zoomet ind, kan du:\n"<ul><li>"panorere: Træk to eller flere fingre hen over skærmen."</li>\n<li>"justere zoomniveauet: Knib to eller flere fingre sammen, eller spred dem fra hinanden."</li></ul>\n\n"Du kan også midlertidigt forstørre, hvad der er under din finger, ved at trykke tre gange og holde fingeren på skærmen. I denne forstørrede tilstand, kan du trække fingeren for at udforske forskellige dele af skærmen. Løft fingeren for at vende tilbage til din forrige tilstand.\n\nBemærk! Du kan forstørre ved at trykke tre gange overalt undtagen på tastaturet og i navigationslinjen."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Tilgængelighedsgenvej"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Til"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Fra"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Når denne funktion er slået til, kan du hurtigt aktivere tilgænglighedsfunktioner i to trin:\n\nTrin 1: Tryk på afbryderknappen, og hold den nede, indtil du hører en lyd eller mærker en vibration.\n\nTrin 2: Tryk med to fingre, og hold nede, indtil du hører bekræftelseslyden.\n\nHvis enheden har flere brugere, aktiverer brug af denne genvej midlertidigt adgang, indtil enheden låses op."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Stor tekst"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Skærmforstørrelse"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Opdater skærmforstørrelse automatisk"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Opdater skærmforstørrelsen på appovergange"</string>
+    <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_menu_item_settings" msgid="3344942964710773365">"Indstillinger"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Tændt"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"Til"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Fra"</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="print_settings" msgid="4742428530112487843">"Udskrivning"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Indstillinger for udskrivning"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Tjenester"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vil du bruge <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> kan modtage dokumenter, du udskriver. Sådanne dokumenter kan indeholde følsomme oplysninger."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Der er ikke installeret nogen tjenester"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Indstillinger"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Tilføj printere"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Til"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Fra"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Hvad der har brugt batteriet"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Batteribrugsdata utilgængeligt."</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Mobildata blev sendt"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobildata blev modtaget"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Wi-Fi-data blev sendt"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Wi-Fi-data blev modtaget"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Lyd"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tid til"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Stop eller afinstaller appen"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Administrer GPS manuelt for at forhindre, at appen anvender den"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Denne app har muligvis indstillinger, der kan reducere batteriforbruget"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Brugerens batteriforbrug"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden afbrydelse"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Siden sidste afbrydelse for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Brugstotal"</string>
@@ -1339,7 +1467,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>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonehøjde"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Påvirker tonen af den talte tekst"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Sprog"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Der er ikke valgt sprog"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Angiver det sprog, der skal bruges til oplæsning af tekst"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Lyt til et eksempel"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Afspil en kort demonstration af talesyntese"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Lysstyrke <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatisk"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"fuld"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"halv"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"fra"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Oplysningslagring"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installer fra lager"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Når du geninstallerer en app, skal du gendanne sikkerhedskopierede indstillinger og data"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Lav fejlrapport"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Der indsamles oplysninger om din enheds aktuelle status, der efterfølgende sendes i en e-mail. Der går lidt tid, fra fejlrapporten påbegyndes, til den er klar til at blive sendt. Tak for tålmodigheden."</string>
-    <string name="report" msgid="302437572240018342">"Rapportér"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Kode til lokal sikkerhedskopi"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Lokale fuldstændige sikkerhedskopieringer er i øjeblikket ikke beskyttet"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tryk for at skifte eller fjerne adgangskoden til fuld lokal sikkerhedskopiering"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Fremhæv hele vinduesoverflader, når de opdateres"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Vis opdat. af GPU-visn."</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Fremhæv visninger i vinduer, når de tegnes med GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Se opdat. af hardwarelag"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Hardwarelag blinker grønt, når de opdateres"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Ret GPU-overlapsfejl"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Vis CPU-forbrug"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Skærmoverlejring viser det aktuelle CPU-forbrug"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Tving gengivelse af GPU"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simuler sekundære skærme"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Behold ikke aktiviteter"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Luk hver aktivitet, så snart brugeren forlader den"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Deaktiver baggrundsdata på mobilnetværk. Netværk, som ikke er mobilnetværk, vil blive brugt, hvis de er tilgængelige."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Hvis du vil begrænse baggrundsdata for denne app, skal du først angive en mobildatagrænse."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Vil du begrænse baggrundsdata?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Denne funktion kan medføre, at en app, der er afhængig af baggrundsdata, ikke længere fungerer, når der kun er mobilnetværk til rådighed."\n\n"Du kan finde mere hensigtsmæssige metoder til kontrol af dataforbruget i de indstillinger, der er tilgængelige i selve appen."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Denne funktion kan medføre, at en app, der er afhængig af baggrundsdata, ikke længere fungerer, når der kun er mobilnetværk til rådighed.\n\nDu kan finde mere hensigtsmæssige metoder til kontrol af dataforbruget i de indstillinger, der er tilgængelige i selve appen."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Begrænsning af baggrundsdata er kun muligt, hvis du har angivet en grænse for mobildata."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Slå aut. synk. af data til?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Alle ændringer, som du foretager på dine konti på nettet, vil automatisk blive kopieret til din tablet."\n\n" Der vil muligvis også være nogle konti, hvor de ændringer, du foretager på telefonen, automatisk kopieres til internettet. Sådan fungerer en Google-konto."\n\n"Du kan vælge, hvilke former for oplysninger, der skal synkroniseres på hver konto, ved at gå til Indstillinger &gt; Konti."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Alle ændringer, som du foretager på dine konti på nettet, vil automatisk blive kopieret til din telefon."\n\n" Der vil muligvis også være nogle konti, hvor de ændringer, du foretager på telefonen, automatisk kopieres til internettet. Sådan fungerer en Google-konto."\n\n"Du kan vælge, hvilke former for oplysninger, der skal synkroniseres på hver konto, ved at gå til Indstillinger &gt; Konti."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Alle ændringer, som du foretager på dine konti på nettet, vil automatisk blive kopieret til din tablet.\n\n Der vil muligvis også være nogle konti, hvor de ændringer, du foretager på telefonen, automatisk kopieres til internettet. Sådan fungerer en Google-konto.\n\nDu kan vælge, hvilke former for oplysninger, der skal synkroniseres på hver konto, ved at gå til Indstillinger &gt; Konti."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Alle ændringer, som du foretager på dine konti på nettet, vil automatisk blive kopieret til din telefon.\n\n Der vil muligvis også være nogle konti, hvor de ændringer, du foretager på telefonen, automatisk kopieres til internettet. Sådan fungerer en Google-konto.\n\nDu kan vælge, hvilke former for oplysninger, der skal synkroniseres på hver konto, ved at gå til Indstillinger &gt; Konti."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Slå aut. synk. af data fra?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Dette vil sænke data- og batteriforbruget, men du skal til gengæld synkronisere hver konto manuelt for at hente de seneste oplysninger, og du vil ikke modtage underretninger, når der kommer nye opdateringer."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Dato for nulstilling af forbrugsperiode"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Angiv en advarsel om dataforbrug"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Angiv en grænse for dataforbrug"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Grænse for dataforbrug"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Din mobildataforbindelse deaktiveres, når den angivne grænse er nået.\n\nDa 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\nDa 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" 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\nDenne 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\nDenne 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Fjernede apps og brugere"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> modtaget, <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>: ca. <xliff:g id="TOTAL">%1$s</xliff:g> brugt."</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> 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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Tilføj VPN-profil"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Rediger profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Slet profil"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Always-on VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Vælg en VPN-profil, som der altid skal være forbindelse til. Netværkstrafik tillades kun, når der er forbindelse til denne VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ingen"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Always-on VPN kræver en IP-adresse til både server og DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Der er ingen netværksforbindelse. Prøv igen senere."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Der mangler et certifikat. Rediger profilen."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annuller"</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">"Yderligere systemopdateringer"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Brugere og begrænsninger"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Brugere"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Tilføj bruger"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Rediger oplysninger"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Brugeroplysninger"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Navn"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Indholdsbegrænsninger"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Kræv pinkode"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Bedømmelse af indhold"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Systemapps"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Installerede aps"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Kassér"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Fjern bruger"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Irriterende unge"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Deaktiveret"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Eftergivende"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Håndhæver"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Brugere"</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="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\nNår du opretter en ny bruger, skal denne person gennemgå en oprettelsesproces.\n\nAlle 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\nAlle 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_confirm_remove_message" msgid="5284111415714437285">"Er du sikker på, at du vil fjerne brugeren og alle tilhørende data fra enheden?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Skift skriftstørrelse"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Begrænsninger"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Fjern begrænsninger"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Skift pinkode"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Vis meddelelser"</string>
     <string name="help_label" msgid="1107174367904110532">"Hjælp"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Konto til indhold"</string>
+    <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="6160672982086584261">"Angiv begrænsninger for appen"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Kontrolleret af <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Denne app understøttes ikke for begrænsede profiler"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Denne app kan få adgang til dine konti"</string>
+    <string name="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 10fb68a..19b3de5 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,16 +218,127 @@
     <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="886742181977884584">"Medien"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"Medienschaltflächen"</item>
+    <item msgid="4547883971364273343">"Audiofokus"</item>
+    <item msgid="2603878814882344450">"Gesamtlautstärke"</item>
+    <item msgid="7136963238377062018">"Sprachlautstärke"</item>
+    <item msgid="4270236897655923007">"Klingeltonlautstärke"</item>
+    <item msgid="6325739889222559394">"Medienlautstärke"</item>
+    <item msgid="5762123934816216821">"Weckerlautstärke"</item>
+    <item msgid="785049718065337473">"Benachrichtigungslautstärke"</item>
+    <item msgid="6700305533746877052">"Bluetooth-Lautstärke"</item>
+    <item msgid="2029227495214047094">"aktiv lassen"</item>
+    <item msgid="26109888160231211">"Standort beobachten"</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>
+    <item msgid="5753789168376302997">"Medienschaltflächen"</item>
+    <item msgid="3265262911688671938">"Audiofokus"</item>
+    <item msgid="2098976479485046797">"Gesamtlautstärke"</item>
+    <item msgid="5660213838861789350">"Sprachlautstärke"</item>
+    <item msgid="7983336752371254444">"Klingeltonlautstärke"</item>
+    <item msgid="7878027809189330917">"Medienlautstärke"</item>
+    <item msgid="7260546305036218513">"Weckerlautstärke"</item>
+    <item msgid="9103719301075748925">"Benachrichtigungslautstärke"</item>
+    <item msgid="7025966722295861512">"Bluetooth-Lautstärke"</item>
+    <item msgid="4665183401128289653">"Aktiv lassen"</item>
+    <item msgid="8584357129746649222">"Standort"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kurz"</item>
     <item msgid="2560532955514699713">"Mittel"</item>
     <item msgid="2372711992605524591">"Lang"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (Debug)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Dalvik verwenden"</item>
+    <item msgid="5131846588686178907">"ART verwenden"</item>
+    <item msgid="4530003713865319928">"ART-Debug-Build verwenden"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nie prüfen"</item>
     <item msgid="6042769699089883931">"Nur auf DRM-Inhalte prüfen"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Animationsmaßstab: 5x"</item>
     <item msgid="1069584980746680398">"Animationsmaßstab: 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Keine"</item>
+    <item msgid="688482401508173818">"720 x 480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280 x 720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280 x 720 tvdpi und 1920 x 1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Keine"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Aus"</item>
+    <item msgid="7688197031296835369">"Überschneidungsbereiche anzeigen"</item>
+    <item msgid="8332661909019981149">"Überschneidungszähler anzeigen"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardlimit"</item>
     <item msgid="4071574792028999443">"Keine Hintergrundprozesse"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Timeout"</item>
     <item msgid="7664124146786465092">"Nicht erfolgreich"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Fragen"</item>
+    <item msgid="5077768429488260031">"Nie zulassen"</item>
+    <item msgid="1417929597727989746">"Immer zulassen"</item>
+  </string-array>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9e46a36..ec67e56 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nein"</string>
     <string name="create" msgid="3578857613172647409">"Erstellen"</string>
+    <string name="allow" msgid="3349662621170855910">"Zulassen"</string>
+    <string name="deny" msgid="6947806159746484865">"Ablehnen"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Unbekannt"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"In <xliff:g id="STEP_COUNT">%1$d</xliff:g> Schritt sind Sie ein Entwickler."</item>
+    <item quantity="other" msgid="6722953419953594148">"In <xliff:g id="STEP_COUNT">%1$d</xliff:g> Schritten sind Sie ein Entwickler."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Sie sind jetzt ein Entwickler!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Okay, sind Sie bereits ein Entwickler."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"Drahtlos &amp; Netzwerke"</string>
     <string name="header_category_device" msgid="5781174212691167553">"Gerät"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"Nutzer"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Wird geladen"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Akkubetrieb"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(drahtlos)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Wird nicht geladen"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Wird nicht geladen"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Voll"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Nicht angeschlossen"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"drahtlos"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Unbekannt"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Unbekannt"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Unbekannter Fehler"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Kalt"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Sichtbar"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Sichtbar für alle Bluetooth-Geräte in der Nähe (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Sichtbar für alle Bluetooth-Geräte in der Nähe"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nicht sichtbar für andere Bluetooth-Geräte"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Nur sichtbar für Partnergeräte"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gerät sichtbar machen"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timeout für Sichtbarkeit"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Festlegen, wie lange das Gerät sichtbar sein soll"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Sprachwahl sperren"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Verwendung des Bluetooth-Dialers bei gesperrtem Bildschirm verhindern"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-Geräte"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Erhaltene Dateien anzeigen"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth-Geräteauswahl"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-Berechtigungsanfrage"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Eine App versucht, Bluetooth zu aktivieren. Zulassen?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Eine App auf Ihrem Tablet versucht, Ihr Tablet für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Bluetooth-Geräte sichtbar zu machen. Möchten Sie dies zulassen?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Eine App auf Ihrem Telefon versucht, Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Bluetooth-Geräte sichtbar zu machen. Möchten Sie dies zulassen?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Eine App auf Ihrem Tablet versucht, Ihr Telefon für andere Bluetooth-Geräte dauerhaft sichtbar zu machen. Möchten Sie dies zulassen?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Eine App auf Ihrem Telefon versucht, Ihr Telefon immer für andere Bluetooth-Geräte sichtbar zu machen. Möchten Sie dies zulassen?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Eine App auf Ihrem Tablet versucht, Blueooth zu aktivieren und Ihr Tablet für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Geräte sichtbar zu machen. Möchten Sie dies zulassen?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Eine App auf Ihrem Telefon versucht, Bluetooth zu aktivieren und Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Telefone sichtbar zu machen. Möchten Sie dies zulassen?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Eine App auf Ihrem Tablet versucht, Bluetooth zu aktivieren und Ihr Tablet für andere Geräte erkennbar zu machen. Zulassen?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Eine App auf Ihrem Telefon versucht, Bluetooth zu aktivieren und Ihr Telefon für andere Geräte sichtbar zu machen. Möchten Sie dies zulassen?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Eine App versucht, Bluetooth zu aktivieren."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Eine App versucht, Ihr Tablet für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Bluetooth-Geräte sichtbar zu machen."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Eine App versucht, Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Bluetooth-Geräte sichtbar zu machen."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Eine App versucht, Ihr Tablet für andere Bluetooth-Geräte sichtbar zu machen. Sie können diese Einstellung später in den Bluetooth-Einstellungen ändern."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Eine App versucht, Ihr Telefon für andere Bluetooth-Geräte sichtbar zu machen. Sie können diese Einstellung später in den Bluetooth-Einstellungen ändern."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Eine App versucht, Bluetooth zu aktivieren und Ihr Tablet für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Geräte sichtbar zu machen."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Eine App versucht, Bluetooth zu aktivieren und Ihr Telefon für <xliff:g id="TIMEOUT">%1$d</xliff:g> Sekunden für andere Geräte sichtbar zu machen."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Eine App versucht, Bluetooth zu aktivieren und Ihr Tablet für andere Geräte sichtbar zu machen. Sie können diese Einstellung später in den Bluetooth-Einstellungen ändern."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Eine App versucht, Bluetooth zu aktivieren und Ihr Telefon für andere Geräte sichtbar zu machen. Sie können diese Einstellung später in den Bluetooth-Einstellungen ändern."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth wird aktiviert..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth wird deaktiviert..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatische Verbindung"</string>
@@ -177,7 +184,7 @@
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Umgehung des Proxys für"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Standard wiederherstellen"</string>
-    <string name="proxy_action_text" msgid="2957063145357903951">"Fertigstellen"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Fertig"</string>
     <string name="proxy_hostname_label" msgid="8490171412999373362">"Proxy-Hostname"</string>
     <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Achtung"</string>
@@ -187,9 +194,10 @@
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"Sie müssen das Feld für den Port ausfüllen."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Das Feld für den Port muss leer sein, wenn das Feld für den Host leer ist."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Der eingegebene Port ist ungültig."</string>
-    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Der HTTP-Proxy wird vom Browser verwendet, darf aber nicht von anderen Apps verwendet werden."</string>
+    <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Der HTTP-Proxy wird vom Browser verwendet, möglicherweise aber nicht von anderen Apps."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Standort:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Benachbarte CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Netz-Info:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Datenversuche:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-Service:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -247,7 +255,7 @@
     <string name="activity_picker_label" msgid="6295660302548177109">"Aktivität auswählen"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Geräteinfo"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Akkuinfo"</string>
-    <string name="display_label" msgid="8074070940506840792">"Bildschirm"</string>
+    <string name="display_label" msgid="8074070940506840792">"Display"</string>
     <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Tablet-Informationen"</string>
     <string name="phone_info_label" product="default" msgid="2127552523124277664">"Über das Telefon"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-Speicher"</string>
@@ -260,14 +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, da Sie Ihr Heimnetzwerk verlassen haben und Daten-Roaming nicht aktiviert ist."</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_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\nDiese 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\nDiese 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>
@@ -293,10 +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>
@@ -308,14 +322,14 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Numerische PIN oder Passwort festlegen, mit dem das Tablet beim Einschalten entschlüsselt werden muss"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Numerische PIN oder Passwort festlegen, mit dem das Telefon beim Einschalten entschlüsselt werden muss"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Verschlüsselt"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps mit den dazugehörigen Daten sowie Multimedia- und andere Dateien verschlüsseln. Nach der Verschlüsselung Ihres Tablets ist bei jedem Einschalten die Eingabe einer PIN-Nummer oder eines Passworts erforderlich. Sie können die Verschlüsselung Ihres Tablets nur aufheben, indem Sie das Gerät auf die Werkseinstellungen zurücksetzen. Dabei werden alle Ihre Daten gelöscht."\n\n"Die Verschlüsselung dauert mindestens eine Stunde. Vergewissern Sie sich zu Beginn, dass Ihr Akku vollständig geladen ist, und lassen Sie Ihr Tablet angeschlossen, bis die Verschlüsselung abgeschlossen ist. Eine Unterbrechung dieses Vorgangs kann zu teilweisem oder vollständigem Datenverlust führen."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps mit den dazugehörigen Daten sowie Multimedia- und andere Dateien verschlüsseln. Nach der Verschlüsselung Ihres Telefons ist bei jedem Einschalten die Eingabe einer PIN-Nummer oder eines Passworts erforderlich. Sie können die Verschlüsselung Ihres Telefons nur aufheben, indem Sie das Gerät auf die Werkseinstellungen zurücksetzen. Dabei werden alle Ihre Daten gelöscht."\n\n"Die Verschlüsselung dauert mindestens eine Stunde. Vergewissern Sie sich zu Beginn, dass Ihr Akku vollständig geladen ist, und lassen Sie Ihr Telefon angeschlossen, bis die Verschlüsselung abgeschlossen ist. Eine Unterbrechung dieses Vorgangs kann zu teilweisem oder vollständigem Datenverlust führen."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps mit den dazugehörigen Daten sowie Multimedia- und andere Dateien verschlüsseln. Nach der Verschlüsselung Ihres Tablets ist bei jedem Einschalten die Eingabe einer PIN-Nummer oder eines Passworts erforderlich. Sie können die Verschlüsselung Ihres Tablets nur aufheben, indem Sie das Gerät auf die Werkseinstellungen zurücksetzen. Dabei werden alle Ihre Daten gelöscht.\n\nDie Verschlüsselung dauert mindestens eine Stunde. Vergewissern Sie sich zu Beginn, dass Ihr Akku vollständig geladen ist, und lassen Sie Ihr Tablet angeschlossen, bis die Verschlüsselung abgeschlossen ist. Eine Unterbrechung dieses Vorgangs kann zu teilweisem oder vollständigem Datenverlust führen."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps mit den dazugehörigen Daten sowie Multimedia- und andere Dateien verschlüsseln. Nach der Verschlüsselung Ihres Telefons ist bei jedem Einschalten die Eingabe einer PIN-Nummer oder eines Passworts erforderlich. Sie können die Verschlüsselung Ihres Telefons nur aufheben, indem Sie das Gerät auf die Werkseinstellungen zurücksetzen. Dabei werden alle Ihre Daten gelöscht.\n\nDie Verschlüsselung dauert mindestens eine Stunde. Vergewissern Sie sich zu Beginn, dass Ihr Akku vollständig geladen ist, und lassen Sie Ihr Telefon angeschlossen, bis die Verschlüsselung abgeschlossen ist. Eine Unterbrechung dieses Vorgangs kann zu teilweisem oder vollständigem Datenverlust führen."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tablet verschlüsseln"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefon verschlüsseln"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laden Sie Ihren Akku auf und versuchen Sie es erneut."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Schließen Sie Ihr Ladegerät an und versuchen Sie es erneut."</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Keine PIN oder kein Passwort für Bildschirmsperre"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Sie müssen eine PIN oder ein Passwort für die Bildschirmsperre festlegen, bevor Sie die Verschlüsselung starten können."</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Keine PIN oder kein Passwort für Display-Sperre"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Sie müssen eine PIN oder ein Passwort für die Display-Sperre festlegen, bevor Sie die Verschlüsselung starten können."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Verschlüsseln?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Dieser Vorgang ist nicht umkehrbar und jede Unterbrechung ist mit einem Datenverlust verbunden. Die Verschlüsselung dauert mindestens eine Stunde. In dieser Zeit wird das Tablet mehrfach neu gestartet."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Dieser Vorgang ist nicht umkehrbar und jede Unterbrechung ist mit einem Datenverlust verbunden. Die Verschlüsselung dauert mindestens eine Stunde. In dieser Zeit wird das Telefon mehrfach neu gestartet."</string>
@@ -323,15 +337,15 @@
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Bitte warten Sie, während Ihr Tablet verschlüsselt wird. Zu <xliff:g id="PERCENT">^1</xliff:g> % abgeschlossen."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Bitte warten Sie, während Ihr Telefon verschlüsselt wird. Zu <xliff:g id="PERCENT">^1</xliff:g> % abgeschlossen."</string>
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Versuchen Sie es in <xliff:g id="DELAY">^1</xliff:g> Sekunden erneut."</string>
-    <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Geben Sie Ihr Passwort ein."</string>
+    <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Passwort eingeben"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Verschlüsselung fehlgeschlagen"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Daher ist der Zugriff auf die Daten auf Ihrem Tablet nicht mehr möglich. "\n\n"Damit Sie Ihr Tablet wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen. Wenn Sie Ihr Tablet nach dem Zurücksetzen wieder einrichten, können Sie gegebenenfalls Daten, die gesichert wurden, in Ihrem Google-Konto wiederherstellen."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Daher ist der Zugriff auf die Daten auf Ihrem Telefon nicht mehr möglich. "\n\n"Damit Sie Ihr Telefon wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen. Wenn Sie Ihr Telefon nach dem Zurücksetzen wieder einrichten, können Sie gegebenenfalls Daten, die gesichert wurden, in Ihrem Google-Konto wiederherstellen."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Daher ist der Zugriff auf die Daten auf Ihrem Tablet nicht mehr möglich. \n\nDamit Sie Ihr Tablet wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen. Wenn Sie Ihr Tablet nach dem Zurücksetzen wieder einrichten, können Sie gegebenenfalls Daten, die gesichert wurden, in Ihrem Google-Konto wiederherstellen."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Daher ist der Zugriff auf die Daten auf Ihrem Telefon nicht mehr möglich. \n\nDamit Sie Ihr Telefon wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen. Wenn Sie Ihr Telefon nach dem Zurücksetzen wieder einrichten, können Sie gegebenenfalls Daten, die gesichert wurden, in Ihrem Google-Konto wiederherstellen."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Eingabemethode wechseln"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Display-Sperre wählen"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Ersatzsperre wählen"</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bildschirmsperre"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Bildschirmsperre ändern"</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Display-Sperre"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Display-Sperre ändern"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Sperre (Muster, PIN, Passwort) ändern oder deaktivieren"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Methode zum Sperren des Bildschirms wählen"</string>
     <string name="unlock_backup_info_summary" msgid="108524727803788172">"Wie soll die Entsperrung erfolgen, wenn Sie für Face Unlock nicht erkennbar sind?"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Entsperrungs-PIN ändern"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Entsperrungspasswort ändern"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Das Passwort muss mindestens %d Zeichen enthalten."</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Die PIN muss mindestens %d Zeichen enthalten."</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Die PIN muss mindestens %d Ziffern enthalten."</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Wählen Sie \"Weiter\", sobald Sie fertig sind."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Weiter"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Das Passwort muss weniger als <xliff:g id="NUMBER">%d</xliff:g> Zeichen haben."</string>
@@ -406,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>
@@ -426,7 +449,7 @@
     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Abbrechen"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> war nicht möglich."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> war nicht möglich, da die eingegebene PIN oder der Schlüssel falsch ist."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> war nicht möglich, weil die eingegebene PIN oder der Schlüssel falsch ist."</string>
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Kommunikation mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist nicht möglich."</string>
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Verbindung wurde von <xliff:g id="DEVICE_NAME">%1$s</xliff:g> abgelehnt."</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"Keine Verbindung zu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> möglich"</string>
@@ -470,7 +493,7 @@
     <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nicht mit Dateiübertragungsserver verbunden"</string>
     <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Mit einem Eingabegerät verbunden"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Für Internetzugriff an Gerät angeschlossen"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Lokale Internetverbindung für Gerät freigegeben"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Lokale Internetverbindung für Gerät freigeben"</string>
     <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Für Audiosystem von Medien verwenden"</string>
     <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Für Audiosystem des Telefons verwenden"</string>
     <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Für Dateiübertragung verwenden"</string>
@@ -481,64 +504,98 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Als Lautsprechertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Für Musik und Medien"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Einstellungen speichern"</string>
+    <string name="wifi_display_settings_title" msgid="564299108014609382">"Kabellose Übertragung (WiDi)"</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Um Geräte zu sehen, aktivieren Sie die kabellose Übertragung (WiDi)."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Kabellose Übertragung (WiDi) ist deaktiviert, da WLAN ausgeschaltet 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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Gekoppelte Displays"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Verfügbare Geräte"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Verbindung wird hergestellt..."</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Verbunden"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Verfügbar"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"In Verwendung"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Display-Einstellungen"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Verbindung trennen?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Hierdurch wird die Verbindung mit&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; getrennt."</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Optionen für kabellose Übertragung (WiDi)"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Entfernen"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Fertig"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Name"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"An"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Aus"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Deaktiviert"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Datenaustausch bei Kontakt mit anderen Geräten zulassen"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Datenaustausch bei Kontakt mit anderen Geräten zulassen"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Bereit zur Übertragung von App-Inhalten über NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Aus"</string>
-    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nicht verfügbar, da NFC deaktiviert ist"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nicht verfügbar, weil NFC deaktiviert ist"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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\nHalten 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 Standby-Modus 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="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="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="8116564886303972764">"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_in_progress" msgid="2944576520214787628">"WPS ist bereits im Aufbau. Dies kann bis zu 2 Minuten dauern."</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Die Sicherheitseinstellung für drahtlose Router (TKIP) wird nicht unterstützt."</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Authentifizierungsfehler. Bitte 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>
@@ -565,6 +622,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\nMö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>
@@ -572,8 +632,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Speichern"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Netzwerk konnte nicht gespeichert werden."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Abbrechen"</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_skip_anyway" msgid="6965361454438011190">"Trotzdem überspringen"</string>
+    <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\nDas 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\nDas Einrichten des Telefons kann eine erhöhte Netzwerkaktivität erfordern."</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>
@@ -589,13 +657,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Suche läuft…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Gerät umbenennen"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Peer-Geräte"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Gespeicherte Gruppen"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Verbindung nicht möglich"</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Gerät konnte nicht umbenannt werden."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Verbindung trennen?"</string>
@@ -603,11 +672,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Wenn Sie die Verbindung trennen, wird Ihre Verbindung mit <xliff:g id="PEER_NAME">%1$s</xliff:g> und <xliff:g id="PEER_COUNT">%2$s</xliff:g> weiteren Geräten beendet."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Mobiler WLAN-Hotspot"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Diese Gruppe entfernen?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Mobiler WLAN-Hotspot"</string>
+    <string name="wifi_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>
@@ -617,12 +689,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Musikeffekte"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Klingeltonlautstärke"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Im Lautlos-Modus vibrieren"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Standardbenachrichtigung"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Standard-Benachrichtigungston"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Benachrichtigungslicht"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Klingelton"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Benachrichtigung"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Lautstärke für eingehende Anrufe für Benachrichtigungen verwenden"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Benachrichtigungston auswählen"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Standard-Benachrichtigungston"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Medien"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Lautstärke für Musik und Videos festlegen"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Wecker"</string>
@@ -672,15 +744,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Hintergrund"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Hintergrund auswählen"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Bildschirm-Dekor"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Wird bei Netzanschluss bei Aktivierung des Standby-Modus gestartet"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Deaktiviert"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Ausgewähltes Dekor"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Zeitpunkt der Aktivierung"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nie"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Testen"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Auch bei angedocktem Gerät starten"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Bei angedocktem Gerät oder im Ruhezustand beim Aufladen"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Immer"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Während des Ladevorgangs"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Bei angedocktem Gerät"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Aus"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Um festzulegen, was geschieht, wenn das Telefon angedockt oder im Ruhezustand ist, aktivieren Sie \"Daydream\"."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Daydream starten"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Jetzt starten"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Einstellungen"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische Helligkeit"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Schriftgröße"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Schriftgröße"</string>
@@ -702,9 +775,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN für SIM-Karte"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Falsche PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Die PINs stimmen nicht überein."</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"PIN kann nicht geändert werden."\n"Möglicherweise ist es die falsche PIN."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"PIN kann nicht geändert werden.\nMöglicherweise ist es die falsche PIN."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-PIN erfolgreich geändert"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Status der SIM-Kartensperrung kann nicht geändert werden."\n"Möglicherweise falsche PIN."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Status der SIM-Kartensperrung kann nicht geändert werden.\nMöglicherweise falsche PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Abbrechen"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tablet-Status"</string>
@@ -717,6 +790,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Baseband-Version"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel-Version"</string>
     <string name="build_number" msgid="3075795840572241758">"Build-Nummer"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux-Status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nicht verfügbar"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -734,12 +808,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">"Art des Mobilfunknetzes"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Details zum Mobilfunkanbieter"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Status des Mobilfunknetzes"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Servicestatus"</string>
     <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>
@@ -749,19 +824,21 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-Speicher"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-Karte"</string>
     <string name="memory_available" msgid="5052397223077021181">"Verfügbar"</string>
+    <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="sd_eject" product="nosdcard" msgid="4988563376492400073">"Gem. Speicher trennen"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Daten im Cache"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Gemeinsamen Speicher trennen"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-Karte entnehmen"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Internen USB-Speicher trennen"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SD-Karte trennen, damit Sie sie sicher entfernen können"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"USB-Sp. für Bereitst. einlegen"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"USB-Speicher für Bereitst. einlegen"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"SD-Karte zur Bereitstellung einlegen"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"USB-Speicher bereitst."</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"SD-Karte bereitstellen"</string>
@@ -771,7 +848,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD-Karte löschen"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Löscht alle Daten, z. B. Musik und Fotos, aus dem internen USB-Speicher"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Löscht sämtliche Daten wie Musik und Fotos von der SD-Karte"</string>
-    <string name="read_only" msgid="6702420168629076340">" (schreibgeschützt)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Daten im Cache löschen?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Daten im Cache werden für alle Apps gelöscht."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP- oder PTP-Funktion ist aktiv."</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"USB-Speicher trennen?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"SD-Karte entnehmen?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Wenn Sie den USB-Speicher trennen, werden einige von Ihnen verwendete Apps angehalten. Diese stehen möglicherweise erst dann wieder zur Verfügung, wenn Sie den USB-Speicher wieder bereitstellen."</string>
@@ -794,6 +873,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Ermöglicht die Übertragung von Fotos mithilfe der Kamera-Software sowie die Übertragung von Dateien auf Computer, die MTP nicht unterstützen"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Dateiübertragungstools installieren"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Andere Nutzer"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Akkustatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akkuladung"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -823,6 +903,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>
@@ -838,9 +920,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Auf Werkszustand zurück"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Löscht alle Daten auf dem Tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Löscht alle Daten auf dem Telefon"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Tablets gelöscht, u. a."\n\n<li>"Ihr Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Telefons gelöscht, u. a."\n\n<li>"Ihr Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Sie sind zurzeit in folgenden Konten angemeldet:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Tablets gelöscht, u. a.\n\n"<li>"Ihr Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Telefons gelöscht, u. a.\n\n"<li>"Ihr Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Sie sind zurzeit in folgenden Konten angemeldet:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Fotos"</li>\n<li>"Sonstige Nutzerdaten"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss der "<b>"USB-Speicher"</b>" gelöscht werden."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss die "<b>"SD-Karte"</b>" gelöscht werden."</string>
@@ -850,11 +932,11 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Alle Daten, z. B. Musik und Fotos, von der SD-Karte löschen"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Tablet zurücksetzen"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefon zurücksetzen"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Alle persönlichen Daten und heruntergeladenen Apps löschen? Diese Aktion kann nicht rückgängig gemacht werden!"</string>
+    <string name="master_clear_final_desc" msgid="7209547812233487345">"Alle personenbezogenen Daten und heruntergeladenen Apps löschen? Diese Aktion kann nicht rückgängig gemacht werden!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Alles löschen"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Zurücksetzen auf die Werkseinstellungen zu bestätigen."</string>
-    <string name="master_clear_failed" msgid="7959646179737950703">"Die Zurücksetzung konnte nicht durchgeführt werden, da der Dienst zur Systembereinigung nicht verfügbar ist."</string>
+    <string name="master_clear_failed" msgid="7959646179737950703">"Die Zurücksetzung konnte nicht durchgeführt werden, weil der Dienst zur Systembereinigung nicht verfügbar ist."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Zurücksetzen?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"USB-Speicher löschen"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"SD-Karte löschen"</string>
@@ -885,39 +967,45 @@
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"Keine USB-Verbindung"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB-Tethering-Fehler"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-Tethering"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Internetverbindung des Tablets freigegeben"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Internetverbindung dieses Telefons freigegeben"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Internetverbindung des Tablets freigeben"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Internetverbindung dieses Telefons freigeben"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Internetverbindung des Tablets für ein Gerät freigegeben"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Internetverbindung dieses Telefons für ein Gerät freigegeben"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Internetverbindung des Tablets für <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> Geräte freigegeben"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Internetverbindung dieses Telefons für <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> Geräte freigegeben"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Internetverbindung des Tablets nicht freigegeben"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Internetverbindung dieses Telefons nicht freigegeben"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Internetverbindung des Tablets freigeben"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Internetverbindung dieses Telefons freigeben"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Kein Tethering"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="6285122039489881969">"Tethering nur für maximal <xliff:g id="MAXCONNECTION">%1$d</xliff:g> Geräte möglich"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Tethering für <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird deaktiviert."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hilfe"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilfunknetze"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Mobildatentarif verwalten"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Unbekannter SIM-Anbieter"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Keine Bereitstellungs-Website für %1$s bekannt"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Legen Sie die SIM ein und starten das Gerät neu."</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Bitte stellen Sie eine Verbindung zum Internet her."</string>
     <string name="location_title" msgid="1029961368397484576">"Mein Standort"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"WLAN- und Mobilfunknetz-Standort"</string>
-    <string name="location_neighborhood_level" msgid="5626515380188353712">"Apps können Ihren 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_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="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 Ihren Standort mithilfe von GPS auf Ihrem Tablet bestimmen."</string>
-    <string name="location_street_level" product="default" msgid="4617445745492014203">"Apps dürfen Ihren Standort mithilfe von GPS auf Ihrem Telefon bestimmen."</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>
     <string name="assisted_gps" msgid="4649317129586736885">"Unterstütztes GPS verwenden"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Server zur Unterstützung von GPS verwenden (zur Verringerung der Netzwerkauslastung nicht auswählen)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Server zur Unterstützung von GPS verwenden (zur Verbesserung der GPS-Leistung deaktivieren)"</string>
     <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">"Apps, die Sie um die entsprechende Berechtigung gebeten haben, können Ihre Standortinformationen verwenden."</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>
     <string name="about_settings_summary" msgid="3371517697156165959">"Rechtliche Hinweise, Status und Softwareversion anzeigen"</string>
     <string name="legal_information" msgid="5769301644270604095">"Rechtliche Hinweise"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Mitwirkende"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Regulierungsinformationen"</string>
     <string name="copyright_title" msgid="865906688917260647">"Urheberrecht"</string>
     <string name="license_title" msgid="1990487604356037871">"Lizenz"</string>
     <string name="terms_title" msgid="7697580845616764642">"Nutzungsbedingungen"</string>
@@ -936,7 +1024,7 @@
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN bestätigen"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Die Passwörter stimmen nicht überein."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Die PINs stimmen nicht überein."</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Auswahl entsperren"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Sperre einrichten"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Das Passwort wurde festgelegt."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Die PIN wurde festgelegt."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Das Muster wurde festgelegt."</string>
@@ -945,7 +1033,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Entsperrungs-PIN ändern"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Gespeichertes Muster bestätigen"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Erneut versuchen:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Zeichnen Sie ein Entsperrungsmuster."</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Zeichnen Sie ein Entsperrungsmuster:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Menütaste drücken, um die Hilfe aufzurufen"</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Lassen Sie die Tasten los, wenn Sie fertig sind."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Verbinden Sie mindestens <xliff:g id="NUMBER">%d</xliff:g> Punkte. Versuchen Sie es erneut:"</string>
@@ -967,12 +1055,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Zeichnen eines Entsperrungsmusters"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Zu viele fehlgeschlagene Versuche!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"In <xliff:g id="NUMBER">%d</xliff:g> Sekunden erneut versuchen."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Abbrechen"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Weiter"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sichern Ihres Tablets"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Telefon sichern"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Schützen Sie Ihr Tablet vor unbefugtem Zugriff: Erstellen Sie ein persönliches Entsperrungsmuster für Ihren Bildschirm. Verbinden Sie auf dem nächsten Bildschirm in beliebiger Reihenfolge mindestens vier Punkte mit dem Finger."\n\n"Bereit? Tippen Sie auf \"Weiter\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Schützen Sie Ihr Telefon vor unbefugtem Zugriff! Erstellen Sie ein persönliches Entsperrungsmuster für Ihren Bildschirm. Verbinden Sie auf dem nächsten Bildschirm in beliebiger Reihenfolge mindestens vier Punkte mit dem Finger. "\n\n"Bereit? Dann tippen Sie auf \"Weiter\"."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"App ist nicht auf dem Telefon installiert."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Apps verwalten"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Installierte Apps verwalten und entfernen"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Apps"</string>
@@ -980,8 +1063,10 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"App-Einstellungen"</string>
     <string name="install_applications" msgid="4872012136210802181">"Unbekannte Herkunft"</string>
     <string name="install_unknown_applications" msgid="176855644862942064">"Installation von Apps aus unbekannten Quellen zulassen"</string>
-    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Apps mit unbekannter Herkunft können gefährlich für Ihr Tablet und Ihre persönlichen Daten sein. Sie stimmen zu, dass Sie die Verantwortung für alle Schäden an Ihrem Tablet und jegliche Datenverluste tragen, die aus der Verwendung dieser Apps entstehen können."</string>
-    <string name="install_all_warning" product="default" msgid="8113734576826384682">"Apps mit unbekannter Herkunft können gefährlich für Ihr Telefon und Ihre persönlichen Daten sein. Sie stimmen zu, dass Sie die Verantwortung für alle Schäden an Ihrem Telefon und jegliche Datenverluste tragen, die aus der Verwendung dieser Apps entstehen können."</string>
+    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Apps mit unbekannter Herkunft können gefährlich für Ihr Tablet und Ihre personenbezogenen Daten sein. Sie stimmen zu, dass Sie die Verantwortung für alle Schäden an Ihrem Tablet und jegliche Datenverluste tragen, die aus der Verwendung dieser Apps entstehen können."</string>
+    <string name="install_all_warning" product="default" msgid="8113734576826384682">"Apps mit unbekannter Herkunft können gefährlich für Ihr Telefon und Ihre personenbezogenen Daten sein. Sie stimmen zu, dass Sie die Verantwortung für alle Schäden an Ihrem Telefon und jegliche Datenverluste tragen, die aus der Verwendung dieser Apps entstehen können."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Apps verifizieren"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Installation schädlicher Apps blockieren oder Warnung senden"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Erweiterte Einstellungen"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Weitere Einstellungsoptionen aktivieren"</string>
     <string name="application_info_label" msgid="5736524913065714880">"App-Info"</string>
@@ -994,7 +1079,7 @@
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Cache leeren"</string>
     <string name="cache_size_label" msgid="7505481393108282913">"Cache"</string>
     <string name="controls_label" msgid="7611113077086853799">"Steuerung"</string>
-    <string name="force_stop" msgid="7435006169872876756">"Stoppen erzwingen"</string>
+    <string name="force_stop" msgid="7435006169872876756">"Beenden erzwingen"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Insgesamt"</string>
     <string name="application_size_label" msgid="8494609207373874267">"App"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"USB-Speicher-App"</string>
@@ -1002,6 +1087,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-Speicherdaten"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-Karte"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Deinstallieren"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Für alle Nutzer deinstallieren"</string>
+    <string name="install_text" msgid="884360662922471113">"Installieren"</string>
     <string name="disable_text" msgid="6544054052049395202">"Deaktivieren"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktivieren"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Daten löschen"</string>
@@ -1020,17 +1107,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Prozesse im Cache anzeigen"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"App-Einstell. zurücksetzen"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"App-Einstellungen zurücksetzen?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Hierdurch werden alle Einstellungen zurückgesetzt für:"\n\n" "<li>"Deaktivierte Apps"</li>\n" "<li>"Deaktivierte App-Benachrichtigungen"</li>\n" "<li>"Standard-Apps für Aktionen"</li>\n" "<li>"Hintergrunddatenbeschränkungen für Apps"</li>\n\n" Es gehen Ihnen keine App-Daten verloren."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Hierdurch werden alle Einstellungen zurückgesetzt für:\n\n "<li>"Deaktivierte Apps"</li>\n" "<li>"Deaktivierte App-Benachrichtigungen"</li>\n" "<li>"Standard-Apps für Aktionen"</li>\n" "<li>"Hintergrunddatenbeschränkungen für Apps"</li>\n\n" Es gehen Ihnen keine App-Daten verloren."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Apps zurücksetzen"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Speicherplatz verwalten"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Auf SD-Karte"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktiviert"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Nicht installiert"</string>
     <string name="no_applications" msgid="7336588977497084921">"Keine Apps"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interner Speicher"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-Speicher"</string>
@@ -1055,6 +1144,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> und <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Für diese App können Gebühren anfallen:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Premium-SMS senden?"</string>
     <string name="computing_size" msgid="1599186977475211186">"Berechnung..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Paketgröße konnte nicht berechnet werden."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Sie haben keine Apps von Drittanbietern installiert."</string>
@@ -1070,7 +1161,7 @@
     <string name="app_forward_locked" msgid="6331564656683790866">"Die App ist kopiergeschützt."</string>
     <string name="invalid_location" msgid="2786030127356312746">"Installationspfad ist nicht gültig."</string>
     <string name="system_package" msgid="6222593098063037137">"Systemupdates können nicht auf externen Datenträgern installiert werden."</string>
-    <string name="force_stop_dlg_title" msgid="977530651470711366">"Stoppen erzwingen?"</string>
+    <string name="force_stop_dlg_title" msgid="977530651470711366">"Beenden erzwingen?"</string>
     <string name="force_stop_dlg_text" msgid="7208364204467835578">"Das Beenden der App zu erzwingen kann zu unerwünschtem Verhalten führen."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="3465267182923054022">"App kann nicht verschoben werden. <xliff:g id="REASON">%1$s</xliff:g>"</string>
@@ -1078,13 +1169,18 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Bevorzugten Installationspfad für neue Apps ändern"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Integrierte App deaktivieren?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Durch das Deaktivieren einer integrierten App kommt es möglicherweise zu unerwünschtem Verhalten anderer Apps."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Daten löschen und App deaktivieren?"</string>
+    <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>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Momentan ausgeführte Dienste anzeigen und steuern"</string>
-    <string name="service_restarting" msgid="2242747937372354306">"Neustart wird durchgeführt."</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Neustart wird durchgeführt..."</string>
     <string name="cached" msgid="1059590879740175019">"Hintergrundprozess im Cache"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Nichts wird ausgeführt."</string>
     <string name="service_started_by_app" msgid="818675099014723551">"Von der App gestartet"</string>
@@ -1095,6 +1191,8 @@
     <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">"Nutzer: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Nutzer entfernt"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> Prozess und <xliff:g id="NUMSERVICES">%2$d</xliff:g> Dienst"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> Prozess und <xliff:g id="NUMSERVICES">%2$d</xliff:g> Dienste"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> Prozesse und <xliff:g id="NUMSERVICES">%2$d</xliff:g> Dienst"</string>
@@ -1123,15 +1221,14 @@
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Autom. Ersetzung"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Tippfehler korrigieren"</string>
-    <string name="auto_caps" msgid="6379232078052591265">"Autom. Groß-/Kleinschr."</string>
+    <string name="auto_caps" msgid="6379232078052591265">"Autom. Groß-/Kleinschreibung"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Jeden Satz mit einem Großbuchstaben beginnen"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Autom. Zeichensetzung"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Einstellungen für physische Tastatur"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Leertaste zweimal drücken, um \".\" hinzuzufügen"</string>
     <string name="show_password" msgid="3001113966880559611">"Passwörter sichtbar"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"Diese Eingabemethode kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich persönlicher Daten wie Passwörter und Kreditkartennummern. Sie ist Teil der App \"<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>\". Möchten Sie diese Eingabemethode verwenden?"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"Diese Rechtschreibprüfung kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich persönlicher Daten wie Passwörter und Kreditkartennummern. Sie ist Teil der App \"<xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>\". Möchten Sie die Rechtschreibprüfung verwenden?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"Diese Eingabemethode kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich personenbezogener Daten wie Passwörter und Kreditkartennummern. Sie ist Teil der App \"<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>\". Möchten Sie diese Eingabemethode verwenden?"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"Diese Rechtschreibprüfung kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich personenbezogener Daten wie Passwörter und Kreditkartennummern. Sie ist Teil der App \"<xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>\". Möchten Sie die Rechtschreibprüfung verwenden?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Einstellungen"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Sprache"</string>
     <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Einstellungen für <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> konnten nicht geöffnet werden."</string>
@@ -1145,19 +1242,19 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Drücken Sie zum Wechseln Strg+Leertaste."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standard"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tastaturlayouts"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Mein Wörterbuch"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Mein Wörterbuch"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Persönliche Wörterbücher"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Mein Wörterbuch"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Hinzufügen"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Ins Wörterbuch"</string>
-    <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"Wortgruppe"</string>
+    <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"Wort"</string>
     <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Mehr Optionen"</string>
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Weniger Optionen"</string>
     <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"OK"</string>
     <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>
@@ -1198,24 +1295,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Display wird beim Laden nie in den Ruhezustand versetzt"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI-Snoop-Protokoll aktivieren"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Alle Bluetooth HCI-Pakete in einer Datei erfassen"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Laufzeit auswählen"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Laufzeit auswählen"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Neu starten, um Laufzeit von <xliff:g id="OLD">%1$s</xliff:g> zu <xliff:g id="NEW">%2$s</xliff:g> zu ändern?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Falsche Standorte"</string>
     <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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Überprüft installierte Apps über ADB/ADT auf schädliches Verhalten"</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USB-Speicher schützen"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apps benötigen die Berechtigung zum Lesen des USB-Speichers"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"USB-Speicher schützen?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wenn der USB-Speicher geschützt ist, benötigen Apps die Berechtigung zum Lesen von Daten aus dem externen Speicher."\n\n"Einige Apps funktionieren eventuell erst nach der Aktualisierung durch ihre Entwickler."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wenn der USB-Speicher geschützt ist, benötigen Apps die Berechtigung zum Lesen von Daten aus dem externen Speicher.\n\nEinige Apps funktionieren eventuell erst nach der Aktualisierung durch ihre Entwickler."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SD-Karte schützen"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apps benötigen die Berechtigung zum Lesen der SD-Karte"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SD-Karte schützen?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wenn die SD-Karte geschützt ist, benötigen Apps die Berechtigung zum Lesen von Daten aus dem externen Speicher."\n\n"Einige Apps funktionieren eventuell erst nach der Aktualisierung durch ihre Entwickler."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wenn die SD-Karte geschützt ist, benötigen Apps die Berechtigung zum Lesen von Daten aus dem externen Speicher.\n\nEinige Apps funktionieren eventuell erst nach der Aktualisierung durch ihre Entwickler."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokales Terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Terminal-App mit Zugriff auf lokale Shell aktivieren"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Gadget auswählen"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Widget auswählen"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widget erstellen und Zugriff erlauben?"</string>
@@ -1235,29 +1346,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Einstellungen für Bedienungshilfen"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Dienste"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Großer Text"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Ein/Aus beendet Anruf"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Passwörter aussprechen"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Reaktionszeit Berühren/Halten"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Web-Bedienung verbessern"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Vergrößerungsbewegungen"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Wenn diese Funktion aktiviert ist, können Sie heranzoomen und herauszoomen, indem Sie drei Mal auf den Bildschirm tippen.\n\nWenn Sie herangezoomt haben, können Sie:\n"<ul><li>"Schwenken: mindestens 2 Finger über den Bildschirm ziehen"</li>\n<li>"Zoomstufe anpassen: mindestens 2 Finger zusammen- oder auseinanderziehen"</li></ul>\n\n"Sie können auch das, was sich unter Ihrem Finger befindet, vorübergehend vergrößern, indem Sie drei Mal tippen und halten. In diesem vergrößerten Zustand können Sie Ihren Finger ziehen, um verschiedene Bereiche des Bildschirms zu erkunden. Heben Sie Ihren Finger an, um zum vorherigen Zustand zurückzukehren.\n\nHinweis: Das dreimalige Tippen zur Vergrößerung funktioniert überall außer in der Tastatur und in der Navigationsleiste."</string>
+    <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\nSchritt 1: Drücken und halten Sie die Ein-/Austaste, bis Sie einen Ton hören oder eine Vibration spüren.\n\nSchritt 2: Berühren und halten Sie mit zwei Fingern, bis Sie eine Audiobestätigung hören.\n\nFalls 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>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Vergrößerung bei App-Übergängen aktualisieren"</string>
+    <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_menu_item_settings" msgid="3344942964710773365">"Einstellungen"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"An"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Deaktiviert"</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 persönlicher 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 persönlicher 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="accessibility_feature_state_on" msgid="2864292320042673806">"An"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Aus"</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="print_settings" msgid="4742428530112487843">"Drucken"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Druckeinstellungen"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Dienste"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> verwenden?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> kann Ihre Druckdokumente empfangen. Diese Dokumente können vertrauliche Daten enthalten."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Keine Dienste installiert"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Einstellungen"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Drucker hinzufügen"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"An"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Aus"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Akku"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Was zum Akkuverbrauch beiträgt"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Keine Daten zum Akkuverbrauch"</string>
@@ -1266,25 +1391,25 @@
     <string name="battery_since_reset" msgid="7464546661121187045">"Akkuverbrauch seit dem Zurücksetzen"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> mit Akku"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> seit dem Ausstecken"</string>
-    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Wird geladen"</string>
+    <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>
     <string name="details_subtitle" msgid="32593908269911734">"Details"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Energieverbrauch anpassen"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Enthaltene Pakete"</string>
-    <string name="power_screen" msgid="3023346080675904613">"Bildschirm"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"WLAN"</string>
+    <string name="power_screen" msgid="3023346080675904613">"Display"</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>
@@ -1294,20 +1419,22 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Empfangene Daten"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Mobildaten gesendet"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobildaten empfangen"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"WLAN-Daten gesendet"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"WLAN-Daten empfangen"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Laufzeit"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Zeit ohne Signal"</string>
-    <string name="battery_action_stop" msgid="649958863744041872">"Stoppen erzwingen"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Beenden erzwingen"</string>
     <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>
@@ -1316,8 +1443,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>
@@ -1325,6 +1452,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"App anhalten oder deinstallieren"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"GPS manuell steuern, damit die App es nicht verwenden kann."</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Die App bietet unter Umständen Einstellungen für einen geringeren Akkuverbrauch."</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Akkuverbrauch durch Nutzer"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> seit dem Ausstecken"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Seit dem letzten Ausstecken für <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Verbrauch insgesamt"</string>
@@ -1349,8 +1477,9 @@
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Sprechgeschwindigkeit"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Geschwindigkeit, mit der der Text gesprochen wird"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonlage"</string>
-    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Beeinflusst den Klang des gesprochenen Texts"</string>
+    <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Beeinflusst den Klang des gesprochenen Textes"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Sprache"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Keine Sprache ausgewählt"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Legt die sprachspezifische Stimme für den gesprochenen Text fest"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Beispiel anhören"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Kurze Demonstration der Sprachsynthese abspielen"</string>
@@ -1361,7 +1490,8 @@
     <string name="tts_engine_error" msgid="3305141107104670703">"Das ausgewählte Modul kann nicht ausgeführt werden."</string>
     <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 persönlicher 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_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>
@@ -1379,8 +1509,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Helligkeit <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatisch"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"voll"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"halb"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"aus"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Anmeldedatenspeicher"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Von Speicher installieren"</string>
@@ -1391,6 +1535,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>
@@ -1404,22 +1551,19 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Speicher wurde gelöscht."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Anmeldedaten nicht gelöscht"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Der Anmeldeinformationsspeicher ist aktiviert."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Zur Verwendung des Anmeldeinformationsspeichers müssen Sie eine PIN oder ein Passwort für die Bildschirmsperre festlegen."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Zur Verwendung des Anmeldeinformationsspeichers müssen Sie eine PIN oder ein Passwort für die Display-Sperre festlegen."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Notfallsignal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Verhalten bei einem Notruf festlegen"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Sichern &amp; zurücksetzen"</string>
     <string name="privacy_settings_title" msgid="4856282165773594890">"Sichern &amp; zurücksetzen"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Sicherung &amp; Wiederherstellung"</string>
-    <string name="personal_data_section_title" msgid="7815209034443782061">"Persönliche Daten"</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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Nach der Neuinstallation einer App gesicherte Einstellungen und Daten wiederherstellen"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Fehlerbericht abrufen"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Bei diesem Fehlerbericht werden Daten zum aktuellen Status Ihres Geräts gesammelt und als E-Mail versandt. Vom Start des Berichts bis zu seinem Versand kann es eine Weile dauern. Bitte haben Sie Geduld."</string>
-    <string name="report" msgid="302437572240018342">"Starten"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop-Sicherungspasswort"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Vollständige Desktop-Sicherungen sind momentan nicht passwortgeschützt."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Zum Ändern oder Entfernen des Passworts für vollständige Desktop-Sicherungen berühren"</string>
@@ -1427,7 +1571,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>
@@ -1436,17 +1580,17 @@
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Geräteadministrator aktivieren?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"Aktivieren"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Geräteadministrator"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"Die Aktivierung dieses Administrators ermöglicht der App <xliff:g id="APP_NAME">%1$s</xliff:g>, folgende Vorgänge auszuführen:"</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"Die Aktivierung dieses Administrators ermöglicht der App \"<xliff:g id="APP_NAME">%1$s</xliff:g>\", folgende Vorgänge auszuführen:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Dieser Administrator ist aktiv und ermöglicht der App <xliff:g id="APP_NAME">%1$s</xliff:g>, folgende Vorgänge auszuführen:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Unbenannt"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Allgemein"</string>
     <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>
@@ -1468,9 +1612,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;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\nTippen 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>
@@ -1486,8 +1630,8 @@
     <string name="sync_automatically" msgid="1682730255435062059">"App-Daten autom. synchronisieren"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Synchronisierung AN"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Synchronisierung AUS"</string>
-    <string name="sync_error" msgid="5060969083117872149">"Synchron.fehler"</string>
-    <string name="last_synced" msgid="4242919465367022234">"Zuletzt synchronisiert am <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="sync_error" msgid="5060969083117872149">"Synchronisierungsfehler"</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>
@@ -1509,8 +1653,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Konto entfernen?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Durch das Entfernen dieses Kontos werden alle zugehörigen Nachrichten, Kontakte und andere Daten vom Tablet gelöscht!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Durch das Entfernen dieses Kontos werden alle seine Nachrichten, Kontakte und andere Daten vom Telefon gelöscht!"</string>
-    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Dieses Konto ist für manche Apps erforderlich. Sie können es nur entfernen, indem Sie das Tablet unter \"Einstellungen\" > \"Sichern &amp; zurücksetzen\" auf die Werkseinstellungen zurücksetzen (damit werden alle Ihre persönlichen Daten gelöscht)."</string>
-    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Dieses Konto ist für manche Apps erforderlich. Sie können es nur entfernen, indem Sie das Telefon unter \"Einstellungen\" &gt; \"Sichern &amp; zurücksetzen\" auf die Werkseinstellungen zurücksetzen (damit werden all Ihre persönlichen Daten gelöscht)."</string>
+    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Dieses Konto ist für manche Apps erforderlich. Sie können es nur entfernen, indem Sie das Tablet unter \"Einstellungen\" > \"Sichern &amp; zurücksetzen\" auf die Werkseinstellungen zurücksetzen (damit werden alle Ihre personenbezogenen Daten gelöscht)."</string>
+    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Dieses Konto ist für manche Apps erforderlich. Sie können es nur entfernen, indem Sie das Telefon unter \"Einstellungen\" &gt; \"Sichern &amp; zurücksetzen\" auf die Werkseinstellungen zurücksetzen (damit werden all Ihre personenbezogenen Daten gelöscht)."</string>
     <string name="provider_label" msgid="7724593781904508866">"Push-Abos"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
@@ -1538,6 +1682,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>
@@ -1545,40 +1690,44 @@
     <string name="pointer_location_summary" msgid="840819275172753713">"Overlay mit aktuellen Daten zu Tippaktionen"</string>
     <string name="show_touches" msgid="1356420386500834339">"Berührungen anzeigen"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Visuelles Feedback für Berührungen anzeigen"</string>
-    <string name="show_screen_updates" msgid="5470814345876056420">"Oberflächenaktualisierungen anzeigen"</string>
+    <string name="show_screen_updates" msgid="5470814345876056420">"Oberflächenaktualisierungen"</string>
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Flash für gesamte Fensteroberfläche bei Aktualisierung"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Updates m. GPU-Ansicht"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash-Ansicht im Fenster, wenn mit GPU dargestellt"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Hardwareebenen-Updates"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Hardwareebenen blinken beim Aktualisieren grün"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Debugging – GPU-Überschneidung"</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">"Momentan sind keine Traces aktiviert."</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> Traces sind momentan aktiviert."</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Momentan sind 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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU-Auslastung anzeigen"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Bildschirm-Overlay mit aktueller CPU-Auslastung"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU-Rendering erzwingen"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Sekundäre Displays simulieren"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Aktionen nicht speichern"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Aktivität löschen, sobald der Nutzer diese beendet"</string>
     <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"</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>
@@ -1587,20 +1736,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_disable_mobile" msgid="5211007048880167438">"Mobile Daten deaktivieren?"</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">"Mobile Daten"</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>
@@ -1608,11 +1757,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Hintergrunddaten in Mobilfunknetzen deaktivieren und sofern verfügbar andere als Mobilfunknetze verwenden"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Legen Sie zur Beschränkung der App-Hintergrunddaten zuerst ein Mobildatenlimit fest."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Hintergrunddaten beschränken?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Diese Funktion kann dazu führen, dass eine auf Hintergrunddaten basierende App nicht mehr funktioniert, wenn nur Mobilfunknetze verfügbar sind."\n\n"Geeignetere Kontrollmechanismen für den Datenverbrauch finden Sie in den Einstellungen der App."</string>
-    <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Hintergrunddaten können nur beschränkt werden, wenn Sie ein Limit für mobile Daten festgelegt haben."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Diese Funktion kann dazu führen, dass eine auf Hintergrunddaten basierende App nicht mehr funktioniert, wenn nur Mobilfunknetze verfügbar sind.\n\nGeeignetere Kontrollmechanismen für den Datenverbrauch finden Sie in den Einstellungen der App."</string>
+    <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Hintergrunddaten können nur beschränkt werden, wenn Sie ein Mobilfunklimit festgelegt haben."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Autom. Synchronisierung aktivieren?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Änderungen, die Sie im Web an Ihren Konten vornehmen, werden automatisch auf Ihrem Tablet übernommen."\n\n"Für einige Konten werden möglicherweise auch Änderungen, die Sie auf Ihrem Tablet vornehmen, im Web übernommen. Dies ist die Funktionsweise von Google Konten."\n\n"Unter \"Einstellungen &gt; Konten\" können Sie auswählen, welche Informationen in den einzelnen Konten synchronisiert werden sollen."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Änderungen, die Sie im Web an Ihren Konten vornehmen, werden automatisch auf Ihrem Telefon übernommen."\n\n"Für einige Konten werden eventuell auch Änderungen, die Sie auf Ihrem Telefon vornehmen, im Web übernommen. Dies ist die Funktionsweise von Google Konten."\n\n"Unter \"Einstellungen &gt; Konten\" können Sie auswählen, welche Informationen in den einzelnen Konten synchronisiert werden sollen."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Änderungen, die Sie im Web an Ihren Konten vornehmen, werden automatisch auf Ihrem Tablet übernommen.\n\nFür einige Konten werden möglicherweise auch Änderungen, die Sie auf Ihrem Tablet vornehmen, im Web übernommen. Dies ist die Funktionsweise von Google Konten.\n\nUnter \"Einstellungen &gt; Konten\" können Sie auswählen, welche Informationen in den einzelnen Konten synchronisiert werden sollen."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Änderungen, die Sie im Web an Ihren Konten vornehmen, werden automatisch auf Ihrem Telefon übernommen.\n\nFür einige Konten werden eventuell auch Änderungen, die Sie auf Ihrem Telefon vornehmen, im Web übernommen. Dies ist die Funktionsweise von Google Konten.\n\nUnter \"Einstellungen &gt; Konten\" können Sie auswählen, welche Informationen in den einzelnen Konten synchronisiert werden sollen."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Autom. Synchronisierung deaktivieren?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"So reduzieren Sie den Datenverbrauch und schonen den Akku, müssen jedoch jedes einzelne Konto manuell synchronisieren, um neue Informationen abzurufen. Außerdem erhalten Sie keine Benachrichtigungen, wenn Aktualisierungen erfolgen."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum für Zurücksetzung der Nutzungszyklen"</string>
@@ -1620,23 +1769,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_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_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\nDer 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\nDer 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" 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\nDiese 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\nDiese 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>
@@ -1668,6 +1820,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"VPN-Profil hinzufügen"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Profil bearbeiten"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Profil löschen"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Durchgehend aktives VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Wählen Sie ein VPN-Profil für eine durchgehende Verbindung aus. Netzwerkverkehr ist nur möglich, wenn eine Verbindung zu diesem VPN besteht."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Keines"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Für ein durchgehend aktives VPN ist eine IP-Adresse für den Server und für das DNS erforderlich."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Es ist keine Netzwerkverbindung verfügbar. Bitte versuchen Sie es später erneut."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Ein Zertifikat fehlt. Bitte ändern Sie das Profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
@@ -1679,31 +1835,93 @@
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"System-CA-Zertifikat deaktivieren?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"CA-Zertifikat des Nutzers endgültig entfernen?"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Rechtschreibprüfung"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Geben Sie Ihr aktuelles Passwort für vollständige Sicherungen hier ein."</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Geben Sie hier ein neues Passwort für vollständige Sicherungen ein."</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Geben Sie Ihr neues Passwort für vollständige Sicherungen hier erneut ein."</string>
-    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Passwort für Sicherung festlegen"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Aktuelles Passwort für vollständige Sicherungen eingeben"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Neues Passwort für vollständige Sicherungen eingeben"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Neues Passwort für vollständige Sicherungen erneut eingeben"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Passwort festlegen"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Abbrechen"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Zusätzliche Systemupdates"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Nutzer &amp; Beschränkungen"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Nutzer"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Nutzer hinzufügen"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Details bearbeiten"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Nutzerinformationen"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Name"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Inhaltsbeschränkungen"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"PIN erforderlich"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Einstufung des Inhalts"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"System-Apps"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Installierte Apps"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Verwerfen"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Nutzer entfernen"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Nervensäge"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Deaktiviert"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Moderat"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Strikt"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Nutzer"</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="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\nNachdem Sie einen neuen Nutzer erstellt haben, muss dieser einen Einrichtungsprozess durchlaufen.\n\nJeder 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\nJeder 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_confirm_remove_message" msgid="5284111415714437285">"Möchten Sie den Nutzer und alle mit ihm verbundenen Daten wirklich von Ihrem Gerät löschen?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Schriftgröße ändern"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Einschränkungen"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Einschränkungen aufheben"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN ändern"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Benachrichtigungen zeigen"</string>
     <string name="help_label" msgid="1107174367904110532">"Hilfe"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Konto für Inhalte"</string>
+    <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="6160672982086584261">"App-Beschränkungen festlegen"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Von <xliff:g id="APP">%1$s</xliff:g> festgelegt"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Diese App wird in eingeschränkten Profilen nicht unterstützt."</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Diese App darf auf Ihre Konten zugreifen."</string>
+    <string name="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 c394858..e51007e 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,16 +218,127 @@
     <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="886742181977884584">"Μέσα"</item>
+    <item msgid="7924928667052300589">"Συσκευή"</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>
+    <item msgid="5124443975763747838">"κουμπιά μέσων"</item>
+    <item msgid="4547883971364273343">"εστίαση ήχου"</item>
+    <item msgid="2603878814882344450">"κύρια ένταση ήχου"</item>
+    <item msgid="7136963238377062018">"έντασης ήχου φωνής"</item>
+    <item msgid="4270236897655923007">"ένταση ήχου κλήσης"</item>
+    <item msgid="6325739889222559394">"ένταση ήχου μέσων"</item>
+    <item msgid="5762123934816216821">"ένταση ήχου ξυπνητηριού"</item>
+    <item msgid="785049718065337473">"ένταση ήχου ειδοποιήσεων"</item>
+    <item msgid="6700305533746877052">"ένταση ήχου Bluetooth"</item>
+    <item msgid="2029227495214047094">"διατήρηση λειτουργίας"</item>
+    <item msgid="26109888160231211">"παρακολούθηση τοποθεσίας"</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>
+    <item msgid="5753789168376302997">"Κουμπιά μέσων"</item>
+    <item msgid="3265262911688671938">"Εστίαση ήχου"</item>
+    <item msgid="2098976479485046797">"Κύρια ένταση ήχου"</item>
+    <item msgid="5660213838861789350">"Έντασης ήχου φωνής"</item>
+    <item msgid="7983336752371254444">"Ένταση ήχου κλήσης"</item>
+    <item msgid="7878027809189330917">"Ένταση ήχου πολυμέσων"</item>
+    <item msgid="7260546305036218513">"Ένταση ήχου ξυπνητηριού"</item>
+    <item msgid="9103719301075748925">"Ένταση ήχου ειδοποιήσεων"</item>
+    <item msgid="7025966722295861512">"Ένταση ήχου Bluetooth"</item>
+    <item msgid="4665183401128289653">"Διατήρηση λειτουργίας"</item>
+    <item msgid="8584357129746649222">"Τοποθεσία"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Σύντομο"</item>
     <item msgid="2560532955514699713">"Μεσαία"</item>
     <item msgid="2372711992605524591">"Παρατεταμένο"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (εντοπισμός σφαλμάτων)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Χρήση Dalvik"</item>
+    <item msgid="5131846588686178907">"Χρήση ART"</item>
+    <item msgid="4530003713865319928">"Χρήση της έκδοσης εντοπισμού σφαλμάτων ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Να μην γίνεται ποτέ έλεγχος"</item>
     <item msgid="6042769699089883931">"Έλεγχος μόνο για περιεχόμενο DRM"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Κλίμακα κινούμενων εικόνων 5x"</item>
     <item msgid="1069584980746680398">"Κλίμακα κινούμενων εικόνων 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Καμία"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi και 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Τίποτα"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Ανενεργές"</item>
+    <item msgid="7688197031296835369">"Εμφάνιση περιοχών υπέρβασης"</item>
+    <item msgid="8332661909019981149">"Εμφάνιση μετρητή υπέρβασης"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Τυπικό όριο"</item>
     <item msgid="4071574792028999443">"Δεν υπάρχουν διεργασίες παρασκηνίου"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Λήξη ορίου χρόνου"</item>
     <item msgid="7664124146786465092">"Ανεπιτυχής"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Ερώτηση"</item>
+    <item msgid="5077768429488260031">"Να μην επιτρέπεται ποτέ"</item>
+    <item msgid="1417929597727989746">"Να επιτρέπεται πάντα"</item>
+  </string-array>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 3c78b92..6bc8648 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Ναι"</string>
     <string name="no" msgid="6731231425810196216">"Όχι"</string>
     <string name="create" msgid="3578857613172647409">"Δημιουργία"</string>
+    <string name="allow" msgid="3349662621170855910">"Αποδοχή"</string>
+    <string name="deny" msgid="6947806159746484865">"Απόρριψη"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Άγνωστο"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Απομένουν <xliff:g id="STEP_COUNT">%1$d</xliff:g> βήματα για να γίνετε προγραμματιστής."</item>
+    <item quantity="other" msgid="6722953419953594148">"Απομένουν <xliff:g id="STEP_COUNT">%1$d</xliff:g> βήματα για να γίνετε προγραμματιστής."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Είστε πλέον προγραμματιστής!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Δεν χρειάζεται, είστε ήδη προγραμματιστής."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"ΑΣΥΡΜΑΤΟ και ΔΙΚΤΥΑ"</string>
     <string name="header_category_device" msgid="5781174212691167553">"ΣΥΣΚΕΥΗ"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"ΠΡΟΣΩΠΙΚΟΣ"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Φόρτιση"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Αποφόρτιση"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(ασύρματο)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Δεν φορτίζει"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Δεν φορτίζει"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Πλήρης"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Αποσυνδέθηκε"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"ασύρματο"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Άγνωστος"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Άγνωστο"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Άγνωστο σφάλμα"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Κρύο"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Ανιχνεύσιμο"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Ορατό σε όλες τις κοντινές συσκευές Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Ορατό σε όλες τις κοντινές συσκευές Bluetooth"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Δεν είναι ορατό σε άλλες συσκευές Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Ορατό μόνο σε συζευγμένες συσκευές"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Να γίνει η συσκευή ανιχνεύσιμη"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Λήξη χρονικού ορίου προβολής"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Ρυθμίστε τον χρόνο δυνατότητας ανίχνευσης της συσκευής"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Κλείδωμα της λειτουργίας φωνητικών κλήσεων"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Να μην επιτρέπεται η χρήση του προγράμματος κλήσης bluetooth όταν η οθόνη είναι κλειδωμένη"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Συσκευές Bluetooth"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Εμφάνιση ληφθέντων αρχείων"</string>
     <string name="device_picker" msgid="8398232791303186677">"Επιλογέας συσκευής Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Αίτημα άδειας Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Κάποια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth. Να επιτραπεί;"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Μια εφαρμογή από το tablet σας θέλει να ενεργοποιήσει τη δυνατότητα ανίχνευσης του tablet σας από άλλες Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Να επιτραπεί;"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Μια εφαρμογή από το τηλέφωνό σας θέλει να ενεργοποιήσει τη δυνατότητα ανίχνευσης του τηλεφώνου σας από άλλες Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Να επιτραπεί;"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Μια εφαρμογή στο tablet σας θέλει να το καταστήσει \"μόνιμα ανιχνεύσιμο\" από άλλες συσκευές Bluetooth. Να επιτραπεί;"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Μια εφαρμογή στο τηλέφωνό σας θέλει να το καταστήσει \"μόνιμα ανιχνεύσιμο\" από άλλες συσκευές Bluetooth. Να επιτραπεί;"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Μια εφαρμογή από το tablet σας θέλει να ενεργοποιήσει το Bluetooth και να καταστήσει το tablet σας ανιχνεύσιμο από άλλες συσκευές για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Να επιτραπεί;"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Κάποια εφαρμογή του τηλεφώνου σας απαιτεί την ενεργοποίηση του Bluetooth και τη δυνατότητα ανίχνευσης του τηλεφώνου σας από άλλες συσκευές για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα. Να επιτραπεί;"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Μια εφαρμογή από το tablet σας θέλει να ενεργοποιήσει το Bluetooth και να καταστήσει το tablet σας ανιχνεύσιμο από άλλες συσκευές. Να επιτραπεί;"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Κάποια εφαρμογή του τηλεφώνου σας απαιτεί την ενεργοποίηση του Bluetooth και τη δυνατότητα ανίχνευσης του τηλεφώνου σας από άλλες συσκευές. Να επιτραπεί;"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Μια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Μια εφαρμογή θέλει να κάνει ορατό το tablet σας σε άλλες συσκευές Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Μια εφαρμογή θέλει να κάνει ορατό το τηλέφωνό σας σε άλλες συσκευές Bluetooth για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Μια εφαρμογή θέλει να κάνει το tablet σας ορατό σε άλλες συσκευές Bluetooth. Μπορείτε να αλλάξετε την επιλογή αργότερα, από τις ρυθμίσεις Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Μια εφαρμογή θέλει να κάνει το τηλέφωνό σας ορατό σε άλλες συσκευές Bluetooth. Μπορείτε να αλλάξετε την επιλογή αργότερα, από τις ρυθμίσεις Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Μια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth και να κάνει το tablet σας ορατό σε άλλες συσκευές για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Μια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth και να κάνει το τηλέφωνό σας ορατό σε άλλες συσκευές για <xliff:g id="TIMEOUT">%1$d</xliff:g> δευτερόλεπτα."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Μια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth και να κάνει το tablet σας ορατό σε άλλες συσκευές. Μπορείτε να αλλάξετε την επιλογή αργότερα, από τις ρυθμίσεις Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Μια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth και να κάνει το τηλέφωνό σας ορατό σε άλλες συσκευές. Μπορείτε να αλλάξετε την επιλογή αργότερα, από τις ρυθμίσεις Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Ενεργοποίηση του Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Απενεργοποίηση Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Αυτόματη σύνδεση"</string>
@@ -177,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>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Ο διακομ. μεσολ. HTTP χρησιμοποιείται από το πρόγρ. περιήγ., αλλά δεν πρέπει να χρησιμοποιείται από άλλες εφαρμογές."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Τοποθεσία:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Γειτονικά CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Πληροφορίες κελιού:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Προσπάθειες δεδομένων:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Υπηρεσία GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Περιαγωγή:"</string>
@@ -260,16 +268,18 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Χάσατε τη σύνδεση δεδομένων επειδή φύγατε από το οικείο δίκτυο έχοντας την περιαγωγή δεδομένων απενεργοποιημένη."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Ενεργοποίηση"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Όταν επιτρέπετε την περιαγωγή δεδομένων, ενδέχεται να επιβαρυνθείτε με σημαντικές χρεώσεις περιαγωγής!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Όταν επιτρέπετε την περιαγωγή δεδομένων, ενδέχεται να ισχύσουν σημαντικές χρεώσεις περιαγωγής!\n\nΑυτή η ρύθμιση επηρεάζει όλους τους χρήστες στο συγκεκριμένο tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Όταν επιτρέπετε την περιαγωγή δεδομένων, ενδέχεται να ισχύσουν σημαντικές χρεώσεις περιαγωγής!\n\nΑυτή η ρύθμιση επηρεάζει όλους τους χρήστες στο συγκεκριμένο τηλέφωνο."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Να επιτρέπεται η περιαγωγή δεδομένων;"</string>
     <string name="networks" msgid="6333316876545927039">"Επιλογή παρόχου"</string>
-    <string name="sum_carrier_select" msgid="3616956422251879163">"Επιλέξτε μια εταιρία δικτύου"</string>
+    <string name="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>
@@ -297,6 +307,10 @@
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Να απαιτείται ένας αριθμητικός κωδικός PIN ή ένας κωδικός πρόσβασης για την αποκρυπτογράφηση του tablet κάθε φορά που το ενεργοποιείτε"</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">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς, τις ρυθμίσεις, τις εφαρμογές των οποίων έχετε πραγματοποιήσει λήψη και τα δεδομένα τους, τα μέσα και άλλα αρχεία σας. Αφού κρυπτογραφήσετε το tablet σας, θα πρέπει κάθε φορά που το ενεργοποιείτε να πληκτρολογείτε ένα αριθμητικό PIN ή έναν κωδικό πρόσβασης για την αποκρυπτογράφησή του. Δεν είναι δυνατή η αποκρυπτογράφηση του tablet σας, εκτός αν πραγματοποιήσετε επαναφορά εργοστασιακών ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας."\n\n"Η κρυπτογράφηση διαρκεί μια ώρα ή και περισσότερο. Θα πρέπει να την ξεκινήσετε με την μπαταρία σας φορτισμένη και το tablet σας θα πρέπει να είναι συνδεδεμένο σε πρίζα, έως ότου ολοκληρωθεί η κρυπτογράφηση. Αν διακόψετε τη διαδικασία κρυπτογράφησης, θα χάσετε ορισμένα ή όλα τα δεδομένα σας."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς, τις ρυθμίσεις, τις εφαρμογές των οποίων έχετε πραγματοποιήσει λήψη και τα δεδομένα τους, τα μέσα και άλλα αρχεία σας. Αφού κρυπτογραφήσετε το τηλέφωνό σας, θα πρέπει κάθε φορά που το ενεργοποιείτε να πληκτρολογείτε ένα αριθμητικό PIN ή έναν κωδικό πρόσβασης για την αποκρυπτογράφησή του. Δεν είναι δυνατή η αποκρυπτογράφηση του τηλεφώνου σας, εκτός αν πραγματοποιήσετε επαναφορά εργοστασιακών ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας."\n\n"Η κρυπτογράφηση διαρκεί μια ώρα ή και περισσότερο. Θα πρέπει να την ξεκινήσετε με την μπαταρία σας φορτισμένη, ενώ το τηλέφωνό σας θα πρέπει να είναι συνδεδεμένο σε πρίζα, έως ότου ολοκληρωθεί η κρυπτογράφηση. Αν διακόψετε τη διαδικασία κρυπτογράφησης, θα χάσετε ορισμένα ή όλα τα δεδομένα σας."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς, τις ρυθμίσεις, τις εφαρμογές των οποίων έχετε πραγματοποιήσει λήψη και τα δεδομένα τους, τα μέσα και άλλα αρχεία σας. Αφού κρυπτογραφήσετε το tablet σας, θα πρέπει κάθε φορά που το ενεργοποιείτε να πληκτρολογείτε ένα αριθμητικό PIN ή έναν κωδικό πρόσβασης για την αποκρυπτογράφησή του. Δεν είναι δυνατή η αποκρυπτογράφηση του tablet σας, εκτός αν πραγματοποιήσετε επαναφορά εργοστασιακών ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας.\n\nΗ κρυπτογράφηση διαρκεί μια ώρα ή και περισσότερο. Θα πρέπει να την ξεκινήσετε με την μπαταρία σας φορτισμένη και το tablet σας θα πρέπει να είναι συνδεδεμένο σε πρίζα, έως ότου ολοκληρωθεί η κρυπτογράφηση. Αν διακόψετε τη διαδικασία κρυπτογράφησης, θα χάσετε ορισμένα ή όλα τα δεδομένα σας."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς, τις ρυθμίσεις, τις εφαρμογές των οποίων έχετε πραγματοποιήσει λήψη και τα δεδομένα τους, τα μέσα και άλλα αρχεία σας. Αφού κρυπτογραφήσετε το τηλέφωνό σας, θα πρέπει κάθε φορά που το ενεργοποιείτε να πληκτρολογείτε ένα αριθμητικό PIN ή έναν κωδικό πρόσβασης για την αποκρυπτογράφησή του. Δεν είναι δυνατή η αποκρυπτογράφηση του τηλεφώνου σας, εκτός αν πραγματοποιήσετε επαναφορά εργοστασιακών ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας.\n\nΗ κρυπτογράφηση διαρκεί μια ώρα ή και περισσότερο. Θα πρέπει να την ξεκινήσετε με την μπαταρία σας φορτισμένη, ενώ το τηλέφωνό σας θα πρέπει να είναι συνδεδεμένο σε πρίζα, έως ότου ολοκληρωθεί η κρυπτογράφηση. Αν διακόψετε τη διαδικασία κρυπτογράφησης, θα χάσετε ορισμένα ή όλα τα δεδομένα σας."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Κρυπτογράφηση tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Κρυπτογράφηση τηλεφώνου"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Φορτίστε την μπαταρία σας και δοκιμάστε ξανά."</string>
@@ -325,12 +339,12 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Προσπαθήστε ξανά σε <xliff:g id="DELAY">^1</xliff:g> δευτερόλεπτα."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Πληκτρολογήστε τον κωδικό πρόσβασής σας"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Η κρυπτογράφηση απέτυχε"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Η κρυπτογράφηση διακόπηκε και δεν είναι δυνατή η ολοκλήρωσή της. Κατά συνέπεια, δεν είναι πλέον δυνατή η πρόσβαση στα δεδομένα στο tablet σας. "\n\n" Για να συνεχίσετε να χρησιμοποιείτε το tablet σας θα πρέπει να πραγματοποιήσετε επαναφορά των εργοστασιακών ρυθμίσεων. Όταν ρυθμίσετε το tablet σας μετά από την επαναφορά, θα μπορείτε να επαναφέρετε τα αντίγραφα ασφαλείας των δεδομένων σας από το Λογαριασμό σας Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Η κρυπτογράφηση διακόπηκε και δεν είναι δυνατή η ολοκλήρωσή της. Κατά συνέπεια, δεν είναι πλέον δυνατή η πρόσβαση στα δεδομένα στο τηλέφωνό σας. "\n\n"Για να συνεχίσετε να χρησιμοποιείτε το τηλέφωνό σας θα πρέπει να πραγματοποιήσετε επαναφορά των εργοστασιακών ρυθμίσεων. Όταν ρυθμίσετε το τηλέφωνό σας μετά από την επαναφορά, θα μπορείτε να επαναφέρετε τα αντίγραφα ασφαλείας των δεδομένων σας από τον Λογαριασμό σας Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Η κρυπτογράφηση διακόπηκε και δεν είναι δυνατή η ολοκλήρωσή της. Κατά συνέπεια, δεν είναι πλέον δυνατή η πρόσβαση στα δεδομένα στο tablet σας. \n\n Για να συνεχίσετε να χρησιμοποιείτε το tablet σας θα πρέπει να πραγματοποιήσετε επαναφορά των εργοστασιακών ρυθμίσεων. Όταν ρυθμίσετε το tablet σας μετά από την επαναφορά, θα μπορείτε να επαναφέρετε τα αντίγραφα ασφαλείας των δεδομένων σας από το Λογαριασμό σας Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Η κρυπτογράφηση διακόπηκε και δεν είναι δυνατή η ολοκλήρωσή της. Κατά συνέπεια, δεν είναι πλέον δυνατή η πρόσβαση στα δεδομένα στο τηλέφωνό σας. \n\nΓια να συνεχίσετε να χρησιμοποιείτε το τηλέφωνό σας θα πρέπει να πραγματοποιήσετε επαναφορά των εργοστασιακών ρυθμίσεων. Όταν ρυθμίσετε το τηλέφωνό σας μετά από την επαναφορά, θα μπορείτε να επαναφέρετε τα αντίγραφα ασφαλείας των δεδομένων σας από τον Λογαριασμό σας Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Εναλλαγή μεθόδου εισαγωγής"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Επιλογή κλειδ. οθόνης"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Επιλ. εφεδρ. κλειδώμ."</string>
-    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Κλείδ.οθόν."</string>
+    <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Κλείδωμα οθόνης"</string>
     <string name="unlock_set_unlock_launch_picker_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>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Αλλαγή αριθμού PIN ξεκλειδώματος"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Αλλαγή κωδικού πρόσβασης ξεκλειδώματος"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον %d χαρακτήρες"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Ο αριθμός PIN πρέπει να έχει τουλάχιστον %d χαρακτήρες"</string>
+    <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>
@@ -406,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>
@@ -480,64 +503,98 @@
     <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_empty_list_wifi_display_off" msgid="1225626898926363100">"Για να δείτε τις συσκευές, ενεργοποιήστε την ασύρματη οθόνη."</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_paired_devices" msgid="7395326840730024303">"Συζευγμένες οθόνες"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Διαθέσιμες συσκευές"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Γίνεται σύνδεση"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Έχει συνδεθεί"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Διαθέσιμη"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Σε χρήση"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Ρυθμίσεις προβολής"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Αποσύνδεση;"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Με αυτόν τον τρόπο θα τερματιστεί η σύνδεσή σας με τη συσκευή:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Επιλογές ασύρματης οθόνης"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Διαγραφή"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Τέλος"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Όνομα"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Ενεργή"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Ανενεργή"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Έχει απενεργοποιηθεί"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Να επιτρέπεται η ανταλλαγή δεδομένων όταν το tablet έρχεται σε επαφή με μια άλλη συσκευή"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Να επιτρέπεται η ανταλλαγή δεδομένων όταν το τηλέφωνο αγγίζει μια άλλη συσκευή"</string>
     <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="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="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="8116564886303972764">"Εισαγάγετε τον κωδικό 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_in_progress" msgid="2944576520214787628">"Η ρύθμιση WPS βρίσκεται ήδη σε εξέλιξη και ενδεχομένως να χρειαστούν έως και δύο λεπτά προκειμένου να ολοκληρωθεί"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Σύνδεση στο δίκτυο Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Η ρύθμιση WPS βρίσκεται ήδη σε εξέλιξη και ίσως χρειαστούν έως και δύο λεπτά για να ολοκληρωθεί"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Αποτυχία WPS. Προσπαθήστε ξανά σε λίγα λεπτά."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Δεν υποστηρίζεται η ρύθμιση ασφάλειας ασύρματου δρομολογητή (WEP)"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Δεν υποστηρίζεται η ρύθμιση ασφάλειας ασύρματου δρομολογητή (TKIP)"</string>
     <string name="wifi_wps_failed_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>
@@ -564,6 +621,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>
@@ -571,8 +631,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_advanced_titlebar" msgid="1627063574532930090">"Σύνθετο Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Ζώνη συχνοτήτων Wi-Fi"</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Η ρύθμιση του tablet μπορεί να προκαλέσει μεγάλη δραστηριότητα δικτύου."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: ενδέχεται να ισχύουν επιπλέον χρεώσεις από την εταιρεία κινητής τηλεφωνίας.\n\nΗ ρύθμιση του τηλεφώνου μπορεί να προκαλέσει μεγάλη δραστηριότητα δικτύου."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Αναζήτηση…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Μετονομασία συσκευής"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Ομότιμες συσκευές"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Ομάδες που έχουν διατηρηθεί"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Δεν ήταν δυνατή η σύνδεση."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Αποτυχία μετονομασίας συσκευής."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Αποσύνδεση;"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Αν αποσυνδεθείτε, θα λήξει η σύνδεσή σας με τη συσκευή <xliff:g id="PEER_NAME">%1$s</xliff:g> και <xliff:g id="PEER_COUNT">%2$s</xliff:g> άλλες συσκευές."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Ακύρωση πρόσκλησης;"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Θέλετε να ακυρώσετε την πρόσκληση για τη σύνδεση με τη συσκευή <xliff:g id="PEER_NAME">%1$s</xliff:g>;"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Φορητό σημείο πρόσβασης Wi-Fi"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Διαγραφή αυτής της ομάδας;"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Φορητό σημείο πρόσβασης Wi-Fi"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Μουσικά εφέ"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ένταση ήχου ειδοποίησης"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Δόνηση στο αθόρυβο"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Προεπιλεγμένη ειδοποίηση"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Προεπιλεγμένος ήχος ειδοποίησης"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Φωτεινός παλμός ειδοποίησης"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ήχος κλήσης"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Ειδοποίηση"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Χρήση έντασης ήχου εισερχόμενης κλήσης για ειδοποιήσεις"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Επιλογή ήχου κλήσης ειδοποίησης"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Προεπιλεγμένος ήχος ειδοποίησης"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Μέσα"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Ορισμός έντασης ήχου για μουσική και βίντεο"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Ξυπνητήρι"</string>
@@ -671,18 +743,19 @@
     <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="3848608373818910549">"Διακόσμηση οθόνης"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Θα ξεκινήσει όταν εισέλθει σε αδράνεια, εφόσον είναι συνδεδεμένο στο ρεύμα"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Απενεργοποιημένη"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Επιλεγμένη διακόσμηση"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Χρόνος ενεργοποίησης"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Μετά από <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> σε αδράνεια"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Ποτέ"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Δοκιμάστε το!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Επίσης να εκκινείται όταν είναι στη βάση σύνδεσης"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</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">"Πότε να ενεργοποιείται"</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>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"Αριθμός PIN κάρτας SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Εσφαλμένο PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Οι αριθμοί PIN δεν ταιριάζουν"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Δεν είναι δυνατή η αλλαγή PIN."\n"Πιθανόν ο αριθμός PIN να είναι εσφαλμένος."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Δεν είναι δυνατή η αλλαγή PIN.\nΠιθανόν ο αριθμός PIN να είναι εσφαλμένος."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Ο αριθμός PIN της κάρτας SIM άλλαξε επιτυχώς"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Δεν είναι δυνατή η αλλαγή της κατάστασης κλειδώματος της κάρτας SIM."\n"Πιθανόν ο αριθμός PIN να είναι εσφαλμένος."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Δεν είναι δυνατή η αλλαγή της κατάστασης κλειδώματος της κάρτας SIM.\nΠιθανόν ο αριθμός PIN να είναι εσφαλμένος."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Ακύρωση"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Κατάσταση tablet"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Έκδοση βασικού φάσματος"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Έκδοση Kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Αριθμός έκδοσης"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Κατάσταση SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Δεν είναι διαθέσιμο"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Κατάσταση"</string>
     <string name="device_status" msgid="607405385799807324">"Κατάσταση"</string>
@@ -733,12 +807,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">"Τύπος δικτύου κινητής τηλεφωνίας"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Πληροφορίες λειτουργού"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Κατάστ.δικτ.κιν.τηλ."</string>
     <string name="status_service_state" msgid="2323931627519429503">"Κατάσταση υπηρεσίας"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"Ισχύς σήματος"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Αποθ. χώρος USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Κάρτα SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"Διαθέσιμο"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Διαθέσιμος (μόνος για ανάγνωση)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Συνολικός χώρος"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Υπολογισμός..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Εφαρμογές (δεδομένα εφαρμογών και περιεχόμενο μέσων)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Εικόνες, βίντεο"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Ήχος (μουσική, ήχοι κλήσης, podcast κλπ.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Διάφορα"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Δεδομένα προσωρινής μνήμης"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Αποπρ. κοιν. αποθ. χώρου"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Αφαίρεση κάρτας SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Αποπροσ. εσωτ. χώρο αποθ. USB"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Διαγραφή κάρτας SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Διαγραφή των δεδομένων στον εσωτερικό χώρο USB όπως μουσική και φωτογραφίες"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Διαγράφει όλα τα δεδ. που υπάρχουν στην κάρτα SD, όπως αρχ. μουσ. και φωτογ."</string>
-    <string name="read_only" msgid="6702420168629076340">" (Μόνο για ανάγνωση)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Να διαγραφούν τα δεδομένα προσωρινής μνήμης;"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Θα διαγραφούν δεδομένα cache για όλες τις εφαρ."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Η λειτουργία MTP ή PTP είναι ενεργή"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Αποπροσ. αποθ. χώρου USB;"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Αφαίρεση κάρτας SD;"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Εάν αποσυνδέσετε τον χώρο αποθήκευσης USB, η λειτουργία ορισμένων εφαρμογών που χρησιμοποιείτε θα διακοπεί και ενδέχεται να μην είναι διαθέσιμες μέχρι να τον προσαρτήσετε ξανά."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Φωτογραφική μηχανή (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Σας επιτρέπει να μεταφέρετε  φωτογραφίες χρησιμοποιώντας το λογισμικό της φωτογραφικής μηχανής και να μεταφέρετε οποιαδήποτε αρχεία σε υπολογιστές που δεν υποστηρίζουν MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Εγκατάσταση εργαλείων μεταφοράς αρχείων"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Άλλοι χρήστες"</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>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Επαναφορά εργοστασιακών δεδομένων"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Διαγραφή όλων των δεδομένων στο tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Διαγραφή όλων των δεδομένων στο τηλέφωνο"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" της συσκευής σας tablet, συμπεριλαμβανομένων:"\n\n"Των δεδομένων και των ρυθμίσεων συστήματος "<li>"του Λογαριασμού σας Google "</li>\n<li></li>\n<li>"Ληφθείσες εφαρμογές"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" της συσκευής σας tablet, συμπεριλαμβανομένων:"\n\n"Των δεδομένων και των ρυθμίσεων συστήματος "<li>"του Λογαριασμού σας Google "</li>\n<li></li>\n<li>"Ληφθείσες εφαρμογές"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Αυτήν τη στιγμή είστε συνδεδεμένοι στους παρακάτω λογαριασμούς:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" της συσκευής σας tablet, συμπεριλαμβανομένων:\n\nΤων δεδομένων και των ρυθμίσεων συστήματος "<li>"του Λογαριασμού σας Google "</li>\n<li></li>\n<li>"Ληφθείσες εφαρμογές"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" της συσκευής σας tablet, συμπεριλαμβανομένων:\n\nΤων δεδομένων και των ρυθμίσεων συστήματος "<li>"του Λογαριασμού σας Google "</li>\n<li></li>\n<li>"Ληφθείσες εφαρμογές"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Αυτήν τη στιγμή είστε συνδεδεμένοι στους παρακάτω λογαριασμούς:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Μουσική"</li>\n<li>"Φωτογραφίες"</li>\n<li>"Άλλα δεδομένα χρήστη"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Πρέπει να γίνει διαγραφή του "<b>"χώρου αποθήκευσης USB"</b>" για να γίνει, επίσης, εκκαθάριση της μουσικής, των εικόνων και άλλων δεδομένων."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Πρέπει να γίνει εκκαθάριση της "<b>"κάρτας SD"</b>" για να γίνει, επίσης, εκκαθάριση της μουσικής, των εικόνων και άλλων δεδομένων."</string>
@@ -897,10 +979,15 @@
     <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="manage_mobile_plan_title" msgid="7588182101738043593">"Διαχείριση προγρ. κινητής τηλ."</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Άγνωστος τελεστής SIM"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s δεν διαθέτει γνωστό ιστότοπο παροχής"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Εισαγάγετε την κάρτα SIM και κάντε επανεκκίνηση"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Συνδεθείτε στο διαδίκτυο"</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>
@@ -917,6 +1004,7 @@
     <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="copyright_title" msgid="865906688917260647">"Πνευματικά δικαιώματα"</string>
     <string name="license_title" msgid="1990487604356037871">"Άδεια"</string>
     <string name="terms_title" msgid="7697580845616764642">"Όροι και προϋποθέσεις"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Αλλαγή αριθμού PIN ξεκλειδώματος"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Επιβεβαίωση αποθηκευμένου μοτίβου"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Επανάληψη:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Σχεδίαση μοτίβου ξεκλειδώματος"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Σχεδίαση μοτίβου ξεκλειδώματος:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Πατήστε \"Μενού\" για βοήθεια."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Αφήστε το δάκτυλο μετά την ολοκλήρωση."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Συνδέστε τουλάχιστον <xliff:g id="NUMBER">%d</xliff:g> σημεία. Προσπαθήστε ξανά:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Πώς να σχεδιάσετε ένα μοτίβο ξεκλειδώματος"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Πάρα πολλές ανεπιτυχείς προσπάθειες!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Προσπαθήστε ξανά σε <xliff:g id="NUMBER">%d</xliff:g> δευτερόλεπτα."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Ακύρωση"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Επόμενο"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Ασφάλεια του tablet σας"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Ασφάλιση του τηλεφώνου σας"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Προστατέψτε το tablet σας από μη εξουσιοδοτημένη χρήση, δημιουργώντας ένα προσωπικό μοτίβο ξεκλειδώματος οθόνης. Σύρετε το δάχτυλό σας για να συνδέσετε τις τελείες με οποιαδήποτε σειρά στην επόμενη οθόνη. Πρέπει να συνδέσετε τουλάχιστον τέσσερις τελείες. "\n\n"Είστε έτοιμοι να ξεκινήσετε; Αγγίξτε το στοιχείο \"Επόμενο\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Προστατέψτε το τηλέφωνό σας από μη εξουσιοδοτημένη χρήση, δημιουργώντας ένα προσωπικό μοτίβο ξεκλειδώματος οθόνης. Σύρετε το δάχτυλό σας για να συνδέσετε τουλάχιστον τέσσερις τελείες με οποιαδήποτε σειρά στην επόμενη οθόνη. "\n\n"Είστε έτοιμοι να ξεκινήσετε; Αγγίξτε το στοιχείο \"Επόμενο\"."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Η εφαρμογή δεν έχει εγκατασταθεί στο τηλέφωνό σας."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Διαχείριση εφαρμογών"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Διαχείριση και κατάργηση εγκατεστημένων εφαρμογών"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Εφαρμογές"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Να επιτρέπεται η εγκατάσταση εφαρμογών από άγνωστες πηγές"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Η συσκευή σας tablet και τα προσωπικά σας δεδομένα είναι περισσότερο ευάλωτα σε επιθέσεις από εφαρμογές από άγνωστες προελεύσεις. Συμφωνείτε ότι είστε αποκλειστικά υπεύθυνοι για τυχόν βλάβη η οποία ενδέχεται να δημιουργηθεί στο tablet σας ή τυχόν απώλεια δεδομένων η οποία ενδέχεται να προκύψει μέσα από τη χρήση αυτών των εφαρμογών."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Το τηλέφωνό σας και τα προσωπικά δεδομένα σας είναι ευάλωτα σε επιθέσεις από εφαρμογές που προέρχονται από άγνωστες πηγές. Συμφωνείτε ότι είστε οι μοναδικοί υπεύθυνοι για κάθε ζημιά στο τηλέφωνο ή για απώλεια δεδομένων που ενδέχεται να προκύψουν από τη χρήση τέτοιων εφαρμογών."</string>
+    <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="application_info_label" msgid="5736524913065714880">"Πληροφορίες εφαρμογής"</string>
@@ -989,9 +1074,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>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Εφαρμογή χώρου αποθήκευσης USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Κάρτα SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Κατάργηση εγκατάστασης"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Κατάργηση εγκατάστασης για όλους τους χρήστες"</string>
+    <string name="install_text" msgid="884360662922471113">"Εγκατάσταση"</string>
     <string name="disable_text" msgid="6544054052049395202">"Απενεργοποίηση"</string>
     <string name="enable_text" msgid="9217362512327828987">"Ενεργοποίηση"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Εκκαθάριση δεδομένων"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Εμφ. διαδ. προσωρ. μνήμης"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Επαναφ. προτιμ. εφαρμ."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Επαναφ. προτιμ. εφαρμ;"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Η ενέργεια αυτή θα επαναφέρει όλες τις προτιμήσεις για:"\n\n" "<li>"Απενεργοποιημένες εφαρμογές"</li>\n" "<li>"Απενεργοποιημένες ειδοποιήσεις εφαρμογών"</li>\n" "<li>"Προεπιλεγμένες εφαρμογές για ενέργειες"</li>\n" "<li>"Περιορισμοί δεδομένων παρασκηνίου για εφαρμογές"</li>\n\n" Δεν θα χάσετε τα δεδομένα εφαρμογών."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Η ενέργεια αυτή θα επαναφέρει όλες τις προτιμήσεις για:\n\n "<li>"Απενεργοποιημένες εφαρμογές"</li>\n" "<li>"Απενεργοποιημένες ειδοποιήσεις εφαρμογών"</li>\n" "<li>"Προεπιλεγμένες εφαρμογές για ενέργειες"</li>\n" "<li>"Περιορισμοί δεδομένων παρασκηνίου για εφαρμογές"</li>\n\n" Δεν θα χάσετε τα δεδομένα εφαρμογών."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Επαναφορά εφαρμογών"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Διαχείριση χώρου"</string>
     <string name="filter" msgid="2018011724373033887">"Φίλτρο"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Επιλογές φίλτρου"</string>
     <string name="filter_apps_all" msgid="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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Στην κάρτα SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Απενεργοποιημένο"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Δεν έχει εγκατασταθεί"</string>
     <string name="no_applications" msgid="7336588977497084921">"Δεν υπάρχουν εφαρμογές."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Εσ. αποθ. χώρος"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Αποθ. χώρος USB"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> και <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Ενδέχεται να χρεωθείτε από αυτήν την εφαρμογή:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Να σταλεί SMS ειδικής χρέωσης;"</string>
     <string name="computing_size" msgid="1599186977475211186">"Υπολογισμός..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Δεν ήταν δυνατός ο υπολογισμός του μεγέθους του πακέτου."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Δεν έχετε εγκαταστήσει εφαρμογές τρίτων μερών."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Αλλαγή της προτιμώμενης θέσης εγκατάστασης για νέες εφαρμογές"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Απενεργ. ενσωματωμ. εφαρμογής;"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Αν απενεργοποιήσετε μια ενσωματωμένη εφαρμογή, ενδέχεται να μην εκτελούνται σωστά κάποιες άλλες εφαρμογές."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Διαγραφή δεδομένων και απενεργοποίηση εφαρμογής;"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Χρήστης: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Χρήστης που αφαιρέθηκε"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> διεργασία και <xliff:g id="NUMSERVICES">%2$d</xliff:g> υπηρεσία"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> διεργασία και <xliff:g id="NUMSERVICES">%2$d</xliff:g> υπηρεσίες"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> διεργασίες και <xliff:g id="NUMSERVICES">%2$d</xliff:g> υπηρεσία"</string>
@@ -1117,7 +1215,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>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Κανονικές ρυθμίσεις πληκτρολογίου"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Πατήστε το πλήκτρο Space δύο φορές για να εισαγάγετε \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Να γίνουν οι κωδικοί πρόσβασης ορατοί"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></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>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Για εναλ., πατ. Control-Πληκ.διαστ."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Προεπιλογή"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Διατάξεις πληκτρολογίου"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Λεξικό χρήστη"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Προσωπικό λεξικό"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Προσωπικά λεξικά"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Προσωπικό λεξικό"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Προσθήκη"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Προσθήκη στο λεξικό"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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="bt_hci_snoop_log" msgid="3340699311158865670">"Ενεργοποίηση αρχείου καταγραφής παρακολούθησης Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Καταγραφή όλων των πακέτων bluetooth HCI σε ένα αρχείο"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Επιλογή χρόνου εκτέλεσης"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Επιλογή χρόνου εκτέλεσης"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Να γίνει επανεκκίνηση για την αλλαγή του χρόνου εκτέλεσης από <xliff:g id="OLD">%1$s</xliff:g> σε <xliff:g id="NEW">%2$s</xliff:g>;"</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>
+    <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>
-    <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_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="enable_terminal_title" msgid="95572094356054120">"Τοπική τερματική εφαρμογή"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Ενεργοπ.τερμ.εφαρμογής που προσφέρει πρόσβαση στο τοπικό κέλυφος"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Επιλογή gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Επιλογή γραφικού στοιχείου"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Να γίνει δημιουργία γραφικού στοιχείου και να επιτρέπεται η πρόσβαση;"</string>
@@ -1234,29 +1345,43 @@
     <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_toggle_large_text_title" msgid="6618674985313017711">"Μεγάλο κείμενο"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Το κουμπί λειτουργίας τερματίζει την κλήση"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Εκφώνηση κωδικών πρόσβασης"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Καθυστέρηση παρατεταμένου αγγίγματος"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Βελτίωση προσβασιμότητας στον ιστό"</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>
+    <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_toggle_speak_password_preference_title" msgid="5986628515113204844">"Εκφώνηση κωδικών πρόσβασης"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Καθυστέρηση παρατετ. αγγίγματος"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Ρυθμίσεις"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Ενεργή"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Ανενεργή"</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="accessibility_feature_state_on" msgid="2864292320042673806">"Ενεργή"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Ανενεργή"</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="print_settings" msgid="4742428530112487843">"Εκτύπωση"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Ρυθμίσεις εκτύπωσης"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Υπηρεσίες"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Χρήση υπηρεσίας <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"Η υπηρεσία <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> μπορεί να λάβει τα έγγραφα που εκτυπώνετε. Τα έγγραφα αυτού του είδους ενδέχεται να περιέχουν ευαίσθητα δεδομένα."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Δεν έχουν εγκατασταθεί υπηρεσίες"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Ρυθμίσεις"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Προσθήκη εκτυπωτών"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Ενεργό"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Ανενεργό"</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>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Τα δεδομένα ελήφθησαν"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Αποστολή δεδομ. κιν. τηλεφωνίας"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Λήψη δεδομ. κινητής τηλεφωνίας"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Αποστολή δεδομένων Wi‑Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Λήψη δεδομένων Wi‑Fi"</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>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <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="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>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Τόνος"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Επηρεάζει τον τόνο του προφορικού κειμένου"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Γλώσσα"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Δεν έχει επιλεγεί γλώσσα"</string>
     <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>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Φωτεινότητα <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"αυτόματη"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"πλήρης"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"κατά το ήμισυ"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"απενεργοποιημένη"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Αποθηκ. χώρος διαπιστευτηρίων"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Εγκατάσταση από συσκευή αποθ."</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Δημιουργία αντιγράφου ασφαλείας και επαναφορά"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Προσωπικά δεδομένα"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Δημιουργία αντιγράφων ασφαλείας για τα δεδομένα μου"</string>
-    <string name="backup_data_summary" msgid="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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Κατά την εκ νέου εγκατάσταση μιας εφαρμογής, ανακτήστε τις ρυθμίσεις και τα δεδομένα για τα οποία έχετε δημιουργήσει αντίγραφα ασφαλείας"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Λήψη αναφοράς σφάλματος"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Θα συλλέξει πληροφορίες σχετικά με την τρέχουσα κατάσταση της συσκευής σας και θα τις στείλει μέσω μηνύματος ηλεκτρονικού ταχυδρομείου. Απαιτείται λίγος χρόνος για τη σύνταξη της αναφοράς σφάλματος και την αποστολή της. Κάντε λίγη υπομονή."</string>
-    <string name="report" msgid="302437572240018342">"Αναφορά"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Κωδ.πρόσβ.αντ.ασφ.επιφ.εργ."</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Τα πλήρη αντίγραφα ασφαλείας επιφάνειας εργασίας δεν προστατεύονται αυτήν τη στιγμή"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Αγγίξτε για αλλαγή ή κατάργηση του κωδικού πρόσβασης για τα πλήρη αντίγραφα ασφαλείας επιφάνειας εργασίας"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Ημερολόγιο"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Επαφές"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Καλώς ορίσατε στο Google Sync!"</font>" "\n"Πρόκειται για μια προσέγγιση της Google στον συγχρονισμό δεδομένων, η οποία επιτρέπει την πρόσβαση στις επαφές, στις συναντήσεις σας και σε πολλά άλλα, όπου και αν βρίσκεστε."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Καλώς ορίσατε στο Google Sync!"</font>" \nΠρόκειται για μια προσέγγιση της Google στον συγχρονισμό δεδομένων, η οποία επιτρέπει την πρόσβαση στις επαφές, στις συναντήσεις σας και σε πολλά άλλα, όπου και αν βρίσκεστε."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Ρυθμίσεις συγχρονισμού εφαρμογής"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Δεδομένα και συγχρονισμός"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Αλλαγή κωδικού πρόσβασης"</string>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Προβολή Flash ολόκλ. των επιφ παραθ. όταν ενημερ."</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Εμφάνιση των ενημερώσεων προβολής GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Προβολές Flash εντός παραθύρων όταν γίνεται σχεδιασμός με το GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Εμφ. ενημ. επιπ. υλικού"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Επισήμ. επιπέδων υλικού με πράσινο κατά την ενημ."</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Κατάρ.σφαλμ.υπέρβ.GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Προβολή χρήσης CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Επικάλυψη οθόνης για προβολή τρέχουσας χρήσης CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Αναγκαστική απόδοση GPU"</string>
     <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>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Διαγραφή κάθε δραστηριότητας μετά τον τερματισμό"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <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" msgid="1466689968707308512">"Αυτή η λειτουργία μπορεί να κάνει μια εφαρμογή που βασίζεται στα δεδομένα παρασκηνίου να πάψει να λειτουργεί σωστά όταν διατίθενται μόνο δίκτυα κινητής τηλεφωνίας ."\n\n"Μπορείτε να βρείτε περισσότερα κατάλληλα στοιχεία ελέγχου χρήσης δεδομένων στις ρυθμίσεις που διατίθενται στην εφαρμογή."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Αυτή η λειτουργία μπορεί να κάνει μια εφαρμογή που βασίζεται στα δεδομένα παρασκηνίου να πάψει να λειτουργεί σωστά όταν διατίθενται μόνο δίκτυα κινητής τηλεφωνίας .\n\nΜπορείτε να βρείτε περισσότερα κατάλληλα στοιχεία ελέγχου χρήσης δεδομένων στις ρυθμίσεις που διατίθενται στην εφαρμογή."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="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">"Θα γίνεται αυτόματη αντιγραφή τυχόν αλλαγών που πραγματοποιείτε στους λογαριασμούς σας στον ιστό στο tablet σας."\n\n"Σε ορισμένους λογαριασμούς ενδέχεται να γίνεται αυτόματη αντιγραφή τυχόν αλλαγών που πραγματοποιείτε στο tablet σας στον ιστό. Ένας Λογαριασμός 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">"Θα γίνεται αυτόματη αντιγραφή τυχόν αλλαγών που πραγματοποιείτε στους λογαριασμούς σας στον ιστό στο tablet σας.\n\nΣε ορισμένους λογαριασμούς ενδέχεται να γίνεται αυτόματη αντιγραφή τυχόν αλλαγών που πραγματοποιείτε στο tablet σας στον ιστό. Ένας Λογαριασμός 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>
@@ -1620,22 +1769,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"Επειδή η χρήση δεδομένων υπολογίζεται από το tablet σας και ενδέχεται η εταιρεία κινητής τηλεφωνίας να την υπολογίζει με διαφορετικό τρόπο, καλό θα ήταν να χρησιμοποιήσετε ένα συντηρητικό όριο."</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Επειδή η χρήση δεδομένων υπολογίζεται από το 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_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_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>
+    <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>, βάσει 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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Προσθήκη προφίλ VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Επεξεργασία προφίλ"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Διαγραφή προφίλ"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Πάντα ενεργοποιημένο VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Επιλέξτε ένα προφίλ VPN στο οποίο θα παραμένετε πάντα συνδεδεμένοι. Η κίνηση δικτύου θα επιτρέπεται μόνο κατά τη σύνδεση σε αυτό το VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Χωρίς"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Το VPN που έχει ρυθμιστεί να είναι ενεργοποιημένο πάντα απαιτεί μια διεύθυνση IP τόσο για τον διακομιστή όσο και για το DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Δεν υπάρχει σύνδεση δικτύου. Δοκιμάστε ξανά αργότερα."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Λείπει ένα πιστοποιητικό. Επεξεργαστείτε το προφίλ."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Σύστημα"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Ακύρωση"</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">"Πρόσθετες ενημερώσεις συστήματος"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Χρήστες &amp; περιορισμοί"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Χρήστες"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Προσθήκη χρήστη"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Επεξεργασία λεπτομερειών"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Πληροφορίες χρήστη"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Όνομα"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Περιορισμοί περιεχομένου"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Απαιτείται PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Αξιολόγηση περιεχομένου"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Εφαρμογές συστήματος"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Εγκατεστημένες εφαρμογές"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Απόρριψη"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Κατάργηση χρήστη"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Ενοχλητικό παιδί"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Απενεργοποιημένο"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Ανεκτικό"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Επιβολή"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Χρήστες"</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="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_confirm_remove_message" msgid="5284111415714437285">"Είστε βέβαιοι ότι θέλετε να καταργήσετε τον χρήστη και όλα τα σχετικά δεδομένα από τη συσκευή;"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Αλλαγή μεγέθους γραμματοσειράς"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Περιορισμοί"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Κατάργηση περιορισμών"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Αλλαγή κωδικού PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Εμφάν. ειδοποιήσεων"</string>
     <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="user_restrictions_title" msgid="7745810037152772035">"Περιορισμοί εφαρμογών, περιεχομένου"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ΜΕΤΟΝΟΜΑΣΙΑ"</string>
+    <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Ορισμός περιορισμών εφαρμογής"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Ελέγχονται από την εφαρμογή <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Αυτή η εφαρμογή δεν υποστηρίζεται σε περιορισμένα προφίλ"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Αυτή η εφαρμογή μπορεί να αποκτήσει πρόσβαση στους λογαριασμούς σας"</string>
+    <string name="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 0af57e7..cff546a 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,16 +218,127 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Unspecified"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"None"</item>
+    <item msgid="6062567900587138000">"SPN"</item>
+    <item msgid="2454085083342423481">"IMSI"</item>
+    <item msgid="2681427309183221543">"GID"</item>
+  </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Internal device storage"</item>
     <item msgid="3738430123799803530">"Removable SD card"</item>
     <item msgid="4498124044785815005">"Let the system decide"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Location"</item>
+    <item msgid="255608127647030286">"Personal"</item>
+    <item msgid="4588829735729884491">"Messaging"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Device"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"coarse location"</item>
+    <item msgid="5789673140227507995">"fine location"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibrate"</item>
+    <item msgid="3434165993711230924">"read contacts"</item>
+    <item msgid="616161687718081936">"modify contacts"</item>
+    <item msgid="7638002295329050091">"read call log"</item>
+    <item msgid="6546959730920410907">"modify call log"</item>
+    <item msgid="446877710771379667">"read calendar"</item>
+    <item msgid="7674458294386319722">"modify calendar"</item>
+    <item msgid="8281201165558093009">"Wi-Fi scan"</item>
+    <item msgid="8694611243479480497">"notification"</item>
+    <item msgid="7776439107987345446">"cell scan"</item>
+    <item msgid="514615766544675057">"call phone"</item>
+    <item msgid="8181415497109310680">"read SMS"</item>
+    <item msgid="6816551144382117307">"write SMS"</item>
+    <item msgid="4600463921908905030">"receive SMS"</item>
+    <item msgid="5958926493289432745">"receive emergency SMS"</item>
+    <item msgid="4945269495221089540">"receive MMS"</item>
+    <item msgid="5570472453573929087">"receive WAP push"</item>
+    <item msgid="7125408150230860501">"send SMS"</item>
+    <item msgid="7080337936612188061">"read ICC SMS"</item>
+    <item msgid="587124103118495063">"write ICC SMS"</item>
+    <item msgid="2320577158869025503">"modify settings"</item>
+    <item msgid="1545733463471924009">"draw on top"</item>
+    <item msgid="3609046903962454582">"access notifications"</item>
+    <item msgid="4671646036128214513">"camera"</item>
+    <item msgid="1097324338692486211">"record audio"</item>
+    <item msgid="5031552983987798163">"play audio"</item>
+    <item msgid="8374996688066472414">"read clipboard"</item>
+    <item msgid="3045529469061083747">"modify clipboard"</item>
+    <item msgid="5124443975763747838">"media buttons"</item>
+    <item msgid="4547883971364273343">"audio focus"</item>
+    <item msgid="2603878814882344450">"master volume"</item>
+    <item msgid="7136963238377062018">"voice volume"</item>
+    <item msgid="4270236897655923007">"ring volume"</item>
+    <item msgid="6325739889222559394">"media volume"</item>
+    <item msgid="5762123934816216821">"alarm volume"</item>
+    <item msgid="785049718065337473">"notification volume"</item>
+    <item msgid="6700305533746877052">"Bluetooth volume"</item>
+    <item msgid="2029227495214047094">"keep awake"</item>
+    <item msgid="26109888160231211">"monitor location"</item>
+  </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>
+    <item msgid="5753789168376302997">"Media buttons"</item>
+    <item msgid="3265262911688671938">"Audio focus"</item>
+    <item msgid="2098976479485046797">"Master volume"</item>
+    <item msgid="5660213838861789350">"Voice volume"</item>
+    <item msgid="7983336752371254444">"Ring volume"</item>
+    <item msgid="7878027809189330917">"Media volume"</item>
+    <item msgid="7260546305036218513">"Alarm volume"</item>
+    <item msgid="9103719301075748925">"Notification volume"</item>
+    <item msgid="7025966722295861512">"Bluetooth volume"</item>
+    <item msgid="4665183401128289653">"Keep awake"</item>
+    <item msgid="8584357129746649222">"Location"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Short"</item>
     <item msgid="2560532955514699713">"Medium"</item>
     <item msgid="2372711992605524591">"Long"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (debug)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Use Dalvik"</item>
+    <item msgid="5131846588686178907">"Use ART"</item>
+    <item msgid="4530003713865319928">"Use ART debug build"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Never check"</item>
     <item msgid="6042769699089883931">"Check for DRM content only"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Animation scale 5x"</item>
     <item msgid="1069584980746680398">"Animation scale 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"None"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi and 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"None"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (Graphics)"</item>
+    <item msgid="1340692776955662664">"Call stack on glGetError"</item>
+  </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Off"</item>
+    <item msgid="675719912558941285">"Draw non-rectangular clip region in blue"</item>
+    <item msgid="1064373276095698656">"Highlight tested drawing commands in green"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Off"</item>
+    <item msgid="2751513398307949636">"On screen as bars"</item>
+    <item msgid="8272260411216018353">"On screen as lines"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
+  </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Off"</item>
+    <item msgid="7688197031296835369">"Show overdraw areas"</item>
+    <item msgid="8332661909019981149">"Show overdraw counter"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standard limit"</item>
     <item msgid="4071574792028999443">"No background processes"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Timeout"</item>
     <item msgid="7664124146786465092">"Unsuccessful"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Ask"</item>
+    <item msgid="5077768429488260031">"Never allow"</item>
+    <item msgid="1417929597727989746">"Always allow"</item>
+  </string-array>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 86ae423..b9da9f9 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Yes"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="create" msgid="3578857613172647409">"Create"</string>
+    <string name="allow" msgid="3349662621170855910">"Allow"</string>
+    <string name="deny" msgid="6947806159746484865">"Deny"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Unknown"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"You are now <xliff:g id="STEP_COUNT">%1$d</xliff:g> step away from being a developer."</item>
+    <item quantity="other" msgid="6722953419953594148">"You are now <xliff:g id="STEP_COUNT">%1$d</xliff:g> steps away from being a developer."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"You are now a developer!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"No need, you are already a developer."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS &amp; NETWORKS"</string>
     <string name="header_category_device" msgid="5781174212691167553">"DEVICE"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Charging"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Discharging"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(wireless)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Not charging"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Not charging"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Full"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Unplugged"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"wireless"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Unknown"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Unknown"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Unknown error"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Cold"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Discoverable"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible to all Bluetooth devices nearby (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible to all Bluetooth devices nearby"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Not visible to other Bluetooth devices"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Only visible to paired devices"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Make device discoverable"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Visibility timeout"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Set how long device will be discoverable"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lock voice dialling"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Prevent use of the Bluetooth dialler when the screen is locked"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth devices"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Show files received"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth device chooser"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth permission request"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"An app wants to turn on Bluetooth. Allow?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"An app on your tablet wants to make your tablet discoverable by other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Allow?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"An app on your phone wants to make your phone discoverable by other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Allow?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"An app on your tablet wants to make your tablet “always discoverable” by other Bluetooth devices. Allow?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"An app on your phone wants to make your phone “always discoverable” by other Bluetooth devices. Allow?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"An app on your tablet wants to turn on Bluetooth and make your tablet discoverable by other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Allow?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"An app on your phone wants to turn on Bluetooth and make your phone discoverable by other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds. Allow?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"An app on your tablet wants to turn on Bluetooth and make your tablet discoverable by other devices. Allow?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"An app on your phone wants to turn on Bluetooth and make your phone discoverable by other devices. Allow?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"An app wants to turn on Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"An app wants to make your tablet visible to other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"An app wants to make your phone visible to other Bluetooth devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"An app wants to make your tablet visible to other Bluetooth devices. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"An app wants to make your phone visible to other Bluetooth devices. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"An app wants to turn on Bluetooth and make your tablet visible to other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"An app wants to turn on Bluetooth and make your phone visible to other devices for <xliff:g id="TIMEOUT">%1$d</xliff:g> seconds."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"An app wants to turn on Bluetooth and make your tablet visible to other devices. You can change this later in Bluetooth settings."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"An app wants to turn on Bluetooth and make your phone visible to other devices. You can change this later in Bluetooth settings."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Turning on Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Turning Bluetooth off…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Auto-connect"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"The HTTP proxy is used by the browser but may not be used by the other apps."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Location:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Neighbouring CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Data attempts:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS service:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"You have lost data connectivity because you left your home network with data roaming turned off."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Turn it on"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"When you allow data roaming, you may incur significant roaming charges!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"When you allow data roaming, you may incur significant roaming charges!\n\nThis setting affects all users on this tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"When you allow data roaming, you may incur significant roaming charges!\n\nThis setting affects all users on this phone."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Allow data roaming?"</string>
     <string name="networks" msgid="6333316876545927039">"Operator selection"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Choose a network operator"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Owner info"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Type text to display on the lock screen"</string>
+    <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Show user info on lock screen"</string>
+    <string name="user_info_settings_title" msgid="1195015434996724736">"User info"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Show profile info on lock screen"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profile info"</string>
     <string name="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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Require a numerical PIN or password to decrypt your tablet each time that you turn it on"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Require a numerical PIN or password to decrypt your phone each time that you turn it on"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encrypted"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you encrypt your tablet, you need to type a numeric PIN or password to decrypt it each time you switch it on. You can only decrypt your tablet by performing a factory data reset, erasing all your data."\n\n"Encryption takes an hour or more. You must start with a charged battery and keep your tablet plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you encrypt your phone, you need to type a numeric PIN or password to decrypt it each time you switch it on. You can\'t decrypt your phone except by performing a factory data reset, erasing all your data."\n\n"Encryption takes an hour or more. You must start with a charged battery and keep your phone plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you encrypt your tablet, you need to type a numeric PIN or password to decrypt it each time you switch it on. You can only decrypt your tablet by performing a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your tablet plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you encrypt your phone, you need to type a numeric PIN or password to decrypt it each time you switch it on. You can\'t decrypt your phone except by performing a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your phone plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encrypt tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encrypt phone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Please charge your battery and try again."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Try again in <xliff:g id="DELAY">^1</xliff:g> seconds."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Type your password"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryption unsuccessful"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Encryption was interrupted and can\'t be completed. As a result, the data on your tablet is no longer accessible. "\n\n" To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Encryption was interrupted and can\'t be completed. As a result, the data on your phone is no longer accessible. "\n\n"To resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Encryption was interrupted and can\'t be completed. As a result, the data on your tablet is no longer accessible. \n\n To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Encryption was interrupted and can\'t be completed. As a result, the data on your phone is no longer accessible. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Switch input method"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Choose screen lock"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Choose backup lock"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Change unlock PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Change unlock password"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Password must be at least %d characters"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN must be at least %d characters"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN must be at least %d characters"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Touch Continue when finished"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continue"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Password must be fewer than <xliff:g id="NUMBER">%d</xliff:g> characters."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"As speaker phone"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For music and media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
+    <string name="wifi_display_settings_title" msgid="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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Paired displays"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Available devices"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Connecting"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Connected"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Available"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"In use"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Display settings"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Disconnect?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"This will end your connection with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Wireless display options"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Forget"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Finished"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Name"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"On"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Off"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Disabled"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Allow data exchange when the tablet touches another device"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Allow data exchange when the phone touches another device"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Off"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Unavailable because NFC is turned off"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"When this feature is turned on, you can beam app content to another NFC-capable device by holding the devices close together. For example, you can beam Browser pages, YouTube videos, People contacts and more."\n\n"Just bring the devices together (typically back to back) and then touch your screen. The app determines what gets beamed."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"When this feature is turned on, you can beam app content to another NFC-capable device by holding the devices close together. For example, you can beam Browser pages, YouTube videos, People contacts and more.\n\nJust bring the devices together (typically back to back) and then touch your screen. The app determines what gets beamed."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Network service discovery"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Allow apps on other devices to discover apps on this device"</string>
-    <string name="wifi_quick_toggle_title" msgid="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="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="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="8116564886303972764">"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_in_progress" msgid="2944576520214787628">"WPS is already in progress and can take up to two minutes to complete"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Connected to Wi‑Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS is already in progress and can take up to two minutes to complete"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Request failed. Please try again in a few minutes."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"The wireless router security setting (WEP) is not supported"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"The wireless router security setting (TKIP) is not supported"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Authentication failure. Please try again."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Another WPS session was detected. Please try again in a few minutes."</string>
     <string name="wifi_ssid" msgid="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>
@@ -564,6 +621,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\nAllow 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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Save"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Failed to save network"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancel"</string>
-    <string name="wifi_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_skip_anyway" msgid="6965361454438011190">"Skip anyway"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"Don\'t skip"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"WARNING: You may incur extra carrier data charges.\n\nTablet 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\nPhone setup can require significant network activity."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Searching…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Rename device"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Peer devices"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Remembered groups"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Could not connect."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Failed to rename device."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Disconnect?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"If you disconnect, your connection with <xliff:g id="PEER_NAME">%1$s</xliff:g> and <xliff:g id="PEER_COUNT">%2$s</xliff:g> other devices will end."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancel invitation"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Do you want to cancel invitation to connect with <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Portable Wi-Fi hotspot"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Forget this group?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Portable Wi‑Fi hotspot"</string>
+    <string name="wifi_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>
@@ -616,12 +688,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>
-    <string name="notification_sound_title" msgid="312032901303146002">"Default notification"</string>
+    <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>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Choose notification ringtone"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Default notification sound"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Media"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Set volume for music and videos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Choose wallpaper from"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Screen Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Will start upon sleep if connected to power"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Disabled"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Selected candy"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"When to activate"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> spent idle"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Never"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Try it!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Also start when docked"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"When docked or asleep and charging"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Either"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"While charging"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"While docked"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Off"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"To control what happens when the phone is docked and/or sleeping, turn Dreams on."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"When to daydream"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Start now"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Settings"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Font size"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Incorrect PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PINs don\'t match"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Can\'t change PIN."\n"Possibly incorrect PIN."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Can\'t change PIN.\nPossibly incorrect PIN."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN changed successfully"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Can\'t change SIM card lock state."\n"Possibly incorrect PIN."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Can\'t change SIM card lock state.\nPossibly incorrect PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancel"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tablet status"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Baseband version"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel version"</string>
     <string name="build_number" msgid="3075795840572241758">"Build number"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Not available"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -733,12 +807,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">"Mobile network type"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Operator info"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Mobile network state"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Service status"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"Signal strength"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Network"</string>
-    <string name="status_wifi_mac_address" msgid="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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB storage"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD card"</string>
     <string name="memory_available" msgid="5052397223077021181">"Available"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Available (read-only)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Total space"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calculating..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Apps (app data &amp; media content)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Pictures, videos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (music, ringtones, podcasts, etc.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Misc."</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Cached data"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Unmount shared storage"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Unmount SD card"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Unmount the internal USB storage"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Erase SD card"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Erases all data on the internal USB storage, such as music and photos"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Erases all data on the SD card, such as music and photos"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Read-only)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Clear cached data?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"This will clear cached data for all apps."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP or PTP function is active"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Unmount USB storage"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Unmount SD card?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"If you unmount the USB storage, some apps that you are using will stop and may be unavailable until you remount the USB storage."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Camera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Lets you transfer photos using camera software and transfer any files on computers that don\'t support MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Install file-transfer tools"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Other users"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Battery status"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Battery level"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Factory data reset"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Erases all data on tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Erases all data on phone"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"This will erase all data from your tablet\'s "<b>"internal storage"</b>", including:"\n\n<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:"\n\n<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"This will erase all data from your tablet\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be untethered."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobile networks"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Manage mobile plan"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Unknown SIM operator"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s has no known provisioning website"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Please insert SIM card and restart"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Please connect to the internet"</string>
     <string name="location_title" msgid="1029961368397484576">"My Location"</string>
-    <string name="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>
@@ -917,6 +1004,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"View legal info, status, software version"</string>
     <string name="legal_information" msgid="5769301644270604095">"Legal information"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contributors"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Regulatory information"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Terms and conditions"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Change unlock PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirm saved pattern"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Try again:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Draw an unlock pattern"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Draw an unlock pattern:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Press Menu for help."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Release finger when done."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Connect at least <xliff:g id="NUMBER">%d</xliff:g> dots. Try again:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"How to draw an unlock pattern"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Too many incorrect attempts!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Try again in <xliff:g id="NUMBER">%d</xliff:g> seconds."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Cancel"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Next"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Securing your tablet"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Securing your phone"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protect your tablet from unauthorised use by creating a personal screen unlock pattern. Slide your finger to connect the dots in any order on the next screen. You need to connect at least four dots. "\n\n"Ready to start? Touch Next."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protect your phone from unauthorised use by creating a personal screen unlock pattern. Slide your finger to connect at least four dots in any order on the next screen. "\n\n"Ready to start? Touch Next."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Application is not installed on your phone."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Manage apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Manage and remove installed apps"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Apps"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Allow installation of apps from unknown sources"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Your tablet and personal data are more vulnerable to attack by apps from unknown sources. You agree that you are solely responsible for any damage to your tablet or loss of data that may result from using these apps."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Your phone and personal data are more vulnerable to attack by apps from unknown sources. You agree that you are solely responsible for any damage to your phone or loss of data that may result from using these apps."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Verify apps"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Disallow or warn before installation of apps that may cause harm"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Advanced settings"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Enable more settings options"</string>
     <string name="application_info_label" msgid="5736524913065714880">"App info"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB storage data"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD card"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Uninstall"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Uninstall for all users"</string>
+    <string name="install_text" msgid="884360662922471113">"Install"</string>
     <string name="disable_text" msgid="6544054052049395202">"Disable"</string>
     <string name="enable_text" msgid="9217362512327828987">"Enable"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Clear data"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Show cached processes"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Reset app preferences"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Reset app preferences?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"This will reset all preferences for:"\n\n" "<li>"Disabled apps"</li>\n" "<li>"Disabled app notifications"</li>\n" "<li>"Default applications for actions"</li>\n" "<li>"Background data restrictions for apps"</li>\n\n" You will not lose any app data."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"This will reset all preferences for:\n\n "<li>"Disabled apps"</li>\n" "<li>"Disabled app notifications"</li>\n" "<li>"Default applications for actions"</li>\n" "<li>"Background data restrictions for apps"</li>\n\n" You will not lose any app data."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Reset apps"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Manage space"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Choose filter options"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"All"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Disabled"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Downloaded"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Running"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB storage"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"On SD card"</string>
     <string name="disabled" msgid="9206776641295849915">"Disabled"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Not installed"</string>
     <string name="no_applications" msgid="7336588977497084921">"No apps."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Internal storage"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB storage"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> and <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"This app may charge you money:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Send premium SMS"</string>
     <string name="computing_size" msgid="1599186977475211186">"Computing…"</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Couldn\'t compute the package size."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"You don\'t have any third-party apps installed."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Change the preferred installation location for new applications."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Disable built-in app?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"If you disable a built-in app, other apps may misbehave."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Delete data and disable app?"</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"If you disable a built-in app, other apps may misbehave. Your data will also be deleted."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Turn off notifications"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"If you turn off notifications for this app, you may miss important alerts and updates."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"App ops"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Running"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Never used)"</string>
     <string name="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>
@@ -1094,6 +1190,8 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"User: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Removed user"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process and <xliff:g id="NUMSERVICES">%2$d</xliff:g> service"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process and <xliff:g id="NUMSERVICES">%2$d</xliff:g> services"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processes and <xliff:g id="NUMSERVICES">%2$d</xliff:g> service"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Physical keyboard settings"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Press Space key twice to insert \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Make passwords visible"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"This input method may be able to collect all the text that you type, including personal data like passwords and credit card numbers. It comes from the app <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Use this input method?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"This spell checker may be able to collect all the text that you type, including personal data like passwords and credit card numbers. It comes from the app <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Use this spell checker?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Settings"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"To switch, press Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Default"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Keyboard layouts"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"User dictionary"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personal dictionary"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personal dictionaries"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personal dictionary"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Add"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Add to dictionary"</string>
@@ -1157,6 +1252,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>
@@ -1177,7 +1274,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Screen will never sleep while charging"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Enable Bluetooth HCI snoop log"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capture all Bluetooth HCI packets in a file"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Select runtime"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Select runtime"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Reboot to change runtime from <xliff:g id="OLD">%1$s</xliff:g> to <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Allow USB debugging?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification and read log data."</string>
+    <string name="adb_keys_warning_message" msgid="6932230298032192937">"Revoke access to USB debugging from all computers you\'ve previously authorised?"</string>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Allow development settings?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"These settings are intended for development use only. They can cause your device and the applications on it to break or misbehave."</string>
+    <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verify apps over USB"</string>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Check apps installed via ADB/ADT for harmful behaviour."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protect USB storage"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apps must request permission to read USB storage"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Protect USB storage?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"When USB storage is protected, apps must request permission to read data from external storage."\n\n"Some apps may not work until updated by their developers."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"When USB storage is protected, apps must request permission to read data from external storage.\n\nSome apps may not work until updated by their developers."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Protect SD card"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apps must request permission to read SD card"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Protect SD card?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"When SD card is protected, apps must request permission to read data from external storage."\n\n"Some apps may not work until updated by their developers."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"When SD card is protected, apps must request permission to read data from external storage.\n\nSome apps may not work until updated by their developers."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Local terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Enable terminal app that offers local shell access"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Choose gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Choose widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Create widget and allow access?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Accessibility settings"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Services"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Large text"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Power button ends call"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Speak passwords"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Touch &amp; hold delay"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Enhance web accessibility"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Magnification gestures"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"When this feature is turned on, you can zoom in and out by triple-tapping the screen.\n\nWhile zoomed in, you can:\n"<ul><li>"Pan: Drag two or more fingers across the screen."</li>\n<li>"Adjust zoom level: Pinch two or more fingers together or spread them apart."</li></ul>\n\n"You can also temporarily magnify what\'s under your finger by triple-tapping and holding. In this magnified state, you can drag your finger to explore different parts of the screen. Lift your finger to return to your previous state.\n\nNote: Triple-tap for magnification works everywhere except the keyboard and navigation bar."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Accessibility shortcut"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"On"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Off"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"When this feature is turned on, you can quickly enable accessibility features in two steps:\n\nStep 1: Press and hold the power button until you hear a sound or feel a vibration.\n\nStep 2: Touch and hold two fingers until you hear audio confirmation.\n\nIf the device has multiple users, using this shortcut on the lock screen temporarily enables accessibility until the device is unlocked."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Large text"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Screen magnification"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto update screen magnification"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Update screen magnification on app transitions"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Power button ends call"</string>
+    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Speak passwords"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Touch &amp; hold delay"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Settings"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"On"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"On"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Off"</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="print_settings" msgid="4742428530112487843">"Printing"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Printing settings"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Services"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> can receive documents you print. Such documents may contain sensitive data."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"No services installed"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Settings"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Add printers"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"On"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Off"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Battery"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"What has been using the battery"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Battery usage data isn\'t available."</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Data received"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Mobile data sent"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobile data received"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Wi‑Fi data sent"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Wi‑Fi data received"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Time on"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Stop or uninstall the app"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Manually control GPS to prevent app from using it"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"The application may offer settings to reduce battery use"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Battery used by user"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> since unplugged"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"While last for unplugged for <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Usage totals"</string>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pitch"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affects the tone of the spoken text"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Language"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Language not selected"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Sets the language-specific voice for the spoken text"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Listen to an example"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Play a short demonstration of speech synthesis"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Brightness <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"auto"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"full"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"half"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"off"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Credential storage"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Install from storage"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"When reinstalling an app, restore backed up settings and data"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Take bug report"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"This will collect information about your current device state, to send as an e-mail message. It will take a little time from starting the bug report until it is ready to be sent; please be patient."</string>
-    <string name="report" msgid="302437572240018342">"Report"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Desktop backup password"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Desktop full backups aren\'t currently protected"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Touch to change or remove the password for desktop full backups"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nTouch "<b>"Back"</b>" to connect to a different Wi‑Fi network."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sync enabled"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sync disabled"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sync error..."</string>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Calendar"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Contacts"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" "\n"A Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"App sync settings"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data &amp; synchronisation"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Change password"</string>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Flash entire window surfaces when they update"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Show GPU view updates"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash views inside windows when drawn with the GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Show hardware layers updates"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Flash hardware layers green when they update"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Debug GPU overdraw"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Disable HW overlays"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Always use GPU for screen compositing"</string>
-    <string name="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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulate secondary displays"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Don\'t keep activities"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destroy every activity as soon as the user leaves it"</string>
     <string name="app_process_limit_title" msgid="4280600650253107163">"Background process limit"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Show all ANRs"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Show App Not Responding dialogue for background apps"</string>
+    <string name="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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Disable background data on mobile networks. Non-mobile networks will be used if available."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"To restrict background data for this app, first set a mobile data limit."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Restrict background data?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"This feature may cause an app that depends on background data to stop working when only mobile networks are available."\n\n"You can find more appropriate data usage controls in the settings available within the app."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"This feature may cause an app that depends on background data to stop working when only mobile networks are available.\n\nYou can find more appropriate data usage controls in the settings available within the app."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Restricting background data is possible only when you\'ve set a mobile data limit."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Turn auto-sync data on?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Any changes you make to your accounts on the web will be automatically copied to your tablet."\n\n"Some accounts may also automatically copy any changes you make on the tablet to the web. A Google Account works this way."\n\n"To choose which kinds of information to sync within each account, go to Settings &gt; Accounts."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Any changes you make to your accounts on the web will be automatically copied to your phone."\n\n"Some accounts may also automatically copy any changes you make on the phone to the web. A Google Account works this way."\n\n"To choose which kinds of information to sync within each account, go to Settings &gt; Accounts."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Any changes you make to your accounts on the web will be automatically copied to your tablet.\n\nSome accounts may also automatically copy any changes you make on the tablet to the web. A Google Account works this way.\n\nTo choose which kinds of information to sync within each account, go to Settings &gt; Accounts."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Any changes you make to your accounts on the web will be automatically copied to your phone.\n\nSome accounts may also automatically copy any changes you make on the phone to the web. A Google Account works this way.\n\nTo choose which kinds of information to sync within each account, go to Settings &gt; Accounts."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Turn auto-sync data off?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"This will conserve data and battery usage, but you\'ll need to sync each account manually to collect recent information. And you won\'t receive notifications when updates occur."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Usage cycle reset date"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Set data usage warning"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Set data usage limit"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limiting data usage"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Your mobile data connection will be disabled when the specified limit is reached.\n\nSince 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\nSince 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" 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\nThis 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\nThis setting affects all users on this phone."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"warning"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limit"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Removed apps"</string>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Removed apps and users"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> received, <xliff:g id="SENT">%2$s</xliff:g> sent"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: about <xliff:g id="TOTAL">%1$s</xliff:g> used."</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: about <xliff:g id="TOTAL">%1$s</xliff:g> used, as measured by your tablet. Your carrier\'s data usage accounting may differ."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: about <xliff:g id="TOTAL">%1$s</xliff:g> used, as measured by your phone. Your carrier\'s data usage accounting may differ."</string>
     <string name="data_usage_metered_title" msgid="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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Add VPN profile"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Edit profile"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Delete profile"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Always-on VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Select a VPN profile to always remain connected to. Network traffic will only be allowed when connected to this VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"None"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Always-on VPN requires an IP address for both server and DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"There is no network connection. Please try again later."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"A certificate is missing. Please edit the profile."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancel"</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">"Additional system updates"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Users &amp; restrictions"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Users"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Add user"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Edit details"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"User information"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Name"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Content restrictions"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Require PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Content rating"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"System app"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Installed apps"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Discard"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Remove user"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Pesky kid"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Disabled"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Users"</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="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\nAfter you create a new user, that person needs to go through a set-up process.\n\nAny 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\nAny 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_confirm_remove_message" msgid="5284111415714437285">"Are you sure you want to remove the user and all associated data from the device?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Change font size"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Restrictions:"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Remove restrictions"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Change PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Show notifications"</string>
     <string name="help_label" msgid="1107174367904110532">"Help"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Account for content"</string>
+    <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="6160672982086584261">"Set app restrictions"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controlled by <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"This app is not supported in restricted profiles"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"This app can access your accounts"</string>
+    <string name="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 7ab6588..420ddaf 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">"Veloz"</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,16 +218,127 @@
     <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="886742181977884584">"Medios"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"botones de medios"</item>
+    <item msgid="4547883971364273343">"enfoque de audio"</item>
+    <item msgid="2603878814882344450">"volumen principal"</item>
+    <item msgid="7136963238377062018">"volumen de voz"</item>
+    <item msgid="4270236897655923007">"volumen de tono"</item>
+    <item msgid="6325739889222559394">"volumen de medios"</item>
+    <item msgid="5762123934816216821">"volumen de alarma"</item>
+    <item msgid="785049718065337473">"volumen de notificación"</item>
+    <item msgid="6700305533746877052">"volumen de bluetooth"</item>
+    <item msgid="2029227495214047094">"mantener en funcionamiento"</item>
+    <item msgid="26109888160231211">"controlar ubicación"</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>
+    <item msgid="5753789168376302997">"Botones de medios"</item>
+    <item msgid="3265262911688671938">"Enfoque de audio"</item>
+    <item msgid="2098976479485046797">"Volumen principal"</item>
+    <item msgid="5660213838861789350">"Volumen de voz"</item>
+    <item msgid="7983336752371254444">"Volumen de tono"</item>
+    <item msgid="7878027809189330917">"Volumen de medios"</item>
+    <item msgid="7260546305036218513">"Volumen de alarma"</item>
+    <item msgid="9103719301075748925">"Volumen de notificación"</item>
+    <item msgid="7025966722295861512">"Volumen de Bluetooth"</item>
+    <item msgid="4665183401128289653">"Mantener en funcionamiento"</item>
+    <item msgid="8584357129746649222">"Ubicación"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Corto"</item>
     <item msgid="2560532955514699713">"Medio"</item>
     <item msgid="2372711992605524591">"Largo"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (depuración)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Usar Dalvik"</item>
+    <item msgid="5131846588686178907">"Usar ART"</item>
+    <item msgid="4530003713865319928">"Usar compilación de depuración de ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nunca comprobar"</item>
     <item msgid="6042769699089883931">"Comprobar contenido DRM solamente"</item>
@@ -253,9 +376,38 @@
     <item msgid="3170120558236848008">"Escala de animación 5x"</item>
     <item msgid="1069584980746680398">"Escala de animación 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Ninguno"</item>
+    <item msgid="688482401508173818">"720 x 480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280 x 720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280 x 720 tvdpi y 1920 x 1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Ninguna"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Desactivado"</item>
+    <item msgid="7688197031296835369">"Mostrar áreas superpuestas"</item>
+    <item msgid="8332661909019981149">"Mostrar contador de superposiciones"</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>
+    <item msgid="4071574792028999443">"Ningún proceso en 2do plano"</item>
     <item msgid="4810006996171705398">"Máximo 1 proceso"</item>
     <item msgid="8586370216857360863">"Máximo 2 procesos"</item>
     <item msgid="836593137872605381">"Máximo 3 procesos"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Tiempo de espera agotado"</item>
     <item msgid="7664124146786465092">"Incorrecta"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Preguntar"</item>
+    <item msgid="5077768429488260031">"No permitir nunca"</item>
+    <item msgid="1417929597727989746">"Permitir siempre"</item>
+  </string-array>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ac7cfde..a31a045 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Sí"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="create" msgid="3578857613172647409">"Crear"</string>
+    <string name="allow" msgid="3349662621170855910">"Permitir"</string>
+    <string name="deny" msgid="6947806159746484865">"Rechazar"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> paso de ser programador."</item>
+    <item quantity="other" msgid="6722953419953594148">"Estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> pasos de ser programador."</item>
+  </plurals>
+    <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>
@@ -38,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>
@@ -84,12 +92,14 @@
     <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_discharging" msgid="6222697503392774475">"Batería en uso"</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 realiza la carga"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Cargada"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Desconectado"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"conexiones inalámbricas"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"CA+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Desconocido"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Desconocido"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Error desconocido"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Frío"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Visible"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible para todos los dispositivos Bluetooth cercanos (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <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_not_discoverable" msgid="128269993123955177">"Hacer que el dispositivo sea visible"</string>
-    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tiempo de visibilidad"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Configurar el tiempo durante el que el dispositivo será detectable"</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>
@@ -116,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>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar los archivos recibidos"</string>
     <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="5279027758886569301">"Una aplicación desea activar el Bluetooth. ¿Lo permites?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Una aplicación de tu tableta desea hacerla visible para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Lo permites?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Una aplicación de tu dispositivo desea hacerlo visible para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Lo permites?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Una aplicación de tu tableta quiere que esta sea \"siempre visible\" para otros dispositivos Bluetooth. ¿Lo permites?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Una aplicación de tu dispositivo quiere que este sea \"siempre visible\" para otros dispositivos Bluetooth. ¿Lo permites?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Una aplicación de tu tableta desea activar el Bluetooth y hacerlo visible para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Lo permites?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Una aplicación en tu dispositivo desea activar Bluetooth y hacer que tu dispositivo sea visible para otros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Lo permites?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Una aplicación de tu tableta desea activar Bluetooth y hacer visible tu tableta para otros dispositivos. ¿Lo permites?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Una aplicación en tu dispositivo desea activar Bluetooth y hacer que tu dispositivo sea visible para otros dispositivos. ¿Lo permites?"</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 tablet para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Una aplicación quiere hacer visible tu dispositivo para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Una aplicación quiere hacer visible tu tablet para otros dispositivos Bluetooth. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
+    <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 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 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>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conectar automáticamente"</string>
@@ -177,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>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador usa el proxy HTTP pero tal vez las demás aplicaciones no lo usen."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicación:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID cercano:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Información móvil:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Intentos de datos:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Servicio GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -257,19 +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\nEsta 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\nEsta 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>
@@ -293,51 +303,55 @@
     <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Solicitar parpadeo durante desbloqueo"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automáticamente"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> después de la suspensión"</string>
-    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostrar datos de propietario en pantalla de bloqueo"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostrar datos de propietario en pantalla bloqueada"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Datos de propietario"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
-    <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Escribe el texto para la pantalla de bloqueo."</string>
+    <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="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_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\nEl 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\nEl 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 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="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_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\nPara 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>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Bloqueo alternativo"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo de pantalla"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Cambiar pant. de bloq."</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Cambiar pant. bloqueada"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Cambiar/inhab. patrón/PIN/contraseña"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Elige un método para bloquear la pantalla."</string>
     <string name="unlock_backup_info_summary" msgid="108524727803788172">"Si el desbloqueo facial no te reconoce, ¿cómo quieres desbloquear la pantalla?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Ninguna"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
-    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Inhabilitar seguridad"</string>
+    <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Deslizar"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Sin seguridad"</string>
     <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Desbloqueo facial"</string>
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Seguridad baja, experimental"</string>
@@ -349,7 +363,7 @@
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Nivel de seguridad alto"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Inhabilitado por administrador, política de encriptación o almacenamiento de credenciales"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ninguna"</string>
-    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Activar seguridad"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Deslizar"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Desbloqueo facial"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Patrón"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN de desbloqueo"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambiar la contraseña de desbloqueo"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"La contraseña debe tener al menos %d caracteres."</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"El PIN debe tener al menos %d caracteres."</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"El PIN debe tener al menos %d dígitos."</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Toca Continuar cuando hayas finalizado"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"La contraseña debe tener menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
@@ -406,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>
@@ -430,7 +453,7 @@
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Vínculo rechazado por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"No se pudo establecer conexión con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Buscar dispositivos"</string>
-    <string name="bluetooth_search_for_devices" msgid="5957007154213560390">"Búsqueda de 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_preference_device_settings" msgid="907776049862799122">"Configuración de dispositivos"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Dispositivos vinculados"</string>
@@ -441,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>
@@ -480,64 +503,98 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música y medios"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recordar la configuración"</string>
+    <string name="wifi_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="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>
+    <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_connected" msgid="8364125226376985558">"Conectada"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponible"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"En uso"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Configuración de visualización"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"¿Desconectar?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Finalizará tu conexión con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;."</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Opciones de pantalla inalámbrica"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Borrar"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Listo"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Nombre"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Activada"</string>
+    <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>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desactivada"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"No disponible porque NFC está desactivada"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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\nSolo 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="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_wps_pin" msgid="6426448256268695933">"Ingreso PIN WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Más opciones"</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="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="8116564886303972764">"Ingresa el PIN <xliff:g id="NUMBER">%1$s</xliff:g> en tu enrutador Wi-Fi. La configuración puede demorar hasta dos minutos en completarse."</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_in_progress" msgid="2944576520214787628">"La configuración de WPS está en curso y puede demorar hasta dos minutos en completarse."</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"No se admite la configuración de seguridad del enrutador inalámbrico (TKIP)."</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Se produjo un error al realizar la autenticación. Vuelve a intentarlo."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Se detectó otra sesión WPS. Vuelve a intentarlo en unos minutos."</string>
     <string name="wifi_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>
@@ -555,7 +612,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>
@@ -564,6 +621,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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"No se pudo guardar la red."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</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_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\nLa 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\nLa configuración del dispositivo puede requerir una significativa actividad de la red."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Buscando…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Cambiar el nombre del dispositivo"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Otros dispositivos"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Grupos recordados"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"No se pudo establecer conexión."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Error al cambiar nombre del dispositivo"</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"¿Deseas desconectarte?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Si te desconectas, tu conexión con <xliff:g id="PEER_NAME">%1$s</xliff:g> y con otros <xliff:g id="PEER_COUNT">%2$s</xliff:g> dispositivos finalizará."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Zona Wi-Fi portátil"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"¿Deseas borrar este grupo?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Zona Wi-Fi portátil"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Efectos de la música"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volumen del timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en modo silencioso"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Notificación predeterminada"</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="incoming_call_volume_title" msgid="8073714801365904099">"Tono de llamada"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificación"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilizar el volumen de las llamadas entrantes para las notificaciones"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Elegir tono de notificación"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Sonido de notificación predeterminado"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Medios"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Establecer volumen para la música y los videos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarma"</string>
@@ -649,7 +721,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>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Elegir fondo de pantalla de"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Pantalla de caramelo"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Se iniciará luego de que la pantalla se desactive, siempre que exista una conexión eléctrica."</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Inhabilitado"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Caramelo seleccionado"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Tiempo de espera para la activación"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Luego de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nunca"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Pruébalo."</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Activar también cuando el dispositivo esté conectado"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Activar protector de pantalla"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Cuando esté conectado o cuando se encuentre inactivo y cargándose"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"En ambos casos"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la carga"</string>
+    <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 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>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamaño de fuente"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN de tarjeta SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN incorrecto"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Los PIN no coinciden"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"No se puede cambiar el PIN."\n"PIN posiblemente incorrecto."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"No se puede cambiar el PIN.\nPIN posiblemente incorrecto."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"El PIN de la tarjeta SIM se ha cambiado correctamente"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"No se puede cambiar el estado de bloqueo de la tarjeta SIM."\n"PIN posiblemente incorrecto."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"No se puede cambiar el estado de bloqueo de la tarjeta SIM.\nPIN posiblemente incorrecto."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Aceptar"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estado del tablet"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versión de banda base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versión de núcleo"</string>
     <string name="build_number" msgid="3075795840572241758">"Número de compilación"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Estado de SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"No disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
@@ -733,12 +807,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">"Tipo de red de celulares"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Información del operador"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Estado de red de celulares"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Estado del servicio"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Almacenamiento USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Tarjeta SD"</string>
     <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_apps_usage" msgid="2348501997988663688">"Aplicaciones (datos de aplic. y cont. multimedia)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imágenes, videos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (música, tonos de teléfono, podcasts, etc.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Varios."</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Datos almacenados en caché"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desactivar alm. comp."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmontar la tarjeta SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desmontar el almacenamiento USB interno"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Eliminar la tarjeta SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Borra todos los datos del almacenamiento USB interno, como la música y las fotos"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Borra todos los datos de la tarjeta SD, como la música y las fotos"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Sólo lectura)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"¿Deseas borrar los datos almacenados en caché?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Se borrarán datos en caché de las aplicaciones."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"La función MTP o PTP está activa."</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"¿Desactivar almac. USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"¿Desactivar tarjeta SD?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Si desactivas el almacenamiento USB, se detendrán algunas aplicaciones que utilices y no estarán disponibles hasta que lo vuelvas a activar."</string>
@@ -785,14 +864,15 @@
     <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>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Cámara (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Te permite transferir fotos con el software de la cámara y archivos a computadoras que no admiten MTP."</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalar las herramientas de transferencia de archivos"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Otros usuarios"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado de batería"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivel de la batería"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -822,6 +902,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>
@@ -835,11 +917,11 @@
     <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="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" 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>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para borrar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para borrar música, imágenes y otros datos del usuario, debes borrar la "<b>"tarjeta SD"</b>"."</string>
@@ -847,7 +929,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>
@@ -897,18 +979,23 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ya no se anclará a red."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móviles"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Administrar plan móvil"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operador de SIM desconocido"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s no tiene ningún sitio de aprovisionamiento."</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Inserta la tarjeta SIM y reinicia."</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conéctate a Internet."</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>
@@ -917,6 +1004,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Ver información legal, estado, versión de software del tablet"</string>
     <string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboradores"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Información regulatoria"</string>
     <string name="copyright_title" msgid="865906688917260647">"Derechos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Términos y condiciones"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Cambiar PIN de desbloqueo"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar el patrón guardado"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Inténtalo de nuevo:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dibuja un patrón de desbloqueo"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Extraer un patrón de desbloqueo:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Presiona Menú para obtener ayuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Levanta el dedo cuando termines."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Conecta al menos <xliff:g id="NUMBER">%d</xliff:g> puntos. Vuelve a intentarlo."</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cómo se debe extraer un patrón de desbloqueo"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"¡Demasiados intentos incorrectos!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Vuelve a intentarlo en <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Cancelar"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Siguiente"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Protección de tu tablet"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Protección de tu dispositivo"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protege tu tableta contra usos no autorizados al crear un patrón de desbloqueo de pantalla personal. Usa el dedo para unir en cualquier orden los puntos de la siguiente pantalla. Debes conectar al menos cuatro puntos. "\n\n"Para comenzar, toca Siguiente."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protege tu dispositivo contra el uso no autorizado creando un patrón de desbloqueo de pantalla personal. Usa el dedo para conectar al menos cuatro puntos en cualquier orden en la siguiente pantalla. "\n\n"¿Listo para empezar? Toca \"Siguiente\"."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"La aplicación no está instalada en tu dispositivo."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrar y eliminar aplicaciones instaladas"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplicaciones"</string>
@@ -979,8 +1062,10 @@
     <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>
     <string name="advanced_settings" msgid="1777249286757067969">"Configuración avanzada"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Activar más opciones de configuración"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Información de la aplicación"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Datos en el almacenamiento USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Tarjeta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalar..."</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Desinstalar en todos los usuarios"</string>
+    <string name="install_text" msgid="884360662922471113">"Instalar"</string>
     <string name="disable_text" msgid="6544054052049395202">"Inhabilitar"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activar"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Eliminar datos"</string>
@@ -1019,17 +1106,19 @@
     <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>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Almacenamiento USB"</string>
@@ -1046,14 +1135,16 @@
     <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>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Esta aplicación puede costarte dinero:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Enviar SMS premium"</string>
     <string name="computing_size" msgid="1599186977475211186">"Calculando..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"No se pudo calcular el tamaño del paquete."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"No tienes instalada ninguna aplicación de terceros."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Cambiar la ubicación de instalación preferida para nuevas aplicaciones"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"¿Inhabilitar aplic. incorp.?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Si inhabilitas una aplicación incorporada, otras aplicaciones podrían funcionar incorrectamente."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"¿Deseas eliminar los datos y desactivar la aplicación?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Usuario: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Usuario eliminado"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicio"</string>
@@ -1112,7 +1210,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>
@@ -1128,13 +1226,12 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Configuración de teclado físico"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Presionar la tecla de espacio dos veces para insertar \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Mostrar las contraseñas"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"El método de entrada puede recopilar todo el texto que escribas, incluidos los datos personales como contraseñas y números de tarjetas de crédito. Proviene de la aplicación <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. ¿Deseas utilizar este método de entrada?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Este corrector ortográfico puede recopilar todo el texto que escribas, incluidos los datos personales como contraseñas y números de tarjetas de crédito. Proviene de la aplicación <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. ¿Deseas usar este corrector ortográfico?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Configuración"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Idioma"</string>
     <string name="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>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para cambiar, presiona Ctrl+espacio."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predeterminado"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Diseños de teclado"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diccionario del usuario"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Diccionario personal"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Diccionarios personales"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Diccionario personal"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Agregar"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Agregar al diccionario"</string>
@@ -1157,6 +1252,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>
@@ -1195,26 +1292,40 @@
     <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="bt_hci_snoop_log" msgid="3340699311158865670">"Habilitar el registro de búsqueda de HCI de Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos los paquetes de HCI de Bluetooth en un archivo"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Tiempo de ejecución"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Tiempo de ejecución"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"¿Reiniciar para cambiar el tiempo de ejecución de <xliff:g id="OLD">%1$s</xliff:g> a <xliff:g id="NEW">%2$s</xliff:g>?"</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">"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>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Cuando el almacenamiento USB está protegido, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo."\n\n"Es posible que algunas aplicaciones no funcionen hasta que los programadores las actualicen."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Cuando el almacenamiento USB está protegido, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo.\n\nEs posible que algunas aplicaciones no funcionen hasta que los programadores las actualicen."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Proteger tarjeta SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Las aplicaciones deben pedir permiso para leer la tarjeta SD."</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"¿Proteger tarjeta SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Cuando la tarjeta SD está protegida, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo."\n\n"Es posible que algunas aplicaciones no funcionen hasta que los programadores las actualicen."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Cuando la tarjeta SD está protegida, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo.\n\nEs posible que algunas aplicaciones no funcionen hasta que los programadores las actualicen."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal local"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Habilitar aplicac. de terminal que ofrece acceso al shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Elegir gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Elegir control"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"¿Deseas crear el widget y permitir el acceso?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configuración de accesibilidad"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Servicios"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Texto grande"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"El botón de activado finaliza la llamada."</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Decir contraseñas"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Retraso entre tocar y mantener presionado"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Mejorar accesibilidad web"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gestos de ampliación"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Cuando esta función está activada, puedes acercar y alejar la imagen con solo tocar tres veces la pantalla.\n\nA continuación se indican las acciones que puedes hacer con la imagen acercada.\n"<ul><li>"Desplazar la imagen: arrastra dos o más dedos por la pantalla."</li>\n<li>"Modificar el nivel de zoom: une dos o más dedos o sepáralos."</li></ul>\n\n"También puedes ampliar el contenido seleccionado de forma temporal con solo tocar la pantalla tres veces y mantenerla presionada. Con el contenido ampliado, puedes arrastrar el dedo para explorar diferentes partes de la pantalla. Levanta el dedo para volver al estado anterior.\n\nNota: Puedes tocar tres veces la pantalla para ampliar el contenido en cualquier parte, excepto en el teclado y en la barra de navegación."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Acceso directo a la accesibilidad"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Encendido"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desactivada"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Cuando esta función está activada, puedes activar las funciones de accesibilidad rápidamente en dos pasos.\n\nPaso 1: mantén presionado el botón de encendido hasta que oigas un sonido o notes una vibración.\n\nPaso 2: mantén la pantalla presionada con dos dedos hasta que oigas una confirmación.\n\nSi el dispositivo tiene varios usuarios, este acceso directo en la pantalla bloqueada permite habilitar la accesibilidad de forma temporal hasta que el dispositivo se desbloquea."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Texto grande"</string>
+    <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">"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_menu_item_settings" msgid="3344942964710773365">"Configuración"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Activado"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="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">"¿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="print_settings" msgid="4742428530112487843">"Impresión"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Config. de impresión"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Servicios"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"¿Quieres usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> puede recibir los documentos que imprimes. Estos documentos pueden contener información confidencial."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"No se instaló ningún servicio."</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Configuración"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Agregar impresoras"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Sí"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"No"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batería"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Lo que ha utilizado la batería"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Sin datos de uso de batería"</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Datos móviles enviados"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Datos móviles recibidos"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Datos Wi‑Fi enviados"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Datos Wi‑Fi recibidos"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tiempo de activación"</string>
@@ -1306,17 +1433,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Detener o desinstalar la aplicación"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Controla manualmente el GPS para que la aplicación no lo use"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"La aplicación podrá ofrecer una configuración para reducir el uso de la batería."</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Batería utilizada por el usuario"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que se desconectó"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Durante la última desconexión para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total de usos"</string>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Sonido"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta el tono del texto hablado"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Idioma no seleccionado"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Establece la voz específica de un idioma para el texto hablado"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Escucha un ejemplo:"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproducir una pequeña demostración de síntesis de voz"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <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>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"medio"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"desactivado"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Almacenamiento de credenciales"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar desde almacenamiento"</string>
@@ -1390,6 +1534,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>
@@ -1411,22 +1558,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="bugreport_title" msgid="1009498799922543551">"Iniciar informe de errores"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Se recopilarán diferentes datos acerca del estado actual de tu dispositivo y se enviarán como un mensaje de correo. Ten paciencia, el informe de errores demorará un tiempo en enviarse luego de ser iniciado."</string>
-    <string name="report" msgid="302437572240018342">"Informe"</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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nToca "<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>
@@ -1480,8 +1624,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>
@@ -1495,9 +1639,9 @@
     <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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Te damos la bienvenida a Google Sync"</font>"  \nCon 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>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Sincronización y datos"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Cambiar contraseña"</string>
@@ -1506,15 +1650,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>
@@ -1528,56 +1672,61 @@
     <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">"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="debug_hw_overdraw" msgid="2968692419951565417">"Depurar superpos. con GPU"</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="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">"Restricción de datos de referencia"</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>
@@ -1591,8 +1740,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>
@@ -1603,15 +1752,15 @@
     <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\nPuedes encontrar controles de uso de datos más adecuados en las opciones de configuración disponibles en la aplicación."</string>
+    <string name="data_usage_restrict_denied_dialog" msgid="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="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_on_dialog" product="tablet" msgid="7312283529426636845">"Cualquier cambio que sufran tus cuentas en la Web se copiará automáticamente en tu tablet.\n\nAlgunas 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\nPara 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\nAlgunas 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\nPara 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>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Fecha de restablecimiento del ciclo de uso"</string>
@@ -1620,22 +1769,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="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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Tu conexión de datos móvil se desactivará cuando se alcance el límite especificado.\n\nDebido 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\nDebido 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 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\nEsta 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\nEsta 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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Agregar perfil VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Modificar perfil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Eliminar perfil"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN siempre activada"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecciona el perfil de la VPN con la que deseas establecer una conexión ininterrumpida. El tráfico de red solo se permitirá cuando estés conectado a esta VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ninguna"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"La VPN siempre activada requiere una dirección IP tanto para el servidor como para el DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"No hay conexión de red. Inténtalo de nuevo más tarde."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"No se encuentra un certificado. Modifica el perfil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</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">"Actualizaciones del sistema adicionales"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Usuarios y restricciones"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Usuarios"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Agregar usuario"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Modificar detalles"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Información del usuario"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Nombre"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Restricciones de contenido"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Solicitar PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Calificación contenido:"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Aplicaciones del sistema"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Aplicaciones instaladas"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Descartar"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Eliminar usuario"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Niño molesto"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Desactivado"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permisivo"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Obligatorio"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Usuarios"</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="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\nLuego de que crees un usuario nuevo, este tiene que pasar por un proceso de configuración.\n\nCualquier 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\nCualquier 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 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 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_message" msgid="5284111415714437285">"¿Seguro que quieres eliminar el usuario y todos los datos asociados del dispositivo?"</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 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="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>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Restricciones"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Eliminar restricciones"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Cambiar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificaciones"</string>
     <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">"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="6160672982086584261">"Definir restricciones de aplicación"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controladas por <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Esta aplicación no se admite para perfiles restringidos."</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Esta aplicación puede acceder a tus cuentas."</string>
+    <string name="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 beddc81..7616c68 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">"Superrápida"</item>
+    <item msgid="6106302964845503577">"Hiperrrápida"</item>
+    <item msgid="6800277205640837264">"Lo más rápido posible"</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>
@@ -121,7 +128,7 @@
     <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
-    <item msgid="5085064298144493867">"Botón push"</item>
+    <item msgid="5085064298144493867">"Botón WPS"</item>
     <item msgid="1624323946324499595">"PIN del otro dispositivo"</item>
     <item msgid="5366790421523328066">"PIN del dispositivo"</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">"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,16 +218,127 @@
     <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="886742181977884584">"Multimedia"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"botones multimedia"</item>
+    <item msgid="4547883971364273343">"foco de audio"</item>
+    <item msgid="2603878814882344450">"volumen principal"</item>
+    <item msgid="7136963238377062018">"volumen de la voz"</item>
+    <item msgid="4270236897655923007">"volumen del tono"</item>
+    <item msgid="6325739889222559394">"volumen multimedia"</item>
+    <item msgid="5762123934816216821">"volumen de la alarma"</item>
+    <item msgid="785049718065337473">"volumen de las notificaciones"</item>
+    <item msgid="6700305533746877052">"volumen de Bluetooth"</item>
+    <item msgid="2029227495214047094">"mantener activo"</item>
+    <item msgid="26109888160231211">"controlar ubicación"</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>
+    <item msgid="5753789168376302997">"Botones multimedia"</item>
+    <item msgid="3265262911688671938">"Foco de audio"</item>
+    <item msgid="2098976479485046797">"Volumen principal"</item>
+    <item msgid="5660213838861789350">"Volumen de la voz"</item>
+    <item msgid="7983336752371254444">"Volumen del tono"</item>
+    <item msgid="7878027809189330917">"Volumen multimedia"</item>
+    <item msgid="7260546305036218513">"Volumen de alarma"</item>
+    <item msgid="9103719301075748925">"Volumen de notificaciones"</item>
+    <item msgid="7025966722295861512">"Volumen de Bluetooth"</item>
+    <item msgid="4665183401128289653">"Mantener activo"</item>
+    <item msgid="8584357129746649222">"Ubicación"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Corto"</item>
     <item msgid="2560532955514699713">"Medio"</item>
     <item msgid="2372711992605524591">"Largo"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (depuración)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Usar Dalvik"</item>
+    <item msgid="5131846588686178907">"Usar ART"</item>
+    <item msgid="4530003713865319928">"Usar compilación de depuración de ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"No comprobar"</item>
     <item msgid="6042769699089883931">"Buscar solo contenido DRM"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Escala de animación 5x"</item>
     <item msgid="1069584980746680398">"Escala de animación 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Ninguna"</item>
+    <item msgid="688482401508173818">"720 x 480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280 x 720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280 x 720 tvdpi y 1920 x 1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Ninguna"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"No"</item>
+    <item msgid="7688197031296835369">"Mostrar áreas sobredibujadas"</item>
+    <item msgid="8332661909019981149">"Mostrar contador de sobredibujos"</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>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Tiempo de espera superado"</item>
     <item msgid="7664124146786465092">"Con error"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Preguntar"</item>
+    <item msgid="5077768429488260031">"No permitir nunca"</item>
+    <item msgid="1417929597727989746">"Permitir siempre"</item>
+  </string-array>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1371907..e3593a0 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Sí"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="create" msgid="3578857613172647409">"Crear"</string>
+    <string name="allow" msgid="3349662621170855910">"Permitir"</string>
+    <string name="deny" msgid="6947806159746484865">"Denegar"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Ahora estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> paso de ser un desarrollador"</item>
+    <item quantity="other" msgid="6722953419953594148">"Ahora estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> pasos de ser un desarrollador"</item>
+  </plurals>
+    <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>
@@ -46,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>
@@ -81,15 +89,17 @@
     <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_discharging" msgid="6222697503392774475">"No se está cargando"</string>
-    <string name="battery_info_status_not_charging" msgid="2820070506621483576">"No se está cargando."</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_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>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"conexiones inalámbricas"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Desconocido"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Desconocido"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Error desconocido"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Nivel bajo"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Ajustes de Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Visible"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visible para dispositivos Bluetooth cercanos (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible para dispositivos Bluetooth cercanos"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Oculto para otros dispositivos Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Solo visible para dispositivos sincronizados"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Hacer visible el dispositivo"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tiempo de visibilidad"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Definir cuánto tiempo estará visible el dispositivo"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear marcación por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Evitar el uso del marcador a través de Bluetooth cuando la pantalla esté bloqueada"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivos Bluetooth"</string>
@@ -128,30 +135,30 @@
     <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>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Una aplicación quiere activar el Bluetooth. ¿Quieres permitirlo?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Una aplicación del tablet quiere hacerlo visible para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Quieres permitirlo?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Una aplicación del teléfono quiere hacerlo visible para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Quieres permitirlo?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Una aplicación del tablet quiere que el tablet sea siempre visible para otros dispositivos Bluetooth. ¿Quieres permitirlo?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Una aplicación del teléfono quiere que el teléfono sea visible siempre para otros dispositivos Bluetooth. ¿Quieres permitirlo?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Una aplicación del tablet quiere activar el Bluetooth y hacerlo visible para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Quieres permitirlo?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Una aplicación del teléfono quiere activar el Bluetooth y hacer el teléfono visible para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. ¿Quieres permitirlo?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Una aplicación del tablet quiere activar el Bluetooth y hacerlo visible para otros dispositivos. ¿Quieres permitirlo?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Una aplicación del teléfono quiere activar el Bluetooth y hacer el teléfono visible para otros dispositivos. ¿Quieres permitirlo?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Una aplicación quiere activar el Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Una aplicación quiere hacer visible tu tablet para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Una aplicación quiere hacer visible tu teléfono para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Una aplicación quiere hacer visible tu tablet para otros dispositivos Bluetooth. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Una aplicación quiere hacer visible tu teléfono 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 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 teléfono 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 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>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador utiliza el proxy HTTP, pero no puede utilizarlo otras aplicaciones."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicación:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID anexo"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Información móvil:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Intentos de datos:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Servicio GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinerancia:"</string>
@@ -220,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>
@@ -238,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>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Has perdido la conectividad de datos porque has dejado desactivada la itinerancia de datos de tu red doméstica."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Activarla"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Al permitir la itinerancia de datos, es posible que te facturen cargos adicionales elevados."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Al permitir la itinerancia de datos, los costes de itinerancia que deberás asumir pueden ser significativos.\n\nEsta configuración afecta a todos los usuarios de este tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Al permitir la itinerancia de datos, los costes de itinerancia que deberás asumir pueden ser significativos.\n\nEsta configuración afecta a todos los usuarios de este teléfono."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"¿Permitir itinerancia de datos?"</string>
     <string name="networks" msgid="6333316876545927039">"Selección de operador"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Seleccionar un operador de red"</string>
@@ -297,7 +307,11 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Información del propietario"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Introduce el texto que se mostrará en la pantalla de bloqueo."</string>
-    <string name="location_settings_title" msgid="4483843407328665068">"Acceso a la ubicación"</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>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer ubicación, bloqueo de pantalla y bloqueo de almacenamiento de credenciales"</string>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Solicitar una contraseña o un PIN numérico para descifrar el tablet cada vez que se encienda"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Solicitar una contraseña o un PIN numérico para descifrar el teléfono cada vez que se encienda"</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 ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Cuando hayas encriptado el tablet, debes introducir un PIN o una contraseña para descifrarlo cada vez que lo enciendas. Solo podrás deshacer la operación restableciendo los datos de fábrica y borrando todos los datos del tablet."\n\n"El proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con una batería cargada y mantener el tablet conectado hasta que acabe. 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 ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Cuando hayas encriptado el teléfono, debes introducir un PIN o una contraseña para descifrarlo cada vez que lo enciendas. Solo podrás deshacer la operación restableciendo los datos de fábrica y borrando todos los datos del teléfono."\n\n"El proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con una batería cargada y mantener el teléfono conectado hasta que acabe. 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 ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Cuando hayas encriptado el tablet, debes introducir un PIN o una contraseña para descifrarlo cada vez que lo enciendas. Solo podrás deshacer la operación restableciendo los datos de fábrica y borrando todos los datos del tablet.\n\nEl proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con una batería cargada y mantener el tablet conectado hasta que acabe. 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 ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Cuando hayas encriptado el teléfono, debes introducir un PIN o una contraseña para descifrarlo cada vez que lo enciendas. Solo podrás deshacer la operación restableciendo los datos de fábrica y borrando todos los datos del teléfono.\n\nEl proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con una batería cargada y mantener el teléfono conectado hasta que acabe. 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 tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encriptar teléfono"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carga la batería y vuelve a intentarlo."</string>
@@ -325,10 +339,10 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Espera <xliff:g id="DELAY">^1</xliff:g> segundos y vuelve a intentarlo."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Escribe tu contraseña"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Error en la encriptación"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"El proceso de encriptación se ha interrumpido y no se puede completar. Por tanto, no podrás volver a acceder a los datos del tablet. "\n\n"Debes restablecer los datos de fábrica para volver a usar el tablet. Cuando configures el tablet después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"La encriptación se ha interrumpido y no se puede completar. Por tanto, no podrás volver a acceder a los datos del teléfono. "\n\n"Debes restablecer los datos de fábrica para volver a usar el teléfono. Cuando configures el teléfono después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"El proceso de encriptación se ha interrumpido y no se puede completar. Por tanto, no podrás volver a acceder a los datos del tablet. \n\nDebes restablecer los datos de fábrica para volver a usar el tablet. Cuando configures el tablet después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"La encriptación se ha interrumpido y no se puede completar. Por tanto, no podrás volver a acceder a los datos del teléfono. \n\nDebes restablecer los datos de fábrica para volver a usar el teléfono. Cuando configures el teléfono después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Cambiar método de entrada"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Elegir pantalla de bloqueo"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Elegir bloqueo de pantalla"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Bloqueo alternativo"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Cambiar pantalla de bloqueo"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN de desbloqueo"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambiar contraseña de desbloqueo"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"La contraseña debe contener al menos %d caracteres."</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"El PIN debe contener al menos %d caracteres."</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"El PIN debe contener como mínimo %d dígitos."</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Tocar Continuar al terminar"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"La contraseña debe tener menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
@@ -406,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>
@@ -475,11 +498,33 @@
     <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="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 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_connected" msgid="8364125226376985558">"Conectada"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponible"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"En uso"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Ajustes de pantalla"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"¿Desconectar?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Finalizará la conexión con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;."</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Opciones de pantalla inalámbrica"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Borrar"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Listo"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Nombre"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Activada"</string>
+    <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 intercambio de datos cuando el tablet toque otro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir el intercambio de datos cuando el teléfono toque otro dispositivo"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desactivada"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"No disponible porque la función NFC está desactivada"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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\nSolo 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"</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 buenas"</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" msgid="4925789238170207169">"Solo conexiones estables"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"No usar una red Wi-Fi a menos que tenga una buena conexión a Internet"</string>
+    <string name="wifi_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="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="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="8116564886303972764">"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_in_progress" msgid="2944576520214787628">"El proceso WPS ya se ha iniciado y tiene una duración aproximada de dos minutos."</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"No se admite el ajuste de seguridad del router inalámbrico (protocolo TKIP)."</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Se ha producido un error de autenticación. Inténtalo de nuevo."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Se ha detectado otra configuración WPS. Inténtalo de nuevo en unos minutos."</string>
     <string name="wifi_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>
@@ -564,6 +621,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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Error al guardar la red"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</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_skip_anyway" msgid="6965361454438011190">"Omitir de todas formas"</string>
+    <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\nLa 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\nLa 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="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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Buscando…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Cambiar nombre del dispositivo"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Otros dispositivos"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Grupos recordados"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"No se ha podido conectar."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Error al cambiar nombre del dispositivo"</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"¿Desconectar?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Si desconectas el dispositivo, finalizará la conexión con <xliff:g id="PEER_NAME">%1$s</xliff:g> y con otros dispositivos de <xliff:g id="PEER_COUNT">%2$s</xliff:g>."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Zona Wi-Fi portátil"</string>
-    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> de zona Wi-Fi portátil 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 de <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> de <xliff:g id="NETWORK_SSID">%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="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="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>
@@ -616,20 +688,20 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Efectos de música"</string>
     <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="312032901303146002">"Notificación predeterminada"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Luz de notificación"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Sonido de notificación predeterminado"</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>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Elegir tono de notificación"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Sonido de notificación predeterminado"</string>
     <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 pantalla bloqueo"</string>
-    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrar al pulsar"</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>
     <string name="volume_ring_description" msgid="5936851631698298989">"Tono y notificaciones"</string>
@@ -640,46 +712,47 @@
     <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>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Cambiar orientación automáticamente al girar el teléfono"</string>
     <string name="brightness" msgid="2354961343555249270">"Brillo"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
-    <string name="screen_timeout" msgid="4351334843529712571">"Apagar después de"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Suspender después de"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Seleccionar fondo de pantalla de..."</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Salvapantallas"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Se iniciará cuando el dispositivo entre en suspensión si está conectado a la corriente"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Inhabilitado"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Caramelo seleccionado"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Cuándo activar"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nunca"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Probar"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Iniciar también cuando el dispositivo esté conectado"</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 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é 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>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Iniciar ahora"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Ajustes"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamaño de fuente"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN de tarjeta SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN incorrecto"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Los números PIN no coinciden."</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"No se puede modificar el PIN."\n"Es posible que el PIN no sea correcto."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"No se puede modificar el PIN.\nEs posible que el PIN no sea correcto."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"El PIN de la tarjeta SIM se ha modificado correctamente."</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"No se puede modificar el estado de bloqueo de la tarjeta SIM."\n"Es posible que el PIN no sea correcto."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"No se puede modificar el estado de bloqueo de la tarjeta SIM.\nEs posible que el PIN no sea correcto."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Aceptar"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estado del tablet"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versión de banda base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versión del kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Número de compilación"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Estado de SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"No disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
@@ -733,12 +807,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">"Tipo de red móvil"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Información de operador"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Estado de la red móvil"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Estado del servicio"</string>
     <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>
@@ -748,14 +823,16 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Almacenamiento USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Tarjeta SD"</string>
     <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>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imágenes, vídeos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (música, tonos, etc.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Varios"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Datos almacenados en caché"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desactivar almacenam comp"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desactivar tarjeta SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desactivar almacenamiento USB interno"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Borrar tarjeta SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Borrar todos los datos del almacenamiento USB del teléfono, como la música y las fotos"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Borra todos los datos de la tarjeta SD, como la música y las fotos."</string>
-    <string name="read_only" msgid="6702420168629076340">" (Solo lectura)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"¿Borrar datos almacenados en caché?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Se borrarán datos en caché de las aplicaciones."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"La función MTP o PTP está activa."</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"¿Desactivar almacenamiento USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"¿Desactivar tarjeta SD?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Si desactivas el almacenamiento USB, se detendrán algunas aplicaciones que estás usando y no estarán disponibles hasta que vuelvas a activarlo."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Cámara (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Permitir transferir fotos con el software de la cámara y archivos a ordenadores que no admitan MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalar herramientas de transferencia de archivos"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Otros usuarios"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado de la batería"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivel de batería"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -822,8 +902,10 @@
     <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">"APN nuevo"</string>
+    <string name="menu_new" msgid="3014205883303921729">"Nuevo APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Guardar"</string>
     <string name="menu_cancel" msgid="2194502410474697474">"Descartar"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
@@ -832,14 +914,14 @@
     <string name="error_mcc_not3" msgid="4560171714156251661">"El campo MMC debe contener 3 dígitos."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"El campo MNC debe contener 2 ó 3 dígitos."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Restaurando la configuración de APN predeterminada"</string>
-    <string name="menu_restore" msgid="8260067415075573273">"Valores predeterminados"</string>
+    <string name="menu_restore" msgid="8260067415075573273">"Restablecer configuración"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Se ha restablecido la configuración predeterminada de APN."</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restablecer datos de fábrica"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Borra todos los datos del tablet."</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Borrar todos los datos del teléfono"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del tablet, como:"\n\n<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, como:"\n\n<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Has accedido a las cuentas que se indican a continuación:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del tablet, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Has accedido a las cuentas que se indican a continuación:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, deber borrar la "<b>"tarjeta SD"</b>"."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Se desactivará el anclaje a red de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móviles"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Administrar plan móvil"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operador de SIM desconocido"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s no tiene ningún sitio web de aprovisionamiento"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Inserta la tarjeta SIM y reinicia el dispositivo"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Debes conectarte a Internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Mi ubicación"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Ubicación de red móvil y Wi-Fi"</string>
-    <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que las aplicaciones usen el servicio de ubicación de Google para calcular tu ubicación más rápido. Se recopilarán datos de ubicación anónimos y se enviarán a Google."</string>
-    <string name="location_neighborhood_level_wifi" msgid="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>
@@ -909,24 +996,25 @@
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizar el servidor para asistir al GPS (desactivar para mejorar el rendimiento del GPS)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"Ubicación en búsquedas"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Permitir que Google use tu ubicación para mejorar los resultados de búsqueda y otros servicios"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"Acceder a mi ubicación"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Permitir que las aplicaciones pidan permiso para usar la información de tu ubicación"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"Permitir el acceso a tu ubicación"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Permitir que las aplicaciones que han pedido permiso usen la información sobre tu ubicación"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Fuentes de ubicación"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Información del tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Información del teléfono"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Ver información legal, estado, versión del software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contribuidores"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Información regulatoria"</string>
     <string name="copyright_title" msgid="865906688917260647">"Derechos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Términos y condiciones"</string>
     <string name="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>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Cambiar PIN de desbloqueo"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirma el patrón guardado"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Inténtalo de nuevo"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Crea un patrón de desbloqueo"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Crear un patrón de desbloqueo:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pulsa la tecla de menú para obtener ayuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Levanta el dedo cuando termines"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Une al menos <xliff:g id="NUMBER">%d</xliff:g> puntos. Inténtalo de nuevo:"</string>
@@ -958,20 +1046,15 @@
     <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_tactile_feedback_title" msgid="8898518337442601027">"Vibrar al pulsar"</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>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Cambiar patrón desbloqueo"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cómo crear un patrón de desbloqueo"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Se han realizado demasiados intentos incorrectos."</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Espera <xliff:g id="NUMBER">%d</xliff:g> segundos y vuelve a intentarlo."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Cancelar"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Siguiente"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Protección del tablet"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Protección del teléfono"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protege el tablet contra usos no autorizados creando un patrón de desbloqueo de pantalla personal. Desliza el dedo para unir los puntos en cualquier orden en la siguiente pantalla. Debes conectar al menos cuatro puntos. "\n\n"Para comenzar, toca Siguiente."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protege tu teléfono contra usos no autorizados creando un patrón de desbloqueo de pantalla. Usa el dedo para unir los puntos en cualquier orden en la siguiente pantalla. "\n\n"Si estás preparado para comenzar, toca Siguiente."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"La aplicación no está instalada en el teléfono."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrar y eliminar aplicaciones instaladas"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplicaciones"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Permitir la instalación de aplicaciones de origen desconocido"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"El tablet y los datos personales son más vulnerables a los ataques de aplicaciones de origen desconocido. El usuario acepta ser el único responsable de cualquier daño en el tablet o pérdida de datos que se pueda derivar del uso de estas aplicaciones."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"El teléfono y los datos personales son más vulnerables a los ataques de aplicaciones de origen desconocido. El usuario acepta ser el único responsable de cualquier daño en el teléfono o pérdida de datos que se pueda derivar del uso de estas aplicaciones."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Verificar aplicaciones"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"No permitir la instalación de aplicaciones que puedan provocar daños o mostrar una advertencia antes de instalarlas"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Ajustes avanzados"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Habilitar más opciones de configuración"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Información de la aplicación"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Datos en almacen. USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Tarjeta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalar"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Desinstalar para todos los usuarios"</string>
+    <string name="install_text" msgid="884360662922471113">"Instalar"</string>
     <string name="disable_text" msgid="6544054052049395202">"Inhabilitar"</string>
     <string name="enable_text" msgid="9217362512327828987">"Habilitar"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Borrar datos"</string>
@@ -1019,22 +1106,24 @@
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"En tarjeta SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Inhabilitada"</string>
+    <string name="not_installed" msgid="1475144352069281880">"No instalada"</string>
     <string name="no_applications" msgid="7336588977497084921">"No hay aplicaciones."</string>
     <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>
@@ -1054,6 +1143,8 @@
     <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>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Puede que se cobre dinero por usar esta aplicación:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Enviar SMS premium"</string>
     <string name="computing_size" msgid="1599186977475211186">"Calculando…"</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"No se ha podido calcular el tamaño del paquete."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"No tienes instalada ninguna aplicación externa."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Modificar la ubicación de instalación preferida para nuevas aplicaciones"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"¿Inhabilitar aplicación integrada?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Si inhabilitas una aplicación integrada, es posible que otras aplicaciones no funcionen correctamente."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"¿Quieres eliminar los datos e inhabilitar la aplicación?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Usuario: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Usuario eliminado"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proceso y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicio"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proceso y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicio"</string>
@@ -1114,10 +1212,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>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Ajustes del teclado físico"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Pulsa la barra espaciadora dos veces para insertar el carácter \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Mostrar las contraseñas"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Este método de entrada puede registrar todo lo que escribas, incluidos datos personales, como las contraseñas y los números de las tarjetas de crédito. Procede de la aplicación <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. ¿Quieres usar este método de entrada?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Este corrector ortográfico puede registrar todo lo que escribas, incluidos datos personales, como las contraseñas y los números de las tarjetas de crédito. Procede de la aplicación <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. ¿Quieres usar este corrector ortográfico?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Ajustes"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para cambiar, pulsa Ctrl+espacio."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predeterminado"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Diseños de teclado"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diccionario del usuario"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Diccionario personal"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Diccionarios personales"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Diccionario personal"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Añadir"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Añadir al diccionario"</string>
@@ -1157,12 +1252,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>
@@ -1178,8 +1275,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>
@@ -1197,24 +1294,38 @@
     <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="enable_adb_summary" msgid="4881186971746056635">"Activar el modo de depuración cuando el dispositivo esté conectado por USB"</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>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Habilitar registro de búsqueda de HCI de Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos los paquetes de HCI de Bluetooth HCI en un archivo"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Elegir tiempo de ejecución"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Elegir tiempo de ejecución"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"¿Reiniciar para cambiar el tiempo de ejecución de <xliff:g id="OLD">%1$s</xliff:g> a <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones simuladas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones simuladas"</string>
     <string name="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="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_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>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Cuando el almacenamiento USB está protegido, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo."\n\n"Es posible que algunas aplicaciones no funcionen hasta que los desarrolladores las actualicen."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Cuando el almacenamiento USB está protegido, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo.\n\nEs posible que algunas aplicaciones no funcionen hasta que los desarrolladores las actualicen."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Proteger tarjeta SD"</string>
-    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Las aplicaciones deben solicitar permiso para leer la tarjeta SD."</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Las aplicaciones deben solicitar permiso para leer la tarjeta SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"¿Proteger tarjeta SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Cuando la tarjeta SD está protegida, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo."\n\n"Es posible que algunas aplicaciones no funcionen hasta que los desarrolladores las actualicen."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Cuando la tarjeta SD está protegida, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo.\n\nEs posible que algunas aplicaciones no funcionen hasta que los desarrolladores las actualicen."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal local"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Habilitar aplicación de terminal que ofrece acceso a shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Seleccionar gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Seleccionar widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"¿Crear widget y permitir acceso?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Ajustes de accesibilidad"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Servicios"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Texto grande"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Botón encendido cuelga"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Decir contraseñas"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Retraso pulsación prolongada"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Mejorar accesibilidad web"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gestos de ampliación"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Cuando esta función está activada, puedes acercar y alejar la imagen con solo tocar tres veces la pantalla.\n\nA continuación se indican las acciones que puedes hacer con la imagen acercada.\n"<ul><li>"Desplazar la imagen: arrastra dos o más dedos por la pantalla."</li>\n<li>"Modificar el nivel de zoom: une dos o más dedos o sepáralos."</li></ul>\n\n"También puedes ampliar el contenido seleccionado de forma temporal con solo tocar la pantalla tres veces y mantenerla pulsada. Con el contenido ampliado, puedes arrastrar el dedo para explorar diferentes partes de la pantalla. Levanta el dedo para volver al estado anterior.\n\nNota: puedes tocar tres veces la pantalla para ampliar el contenido en cualquier parte, excepto en el teclado y en la barra de navegación."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Acceso directo a accesibilidad"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Sí"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desactivada"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Cuando esta función está activada, puedes habilitar las funciones de accesibilidad rápidamente en dos pasos.\n\nPaso 1: mantén pulsado el botón de encendido hasta que escuches un sonido o notes una vibración.\n\nPaso 2: mantén la pantalla pulsada con dos dedos hasta que escuches una confirmación.\n\nSi hay varios usuarios en el dispositivo, este acceso directo en la pantalla de bloqueo permite habilitar la accesibilidad de forma temporal hasta que el dispositivo se desbloquea."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Texto grande"</string>
+    <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 ampliación automáticamente"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Actualizar ampliación de la pantalla al cambiar aplicaciones"</string>
+    <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_menu_item_settings" msgid="3344942964710773365">"Ajustes"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Activado"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Desactivado"</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="print_settings" msgid="4742428530112487843">"Impresión"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Ajustes de impresión"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Servicios"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"¿Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> puede recibir los documentos que imprimes. Esos documentos pueden contener información confidencial."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"No se ha instalado ningún servicio."</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Ajustes"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Añadir impresoras"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"On"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Off"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batería"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Consumo de la batería"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Los datos de uso de la batería no están disponibles"</string>
@@ -1265,25 +1390,25 @@
     <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>
     <string name="details_subtitle" msgid="32593908269911734">"Detalles de uso"</string>
-    <string name="controls_subtitle" msgid="390468421138288702">"Reduce el uso de la batería"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"Cómo reducir el uso de la batería"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Paquetes incluidos"</string>
     <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>
@@ -1293,30 +1418,32 @@
     <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_data_send" msgid="3875198715268918671">"Datos móviles enviados"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Datos móviles recibidos"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Datos Wi‑Fi enviados"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Datos Wi‑Fi 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 de espera de 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_sugg_display" msgid="3370202402045141760">"Reduce el brillo y el tiempo que permanece encendida la pantalla."</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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Detener o desinstalar la aplicación"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Controlar el GPS manualmente para evitar que lo use la aplicación"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Es posible que la aplicación incluya opciones que permitan reducir el uso de la batería."</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Batería usada por el usuario"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que se desenchufó"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Desde la última vez que se desenchufó para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total de consumo"</string>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tono"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta al tono del texto hablado."</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Idioma no seleccionado"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Establecer la voz del idioma específico para el texto hablado"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Escuchar un ejemplo"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproducir una breve demostración de síntesis de voz"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <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>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"medio"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"desactivado"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Almacenamiento de credenciales"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar desde almacenamiento"</string>
@@ -1390,6 +1534,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>
@@ -1411,22 +1558,19 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Cuando vuelvas a instalar una aplicación, restaurar la configuración y los datos incluidos en la copia"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Hacer informe de errores"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Se recopilará información sobre el estado actual de tu dispositivo, que se enviará por correo electrónico. Pasarán unos minutos desde que se inicie el informe de errores hasta que se envíe, por lo que te recomendamos que tengas paciencia."</string>
-    <string name="report" msgid="302437572240018342">"Informe"</string>
-    <string name="local_backup_password_title" msgid="3860471654439418822">"Contraseña copias ordenador"</string>
+    <string name="local_backup_password_title" msgid="3860471654439418822">"Contraseña para copias de ordenador"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Las copias de seguridad completas de ordenador no están protegidas"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tocar para cambiar o eliminar la contraseña para copias de seguridad completas de ordenador"</string>
     <string name="local_backup_password_toast_success" msgid="582016086228434290">"Nueva contraseña de seguridad establecida"</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 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>
@@ -1442,10 +1586,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>
@@ -1458,18 +1602,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\nToca "<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>
@@ -1478,10 +1622,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>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Calendar"</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"un servicio de Google que te permite sincronizar datos para que puedas acceder a tus contactos, a tus citas, etc., desde cualquier ubicación."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Te damos la bienvenida a Google Sync,"</font>" \nun servicio de Google que te permite sincronizar datos para que puedas acceder a tus contactos, a tus citas, etc., desde cualquier ubicación."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Ajustes de sincronización de la aplicación"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Datos y sincronización"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Cambiar contraseña"</string>
@@ -1514,7 +1658,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>
@@ -1537,6 +1681,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>
@@ -1548,39 +1693,43 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Actualizar superficies de ventana al actualizarse"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Actualizaciones GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Actualizar vistas de las ventanas creadas con GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Ver actualizaciones capas"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Iluminar capas de hardware en verde al actualizarse"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Depurar sobredibujos de GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar uso de la CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Suporponer el uso de la CPU en la pantalla"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forzar aceleración GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Forzar uso de GPU para dibujos en 2D"</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="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="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>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destruir actividades cuando el usuario deje de usarlas"</string>
     <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">"Sincronizar datos automáticamente"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronización automática"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Cambiar ciclo…"</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Día del mes para restablecer ciclo de uso de datos:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"Ninguna aplicación ha usado datos en este período."</string>
@@ -1591,8 +1740,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>
@@ -1603,15 +1752,15 @@
     <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\nPuedes encontrar controles de uso de datos más adecuados en las opciones de configuración disponibles en la aplicación."</string>
+    <string name="data_usage_restrict_denied_dialog" msgid="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 copiarán automáticamente en el tablet."\n\n"Algunas cuentas como, por ejemplo, las cuentas de Google, también copiará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 copiarán automáticamente en el teléfono."\n\n"Algunas cuentas como, por ejemplo, las cuentas de Google, también copiará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>
+    <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\nAlgunas cuentas como, por ejemplo, las cuentas de Google, también reflejarán en la Web los cambios que hagas en el tablet. \n\nPara 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\nAlgunas cuentas como, por ejemplo, las cuentas de Google, también reflejarán en la Web los cambios que hagas en el teléfono. \n\nPara seleccionar qué tipo de información se sincronizará con cada cuenta, accede a Ajustes &gt; Cuentas."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"¿Desactivar sincronización automática?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Esto te permitirá ahorrar datos y batería, pero tendrás que sincronizar cada cuenta de forma manual para recopilar información reciente y no recibirás notificaciones cuando se produzcan actualizaciones."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Elige el día en el que empezará cada ciclo"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Establecer advertencia de uso de datos"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Limitar uso de datos"</string>
     <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Tu conexión de datos se inhabilitará cuando se alcance el límite especificado.\n\nComo 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\nComo 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 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\nEsta 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\nEsta 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Usuarios y aplicaciones eliminados"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> recibido, <xliff:g id="SENT">%2$s</xliff:g> enviado"</string>
-    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: unas <xliff:g id="TOTAL">%1$s</xliff:g> usadas"</string>
-    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: unas <xliff:g id="TOTAL">%1$s</xliff:g> usadas (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>: unas <xliff:g id="TOTAL">%1$s</xliff:g> usadas (según el cálculo del teléfono). El cálculo del uso de datos del operador puede variar."</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: unos <xliff:g id="TOTAL">%1$s</xliff:g> usados"</string>
+    <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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Añadir perfil de VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Editar perfil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Eliminar perfil"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN siempre activada"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecciona un perfil de VPN para permanecer conectado de forma continúa. Solo se permitirá el tráfico de red cuando estés conectado a esta red VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ninguna"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Las redes VPN activadas continuamente requieren una dirección IP para el servidor y el DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"No hay conexión de red. Inténtalo de nuevo más tarde."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Falta un certificado. Edita el perfil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</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">"Otras actualizaciones del sistema"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Usuarios y restricciones"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Usuarios"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Añadir usuario"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Editar detalles"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Información del usuario"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Nombre"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Restricciones de contenido"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Solicitar PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Clasificación de contenido"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Aplicaciones del sistema"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Aplicaciones instaladas"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Descartar"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Eliminar usuario"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Pesado"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Inhabilitado"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permisivo"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Obligatorio"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Usuarios"</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="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\nDespués de crear un nuevo usuario, este debe completar un proceso de configuración.\n\nCualquier 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\nCualquier 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_confirm_remove_message" msgid="5284111415714437285">"¿Seguro que quieres eliminar el usuario y todos los datos asociados del dispositivo?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Cambiar tamaño de fuente"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Restricciones"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Eliminar restricciones"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Cambiar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificaciones"</string>
     <string name="help_label" msgid="1107174367904110532">"Ayuda"</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="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">"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="6160672982086584261">"Definir restricciones de aplicación"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controladas por <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Esta aplicación no se puede utilizar en perfiles restringidos"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Esta aplicación puede acceder a tus cuentas"</string>
+    <string name="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 d58b48a..9ad5ef1 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,16 +218,127 @@
     <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="886742181977884584">"Meedia"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"meedianupud"</item>
+    <item msgid="4547883971364273343">"helifookus"</item>
+    <item msgid="2603878814882344450">"põhihelitugevus"</item>
+    <item msgid="7136963238377062018">"hääle helitugevus"</item>
+    <item msgid="4270236897655923007">"helina helitugevus"</item>
+    <item msgid="6325739889222559394">"meedia helitugevus"</item>
+    <item msgid="5762123934816216821">"äratuse helitugevus"</item>
+    <item msgid="785049718065337473">"märguande helitugevus"</item>
+    <item msgid="6700305533746877052">"Bluetoothi helitugevus"</item>
+    <item msgid="2029227495214047094">"hoia ärkvel"</item>
+    <item msgid="26109888160231211">"monitori asukoht"</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>
+    <item msgid="5753789168376302997">"Meedianupud"</item>
+    <item msgid="3265262911688671938">"Helifookus"</item>
+    <item msgid="2098976479485046797">"Põhihelitugevus"</item>
+    <item msgid="5660213838861789350">"Hääle helitugevus"</item>
+    <item msgid="7983336752371254444">"Helina helitugevus"</item>
+    <item msgid="7878027809189330917">"Meedia helitugevus"</item>
+    <item msgid="7260546305036218513">"Alarmi helitugevus"</item>
+    <item msgid="9103719301075748925">"Märguande helitugevus"</item>
+    <item msgid="7025966722295861512">"Bluetoothi helitugevus"</item>
+    <item msgid="4665183401128289653">"Hoia ärkvel"</item>
+    <item msgid="8584357129746649222">"Asukoht"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Lühike"</item>
     <item msgid="2560532955514699713">"Keskmine"</item>
     <item msgid="2372711992605524591">"Pikk"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (silumine)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Kasuta tarkvara Dalvik"</item>
+    <item msgid="5131846588686178907">"Kasuta valikut ART"</item>
+    <item msgid="4530003713865319928">"Kasuta valiku ART silumisjärku"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Ära kunagi kontrolli"</item>
     <item msgid="6042769699089883931">"Kontrolli ainult DRM-sisu"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"5-kordne animatsiooni skaala"</item>
     <item msgid="1069584980746680398">"10-kordne animatsiooni skaala"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Puudub"</item>
+    <item msgid="688482401508173818">"720 x 480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280 x 720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280 x 720 tvdpi, 1920 x 1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Puudub"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Väljas"</item>
+    <item msgid="7688197031296835369">"Kuva ülejoonistatud alad"</item>
+    <item msgid="8332661909019981149">"Kuva ülejoonistuse loendur"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardpiir"</item>
     <item msgid="4071574792028999443">"Taustaprotsessideta"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Ajalõpp"</item>
     <item msgid="7664124146786465092">"Ebaõnnestus"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Küsi"</item>
+    <item msgid="5077768429488260031">"Ära luba kunagi"</item>
+    <item msgid="1417929597727989746">"Luba alati"</item>
+  </string-array>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 5d3253c..f8b0201 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Jah"</string>
     <string name="no" msgid="6731231425810196216">"Ei"</string>
     <string name="create" msgid="3578857613172647409">"Loo"</string>
+    <string name="allow" msgid="3349662621170855910">"Luba"</string>
+    <string name="deny" msgid="6947806159746484865">"Keela"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Tundmatu"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> sammu veel ja olete arendaja."</item>
+    <item quantity="other" msgid="6722953419953594148">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> sammu veel ja olete arendaja."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Olete nüüd arendaja!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Ei ole vaja, olete juba arendaja."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"TRAADITA ÜHENDUS JA VÕRGUD"</string>
     <string name="header_category_device" msgid="5781174212691167553">"SEADE"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"ISIKLIK"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Laadimine"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(VV)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Tühjakslaadimine"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(traadita võrk)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Ei lae"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ei lae"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Täis"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Ühenduseta"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"traadita võrk"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC + USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Tundmatu"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Tundmatu"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Tundmatu viga"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Külm"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Leitav"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Nähtav kõigile lähedalasuvatele Bluetooth-seadmetele (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Nähtav kõigile lähedalasuvatele Bluetooth-seadmetele"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ei ole nähtav teistele Bluetooth-seadmetele"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Nähtav ainult seotud seadmetele"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Muuda seade leitavaks"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Nähtavuse ajalõpp"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Määrake seadme leitavuse aeg"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lukusta häälvalimine"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Vältige Bluetoothi valija kasutamist, kui ekraan on lukustatud"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-seadmed"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Näita vastuvõetud faile"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth-seadme valija"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetoothi loa taotlus"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Rakendus soovib Bluetoothi sisse lülitada. Kas lubada?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Tahvelarvutis olev rakendus soovib tahvelarvuti muuta teistele Bluetooth-seadmetele <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks nähtavaks. Kas lubada?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Telefonis olev rakendus soovib telefoni muuta teistele Bluetooth-seadmetele <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks nähtavaks. Kas lubada?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Tahvelarvutis olev rakendus soovib tahvelarvuti muuta teistele Bluetooth-seadmetele alati nähtavaks. Kas lubada?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Telefonis olev rakendus soovib telefoni muuta teistele Bluetooth-seadmetele alati nähtavaks. Kas lubada?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Tahvelarvutis olev rakendus soovib Bluetoothi sisse lülitada ja muuta tahvelarvuti teistele seadmetele <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks nähtavaks. Kas lubada?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Teie telefonis olev rakendus soovib Bluetoothi sisse lülitada ja muuta telefoni teistele seadmetele <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks nähtavaks. Kas lubada?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Tahvelarvutis olev rakendus soovib Bluetoothi sisse lülitada ja muuta tahvelarvuti teistele seadmetele nähtavaks. Kas lubada?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Teie telefonis olev rakendus soovib Bluetoothi sisse lülitada ja muuta telefoni teistele seadmetele nähtavaks. Kas lubada?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Rakendus soovib Bluetoothi sisse lülitada."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Rakendus soovib muuta <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks teie tahvelarvuti teistele Bluetoothi seadmetele nähtavaks."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Rakendus soovib muuta <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks teie telefoni teistele Bluetoothi seadmetele nähtavaks."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Rakendus soovib muuta tahvelarvuti nähtavaks teistele Bluetoothi seadmetele. Saate seda hiljem muuta Bluetoothi seadetes."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Rakendus soovib muuta telefoni nähtavaks teistele Bluetoothi seadmetele. Saate seda hiljem muuta Bluetoothi seadetes."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Rakendus soovib Bluetoothi sisse lülitada ja muuta tahvelarvuti teistele seadmetele <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks nähtavaks."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Rakendus soovib Bluetoothi sisse lülitada ja muuta telefoni teistele seadmetele <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundiks nähtavaks."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Rakendus soovib Bluetoothi sisse lülitada ja muuta tahvelarvuti teistele seadmetele nähtavaks. Saate seda hiljem muuta Bluetoothi seadetes."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Rakendus soovib Bluetoothi sisse lülitada ja muuta telefoni teistele seadmetele nähtavaks. Saate seda hiljem muuta Bluetoothi seadetes."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetoothi sisselülitamine ..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetoothi väljalülitamine ..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automaatne ühendamine"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Brauser kasutab HTTP-puhverserverit, kuid muud rakendused ei tohi seda kasutada."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Asukoht:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Külgnev CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Kärjeinfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Andmete katsed:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-teenus:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Rändlus:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Kaotasite andmesideühenduse, kuna jätsite oma koduvõrgu andmerändluse väljalülitatuks."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Lülita sisse"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Kui lubate andmeside rändluse, siis võidakse teilt küsida suuri rändlustasusid."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Kui lubate andmeside rändluse, siis võivad sellega kaasneda rändlustasud!\n\nSeade mõjutab tahvelarvuti kõiki kasutajaid."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Kui lubate andmeside rändluse, siis võivad sellega kaasneda rändlustasud!\n\nSeade mõjutab telefoni kõiki kasutajaid."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Kas lubada andmeside rändlus?"</string>
     <string name="networks" msgid="6333316876545927039">"Operaatori valik"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Võrguoperaatori valimine"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Teave omaniku kohta"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Igal telefoni sisselülitamisel on vaja numbrilist PIN-koodi või parooli tahvelarvuti dekrüpteerimiseks"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Igal telefoni sisselülitamisel on vaja numbrilist PIN-koodi või parooli telefoni dekrüpteerimiseks"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krüpteeritud"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Saate krüpteerida oma kontosid, seadeid, allalaaditud rakendusi ja nende andmeid ning meediumi- ja muid faile. Kui tahvelarvuti on krüpteeritud, peate iga kord seadet sisse lülitades selle dekrüpteerimiseks sisestama numbrilise PIN-koodi või parooli. Tahvelarvuti krüpteeringut ei saa tühistada, välja arvatud tehaseandmete lähtestamisega, millega kustutatakse kõik teie andmed."\n\n"Krüpteerimine võtab aega tunni või rohkem. Aku peab olema täis ja tahvelarvuti sisse lülitatud, kuni krüpteerimine on lõpule viidud. Kui katkestate krüpteerimistoimingu, kaotate osa või kõik oma andmed."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Saate krüpteerida oma kontosid, seadeid, allalaaditud rakendusi ja nende andmeid ning meediumi- ja muid faile. Kui telefon on krüpteeritud, peate iga kord seda sisse lülitades sisestama dekrüpteerimiseks numbrilise PIN-koodi või parooli. Telefoni krüpteeringut ei saa tühistada, välja arvatud tehaseandmete lähtestamisega, millega kustutatakse kõik teie andmed."\n\n"Krüpteerimine võtab aega tunni või rohkem. Aku peab olema täis ja telefon sisse lülitatud, kuni krüpteerimine on lõpule viidud. Kui katkestate krüpteerimistoimingu, kaotate osa andmeid või kõik andmed."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Saate krüpteerida oma kontosid, seadeid, allalaaditud rakendusi ja nende andmeid ning meediumi- ja muid faile. Kui tahvelarvuti on krüpteeritud, peate iga kord seadet sisse lülitades selle dekrüpteerimiseks sisestama numbrilise PIN-koodi või parooli. Tahvelarvuti krüpteeringut ei saa tühistada, välja arvatud tehaseandmete lähtestamisega, millega kustutatakse kõik teie andmed.\n\nKrüpteerimine võtab aega tunni või rohkem. Aku peab olema täis ja tahvelarvuti sisse lülitatud, kuni krüpteerimine on lõpule viidud. Kui katkestate krüpteerimistoimingu, kaotate osa või kõik oma andmed."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Saate krüpteerida oma kontosid, seadeid, allalaaditud rakendusi ja nende andmeid ning meediumi- ja muid faile. Kui telefon on krüpteeritud, peate iga kord seda sisse lülitades sisestama dekrüpteerimiseks numbrilise PIN-koodi või parooli. Telefoni krüpteeringut ei saa tühistada, välja arvatud tehaseandmete lähtestamisega, millega kustutatakse kõik teie andmed.\n\nKrüpteerimine võtab aega tunni või rohkem. Aku peab olema täis ja telefon sisse lülitatud, kuni krüpteerimine on lõpule viidud. Kui katkestate krüpteerimistoimingu, kaotate osa andmeid või kõik andmed."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Krüpteeri tahvelarvuti"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Krüpteeri telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laadige akut ja proovige uuesti."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Proovige uuesti <xliff:g id="DELAY">^1</xliff:g> sekundi pärast."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Sisestage parool"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Krüptimine ebaõnnestus"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krüpteerimine katkestati ja seda ei saa lõpule viia. Seetõttu ei pääse te enam oma tahvelarvutis olevatele andmetele juurde. "\n\n" Tahvelarvuti kasutamise jätkamiseks peate lähtestama selle tehaseseadetele. Kui seadistate tahvelarvutit pärast lähtestamist, saate taastada kõik andmed, mis olid varundatud teie Google\'i kontole."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krüpteerimine katkestati ja seda ei saa lõpule viia. Seetõttu ei pääse te enam oma telefonis olevatele andmetele juurde. "\n\n"Telefoni kasutamise jätkamiseks peate selle lähtestama tehaseseadetele. Kui seadistate telefoni pärast lähtestamist, saate taastada kõik andmed, mis olid varundatud teie Google\'i kontole."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krüpteerimine katkestati ja seda ei saa lõpule viia. Seetõttu ei pääse te enam oma tahvelarvutis olevatele andmetele juurde. \n\n Tahvelarvuti kasutamise jätkamiseks peate lähtestama selle tehaseseadetele. Kui seadistate tahvelarvutit pärast lähtestamist, saate taastada kõik andmed, mis olid varundatud teie Google\'i kontole."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krüpteerimine katkestati ja seda ei saa lõpule viia. Seetõttu ei pääse te enam oma telefonis olevatele andmetele juurde. \n\nTelefoni kasutamise jätkamiseks peate selle lähtestama tehaseseadetele. Kui seadistate telefoni pärast lähtestamist, saate taastada kõik andmed, mis olid varundatud teie Google\'i kontole."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Sisestusmeetodi vahetamine"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekraaniluku valimine"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Valige varukoopia lukk"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Muuda avamise PIN-koodi"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Avamisparooli muutmine"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Parool peab olema vähemalt %d tähemärgi pikkune"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koodis peab olema vähemalt %d tähemärki"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-koodi pikkus peab olema vähemalt %d numbrit"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Puudutage käsku Jätka, kui olete lõpetanud"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Jätka"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Parool peab olema lühem kui <xliff:g id="NUMBER">%d</xliff:g> märki."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kõlartelefonina"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Muusika ja meediumi jaoks"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Jäta seaded meelde"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Seotud ekraanid"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Saadaval seadmed"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Ühendamine"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Ühendatud"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Saadaval"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Kasutusel"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Kuvaseaded"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Kas katkestada ühendus?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"See lõpetab teie ühenduse seadmega:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Juhtmeta ekraaniühenduse valikud"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Unusta"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Valmis"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Nimi"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Sees"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Väljas"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Keelatud"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Lubab andmete vahetust, kui tahvelarvuti puudutab teist seadet"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Lubab andmete vahetust, kui telefon puudutab teist seadet"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Väljas"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Pole saadaval, kuna NFC on välja lülitatud"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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\nLihtsalt 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="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="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="8116564886303972764">"Sisestage WiFi-ruuteril PIN-kood <xliff:g id="NUMBER">%1$s</xliff:g>. Seadistuse lõpetamiseks 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_in_progress" msgid="2944576520214787628">"WPS on juba käimas ja selle lõpuleviimiseks võib kuluda kuni kaks minutit"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Ruuteri turvaseadet (TKIP) ei toetata"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentimine ebaõnnestus. Proovige uuesti."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Tuvastati teine WPS-i seanss. Proovige mõne minuti pärast uuesti."</string>
     <string name="wifi_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>
@@ -564,6 +621,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\nKas 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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Salvesta"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Võrgu säilitamine ebaõnnestus"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Tühista"</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_skip_anyway" msgid="6965361454438011190">"Jäta siiski vahele"</string>
+    <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\nTahvelarvuti 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\nTelefoni seadistamiseks võib olla vajalik suur võrguaktiivsus."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Otsing …"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Nimeta seade ümber"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Võrdõigusvõrgu seadmed"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Meeldejäetud rühmad"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Ühenduse loomine ebaõnnestus."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Seadme ümbernimetamine ebaõnnestus."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Kas katkestada ühendus?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Kui katkestate ühenduse, siis lõpeb ühendus seadmega <xliff:g id="PEER_NAME">%1$s</xliff:g> ja veel <xliff:g id="PEER_COUNT">%2$s</xliff:g> seadmega."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Kantav WiFi-tööpunkt"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Kas unustada see rühm?"</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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Muusikaefektid"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Helina helitugevus"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibreeri hääletus režiimis"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Vaikimisi teade"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Märguande vaikeheli"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Vilkuv teatise tuli"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Helin"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Teatis"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Kasuta teatiste jaoks sissetuleva kõne helitugevust"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Vali teatise helin"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Märguande vaikeheli"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Meedium"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Määra muusika ja videote helitugevus"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Äratus"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pärast <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tegevusetust"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Taustapilt"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Taustapildi valimine:"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Ekraanikaunistus"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Kui seade on vooluvõrgus, rakendub ekraanisäästja pärast unerežiimi lülitumist"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Keelatud"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Valitud kaunistus"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Aktiveerimisaeg"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Pärast seda, kui seade on olnud tegevusetu <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Mitte kunagi"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Proovige"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Rakendub ka siis, kui seade on dokitud"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Unerežiim"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kui on dokitud või puhkerežiimis ja laeb"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Kui on dokitud või laeb"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Laadimise ajal"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Kui on dokitud"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Välja"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Kui soovite juhtida, mis juhtub telefoni dokkimisel ja/või puhkerežiimi lülitamisel, siis lülitage sisse unerežiim."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Millal lülitada sisse unerežiim?"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Alusta kohe"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Seaded"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaatne eredus"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fondi suurus"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Fondi suurus"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM-i PIN-kood"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Vale PIN-kood"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN-koodid ei kattu"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"PIN-koodi ei saa muuta."\n"PIN-kood võib vale olla."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"PIN-koodi ei saa muuta.\nPIN-kood võib vale olla."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-i PIN-koodi muutmine õnnestus"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM-kaardi lukustusolekut ei saa muuta."\n"Võimalik, et PIN-kood on vale."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM-kaardi lukustusolekut ei saa muuta.\nVõimalik, et PIN-kood on vale."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Tühista"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tahvelarvuti olek"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Põhiribaversioon"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Tuuma versioon"</string>
     <string name="build_number" msgid="3075795840572241758">"Järgunumber"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinuxi olek"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Pole saadaval"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Olek"</string>
     <string name="device_status" msgid="607405385799807324">"Olek"</string>
@@ -733,12 +807,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">"Mobiilsidevõrgu tüüp"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Operaatori teave"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Mobiilsidevõrgu olek"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Teenuse olek"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-mäluseade"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kaart"</string>
     <string name="memory_available" msgid="5052397223077021181">"Saadaval"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Saadaval (kirjutuskaitstud)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Kogu ruum"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Arvutamine ..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Rakendused (rakenduse andmed ja meediasisu)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Pildid, videod"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Heli (muusika, helinad, Interneti-saated jne)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Muu"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Vahemälus olevad andmed"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Lahuta jagatud mälu"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Lahutage SD-kaart"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Sisemise USB lahutamine"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Kustuta SD-kaart"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Sisemisest USB-mäluseadmest kõikide andmete, nagu muusika ja fotode, kustutamine"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Kustutab SD-kaardilt kõik andmed, nagu muusika ja fotod"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Kirjutuskaitstud)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Kas soovite vahemälus olevad andmed tühjendada?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"See tühjendab kõikide rakenduste vahemälus olevad andmed."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP või PTP funktsioon on aktiivne"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Kas lahutada USB-seade?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Kas lahutada SD-kaart?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"USB-mäluseadme lahutamisel peatuvad mõned kasutatavad rakendused ega pruugi olla saadaval enne, kui USB-mäluseadme uuesti paigaldate."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kaamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Võimaldab edastada fotosid kaamera tarkvara abil ja edastada mis tahes faile arvutitest, mis ei toeta MTP-d."</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installi faili teisaldamise tööriistad"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Teised kasutajad"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Aku olek"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Aku tase"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Pääsupunktinimed"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Tehaseandmete lähtestamine"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Kustutab kõik tahvelarvutis olevad andmed"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Kustutab kõik andmed telefonis"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"See kustutab kõik andmed teie tahvelarvuti "<b>"sisemälust"</b>", sh:"\n\n<li>"teie Google\'i konto"</li>\n<li>"süsteemi ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"See kustutab kõik andmed telefoni "<b>"sisemälust"</b>", sh:"\n\n<li>"teie Google\'i konto"</li>\n<li>"süsteemi ja rakenduse andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olete praegu sisse logitud järgmistele kontodele:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"See kustutab kõik andmed teie tahvelarvuti "<b>"sisemälust"</b>", sh:\n\n"<li>"teie Google\'i konto"</li>\n<li>"süsteemi ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"See kustutab kõik andmed telefoni "<b>"sisemälust"</b>", sh:\n\n"<li>"teie Google\'i konto"</li>\n<li>"süsteemi ja rakenduse andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olete praegu sisse logitud järgmistele kontodele:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muusika"</li>\n<li>"Fotod"</li>\n<li>"Muud kasutajaandmed"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Muusika, piltide ja muu kasutajateabe kustutamiseks tuleb tühjendada ka "<b>"USB-mäluseade"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Muusika, piltide ja muude kasutajaandmete kustutamiseks tuleb tühjendada ka "<b>"SD-kaart"</b>"."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ühenduse jagamine lõpetatakse."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Abi"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiilsidevõrgud"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Mobiilipaketi haldamine"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"SIM-kaardi tundmatu operaator"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Operaatoril %1$s pole teenusepakkumise veebisaite"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sisestage SIM-kaart ja taaskäivitage"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Looge Interneti-ühendus"</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>
@@ -917,6 +1004,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Vaadake juriidilist teavet, olekut, tarkvara versiooni"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juriidiline teave"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Kaasautorid"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Regulatiivteave"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autoriõigus"</string>
     <string name="license_title" msgid="1990487604356037871">"Litsents"</string>
     <string name="terms_title" msgid="7697580845616764642">"Nõuded ja tingimused"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Muuda avamise PIN-koodi"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Kinnitage salvestatud muster"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Proovige uuesti:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Joonistage avamismuster"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Joonistage avamismuster"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Abi saamiseks vajutage valikut Menüü."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Tõsta sõrm, kui on valmis."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Ühendage vähemalt <xliff:g id="NUMBER">%d</xliff:g> punkti. Proovige uuesti:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kuidas joonistada avamismustrit"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Liiga palju valesid katseid."</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Proovige uuesti <xliff:g id="NUMBER">%d</xliff:g> sekundi pärast."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Tühista"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Järgmine"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Tahvelarvuti turvaliseks muutmine"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Telefoni turvaliseks muutmine"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Kaitske oma tahvelarvutit volitamata kasutamise eest, luues ekraani isikliku avamismustri. Järgmisel ekraanil ühendage sõrmega punktid mis tahes järjekorras. Peate ühendama vähemalt neli punkti. "\n\n"Kas olete valmis alustama? Puudutage valikut Järgmine."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Kaitske oma telefoni volitamata kasutamise eest, luues ekraani isikliku avamismustri. Järgmisel ekraanil ühendage sõrmega mis tahes järjekorras vähemalt neli punkti. "\n\n"Kas olete valmis alustama? Puudutage valikut Järgmine."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Rakendus pole teie telefoni installitud."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Halda rakendusi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Installitud rakenduste haldamine ja eemaldamine"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Rakendused"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Luba tundmatutest allikatest pärinevate rakenduste installimine"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Teie tahvelarvuti ja isikuandmed on haavatavamad rünnakutele rakenduste kaudu, mis pärinevad tundmatutest allikatest. Nõustute, et olete ainuisikuliselt vastutav tahvelarvuti kahjustuste või andmekao eest, mis võivad tuleneda nende rakenduste kasutamisest."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefon ja isiklikud andmed on rünnakute suhtes haavatavamad tundmatutest allikatest pärit rakenduste kaudu. Nõustute, et olete ainuisikuliselt vastutav telefoni kahjustuste või andmekao eest, mis võivad tuleneda nende rakenduste kasutusest."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Rakenduste kinnitamine"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Keela potentsiaalselt kahjulike rakenduste installimine või hoiata enne installimist"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Täpsemad seaded"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Luba rohkem seadete valikuid"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Rakenduse teave"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-mäluseadme andmed"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kaart"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalli"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Kõikidelt kasutajatelt desinstallimine"</string>
+    <string name="install_text" msgid="884360662922471113">"Installi"</string>
     <string name="disable_text" msgid="6544054052049395202">"Keela"</string>
     <string name="enable_text" msgid="9217362512327828987">"Luba"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Kustuta andmed"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Kuva vahemällu salvestatud protsessid"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Läht. rakend. eelistused"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Läht. rakend. eelistused?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"See lähtestab kõik eelistused rakendusele:"\n\n" "<li>"Keelatud rakendused"</li>\n" "<li>"Keelatud rakenduste teatised"</li>\n" "<li>"Vaikerakendused toimingutele"</li>\n" "<li>"Taustaandmete piirangud rakendustele"</li>\n\n" Te ei kaota mingeid rakenduse andmeid."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"See lähtestab kõik eelistused rakendusele:\n\n "<li>"Keelatud rakendused"</li>\n" "<li>"Keelatud rakenduste teatised"</li>\n" "<li>"Vaikerakendused toimingutele"</li>\n" "<li>"Taustaandmete piirangud rakendustele"</li>\n\n" Te ei kaota mingeid rakenduse andmeid."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Lähtesta rakendused"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Halda ruumi"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD-kaardil"</string>
     <string name="disabled" msgid="9206776641295849915">"Keelatud"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Installimata"</string>
     <string name="no_applications" msgid="7336588977497084921">"Rakendusi pole."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Sisemälu"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-mäluseade"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> ja <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"See rakendus võib põhjustada tasusid:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Tasulise SMS-i saatmine"</string>
     <string name="computing_size" msgid="1599186977475211186">"Arvutamine ..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Paketi suurust ei saanud arvutada."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Teil pole ühtegi kolmanda osapoole rakendust installitud."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Muutke uute rakenduste eelistatud installiasukohta"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Kas keelata sisseeh. rakendus?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Kui keelate sisseehitatud rakenduse, võivad muud rakendused valesti käituda."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Kas kustutada andmed ja keelata rakendus?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Kasutaja: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Eemaldatud kasutaja"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> protsess ja <xliff:g id="NUMSERVICES">%2$d</xliff:g> teenus"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> protsess ja <xliff:g id="NUMSERVICES">%2$d</xliff:g> teenust"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> protsessi ja <xliff:g id="NUMSERVICES">%2$d</xliff:g> teenus"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Füüsilise klaviatuuri seaded"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Vajutage kaks korda tühikuklahvi, et sisestada „.”"</string>
     <string name="show_password" msgid="3001113966880559611">"Muuda paroolid nähtavaks"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"See sisestusmeetod võib koguda kogu teie sisestatava teksti, sh isikuandmed (nt paroolid ja krediitkaardinumbrid). See pärineb rakendusest <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Kas soovite seda sisestusmeetodit kasutada?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"See õigekirjakontrollija võib koguda kogu sisestatava teksti, sh isiklikud andmed (nt paroolid ja krediitkaardinumbrid). See pärineb rakendusest <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Kas soovite seda õigekirjakontrolli kasutada?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Seaded"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Vahetamiseks vajutage Ctrl+tühikut"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Vaikepaigutus"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Klaviatuuri paigutused"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kasutajasõnastik"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Isiklik sõnastik"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Isiklikud sõnastikud"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Isiklik sõnaraamat"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Lisa"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Lisa sõnastikku"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekraan ei lähe kunagi laadimise ajal unerežiimi"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Luba Bluetoothi HCI jälgimise logi"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Hõiva kõik faili Bluetoothi HCI paketid"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Käitusaja valimine"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Käitusaja valimine"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Taaskäivitage, et käitusaeg oleks <xliff:g id="OLD">%1$s</xliff:g>, mitte <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Luba võltsasukohti"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Luba võltsasukohti"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Kontrolli, kas ADB/ADT-ga installitud rakendused on ohtlikud."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Kaitse USB-salvestusruumi"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Rakendused peavad USB-salvestusruumi lugemiseks loa taotlema"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Kas kaitsta USB-salvestusruumi?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Kui USB-salvestusruum on kaitstud, peavad rakendused välismäluseadmelt andmete lugemiseks loa taotlema."\n\n"Mõned rakendused ei pruugi töötada enne, kui arendaja on need värskendanud."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Kui USB-salvestusruum on kaitstud, peavad rakendused välismäluseadmelt andmete lugemiseks loa taotlema.\n\nMõned rakendused ei pruugi töötada enne, kui arendaja on need värskendanud."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Kaitse SD-kaarti"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Rakendused peavad SD-kaardi lugemiseks loa taotlema"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Kas kaitsta SD-kaarti?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Kui SD-kaart on kaitstud, peavad rakendused välismäluseadmelt andmete lugemiseks loa taotlema."\n\n"Mõned rakendused ei pruugi töötada enne, kui arendaja on need värskendanud."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Kui SD-kaart on kaitstud, peavad rakendused välismäluseadmelt andmete lugemiseks loa taotlema.\n\nMõned rakendused ei pruugi töötada enne, kui arendaja on need värskendanud."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Kohalik terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Luba kohalikku turvalist juurdepääsu pakkuv terminalirakendus"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Valige vidin"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Valige vidin"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Kas luua vidin ja lubada juurdepääs?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Juurdepääsetavuse seaded"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Teenused"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Süsteem"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Suur tekst"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Toitenupp lõpetab kõne"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Öelge paroolid"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Puudutage ja hoidke viivitust"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Veebijuurdepääsu täiustamine"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Suurendamisliigutused"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kui see funktsioon on sisse lülitatud, saate suurendada ja vähendada, kolmikpuudutades ekraani.\n\nSuurendatult saab teha järgmist.\n"<ul><li>"Paanida: lohistage kahe või enama sõrmega üle ekraani."</li>\n<li>"Korrigeerida suumitaset: liigutage kahte või enamat sõrme kokku või lahku."</li></ul>\n\n"Saate ka ajutiselt suurendada sõrme all olevat kujutist, kolmikpuudutades ekraani ja hoides sõrme ekraanil. Selles suurendatud olekus saate sõrme ekraanil lohistada, et vaadata kuva erinevaid osi. Eelmisesse olekusse naasmiseks tõstke sõrm ekraanilt.\n\nMärkus: kolmikpuudutamine suurendamiseks toimib kõikjal, v.a klaviatuur ja navigeerimisriba."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Hõlbustuse otsetee"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Sees"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Välja"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kui see funktsioon sisse lülitatud, saate kiiresti lubada juurdepääsetavuse funktsiooni kahe sammuga:\n\n1. samm: vajutage ja hoidke all toitenuppu, kuni kuulete heli või tunnete vibratsiooni.\n\n2. samm: puudutage ja hoidke kahe sõrmega, kuni kuulete helikinnitust.\n\nKui seadmel on mitu kasutajat, kasutage lukustusekraanil seda otseteed, et ajutiselt lubada juurdepääs seadme avamiseni."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Suur tekst"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ekraanisuurendus"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekraanisuurenduse värskendus"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ekraanisuurenduse kasutus rakenduste vahetamisel"</string>
+    <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_menu_item_settings" msgid="3344942964710773365">"Seaded"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Sees"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"Sees"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Väljas"</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="print_settings" msgid="4742428530112487843">"Printimine"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Prindiseaded"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Teenused"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Kas soovite kasutada teenust <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> saab teie prinditavaid dokumente vastu võtta. Sellised dokumendid võivad sisaldada tundlikku teavet."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Ühtki teenust pole installitud"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Seaded"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Printerite lisamine"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Sees"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Väljas"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Aku"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Mis on akut kasutanud"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Aku andmed pole saadaval."</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Vastuvõetud andmed"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Saadetud mobiilsideandmed"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Vastuvõetud mobiilsideandmed"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Saadetud WiFi-andmed"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Vastuvõetud WiFi-andmed"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Heli"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Kestus"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Peatage või desinstallige rakendus"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Juhtige GPS-i käsitsi, et rakendus seda ei kasutaks"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Rakendus võib pakkuda akukasutust vähendavaid seadeid"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Kasutaja akukasutus"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> alates lahutamisest"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Alates viimasest lahutamisest <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Kasutus kokku"</string>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Helikõrgus"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Mõjutab räägitava teksti tooni"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Keel"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Keelt pole valitud"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Määrab räägitud teksti keelespetsiifilise hääle"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Kuulake näidet"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Esita lühike kõnesünteesi demo"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Heledus <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automaatne"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"täielik"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"poolik"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"väljas"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Mandaatide mälu"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Mälust installimine"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Rakenduse uuesti installimisel taasta varundatud seaded ja andmed"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Veaaruande võtmine"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Nii kogutakse teavet teie praeguse seadme oleku kohta, et meilisõnum saata. Enne kui saate veaaruande ära saata, võtab selle loomine natuke aega; varuge kannatust."</string>
-    <string name="report" msgid="302437572240018342">"Aruanne"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Arvutivarunduse parool"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Täielikud arvutivarundused pole praegu kaitstud"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Puudutage, et muuta või eemaldada täielike arvutivarunduste parool"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nTeise 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>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalender"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kontaktid"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Tere tulemast Google Synci!"</font>" "\n"See on Google\'i meetod andmete sünkroonimiseks, mis tagab teile kõikjal juurdepääsu kontaktisikutele, kokkusaamistele ja muule."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Tere tulemast Google Synci!"</font>" \nSee on Google\'i meetod andmete sünkroonimiseks, mis tagab teile kõikjal juurdepääsu kontaktisikutele, kokkusaamistele ja muule."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Rakenduse sünkroonimisseaded"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Andmed ja sünkroonimine"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Parooli muutmine"</string>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Akna pinna värskendam. kirjuta kogu akna pind üle"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Näita GPU kuva värskend."</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPU-ga joonistades kirjuta akende kuvad üle"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Kuva riistv. kiht. värsk."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Riistvara kihid vilguvad värskendamisel roheliselt"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Silu GPU ülejoonistust"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU-kasutuse kuvamine"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Praegust CPU-kasutust kuvav ekraani ülekate"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Jõusta GPU renderdamine"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Modelleeri teisi ekraane"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Rakendused"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ära hoia tegevusi alles"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Kõigi tegev. hävit. kohe, kui kasutaja neist lahk."</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Keelab mobiilsidevõrkude taustaandmed. Võimalusel kasutatakse muid võrke."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Rakend. taustandm. piiramiseks määrake mob. andmeside piirang."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Kas soovite taustandmeid piirata?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Funktsiooni tõttu võivad taustaandmetel põhinev rakendus töötamast lakata, kui saadaval on ainult mobiilsidevõrgud."\n\n"Andmekasutuse täpsemad juhtelemendid leiate rakenduse seadetest."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Funktsiooni tõttu võivad taustaandmetel põhinev rakendus töötamast lakata, kui saadaval on ainult mobiilsidevõrgud.\n\nAndmekasutuse täpsemad juhtelemendid leiate rakenduse seadetest."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Taustandmete piiramine on võimalik vaid juhul, kui olete määranud mobiilse andmeside piirangu."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Kas lülitan andmete automaatse sünkroonimise sisse?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Veebis kontodel tehtud muudatused kopeeritakse automaatselt teie tahvelarvutisse."\n\n"Mõned kontod võivad ka kõik tahvelarvutis tehtud muudatused automaatselt veebi kopeerida. Google\'i konto töötab nii."\n\n"Igal kontol sünkroonitava teabe valimiseks avage jaotis Seaded &gt; Kontod."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Veebis kontodel tehtud muudatused kopeeritakse automaatselt teie telefoni."\n\n"Mõned kontod võivad ka kõik telefonis tehtud muudatused automaatselt veebi kopeerida. Google\'i konto töötab nii."\n\n"Igal kontol sünkroonitava teabe valimiseks avage jaotis Seaded &gt; Kontod."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Veebis kontodel tehtud muudatused kopeeritakse automaatselt teie tahvelarvutisse.\n\nMõned kontod võivad ka kõik tahvelarvutis tehtud muudatused automaatselt veebi kopeerida. Google\'i konto töötab nii.\n\nIgal kontol sünkroonitava teabe valimiseks avage jaotis Seaded &gt; Kontod."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Veebis kontodel tehtud muudatused kopeeritakse automaatselt teie telefoni.\n\nMõned kontod võivad ka kõik telefonis tehtud muudatused automaatselt veebi kopeerida. Google\'i konto töötab nii.\n\nIgal kontol sünkroonitava teabe valimiseks avage jaotis Seaded &gt; Kontod."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Kas lülitan andmete automaatse sünkroonimise välja?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"See säästab andmemahu ja aku kasutust, kuid teil tuleb hiljutise teabe hankimiseks sünkroonida iga konto eraldi ja värskenduste ilmumisel ei kuvata teatist."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Kasutustsükli lähtestuskuupäev"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Andmekasutuse hoiatuse määramine"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Andmekasutuse piirangu määramine"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Andmekasutuse piiramine"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Määratud limiidi saavutamisel keelatakse mobiilne andmesideühendus.\n\nKaaluge 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\nKaaluge 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" 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\nSeade 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\nSeade 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Eemaldatud rakendused ja kasutajad"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> vastu võetud, <xliff:g id="SENT">%2$s</xliff:g> saadetud"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: kasutatud umbes <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>: 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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"VPN-i profiili lisamine"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Muuda profiili"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Kustuta profiil"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Alati sees VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Valige VPN-i profiil, millega olla alati ühendatud. Võrguliiklus on lubatud ainult siis, kui olete ühendatud selle VPN-iga."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Puudub"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Alati sees VPN-i jaoks on vaja IP-aadressi nii serverile kui ka DNS-ile."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Võrguühendus puudub. Proovige hiljem uuesti."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Sertifikaat on puudu. Muutke profiili."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Süsteem"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Tühista"</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">"Süsteemi lisavärskendused"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Kasutajad ja piirangud"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Kasutajad"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Kasutaja lisamine"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Üksikasjade muutmine"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Kasutaja teave"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Nimi"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Sisu piirangud"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Nõuab PIN-koodi"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Sisu hinnang"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Süsteemi rakendused"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Installitud rakendused"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Loobumine"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Kasutaja eemaldamine"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Tüütu laps"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Keelatud"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Lubav"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Jõustumisel"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Kasutajad"</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="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\nPärast uue kasutaja loomist peab kasutaja läbima seadistusprotsessi.\n\nIga 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\nIga 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_confirm_remove_message" msgid="5284111415714437285">"Kas soovite kindlasti eemaldada seadmest kasutaja ja kõik seotud andmed?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Fondi suuruse muutmine"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Piirangud"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Eemalda piirangud"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Muuda PIN-koodi"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Kuva teatised"</string>
     <string name="help_label" msgid="1107174367904110532">"Abi"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Sisu konto"</string>
+    <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="6160672982086584261">"Rakendusele piirangute määramine"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Juhib: <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Seda rakendust ei toetata piiratud profiilides"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"See rakendus pääseb teie kontode juurde"</string>
+    <string name="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-nokeys/strings.xml b/res/values-fa-nokeys/strings.xml
index 282556f..2542210 100644
--- a/res/values-fa-nokeys/strings.xml
+++ b/res/values-fa-nokeys/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"مدیریت برنامه های کاربردی"</string>
+    <string name="applications_settings_summary" msgid="6616938758022986257">"مدیریت برنامه‌های کاربردی"</string>
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 4c6b973..b9656b0 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -30,34 +30,34 @@
     <item msgid="8392017019801393511">"همه"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"15 ثانیه"</item>
-    <item msgid="8881760709354815449">"30 ثانیه"</item>
-    <item msgid="7589406073232279088">"1 دقیقه قبل"</item>
-    <item msgid="7001195990902244174">"2 دقیقه"</item>
-    <item msgid="7489864775127957179">"5 دقیقه"</item>
-    <item msgid="2314124409517439288">"10 دقیقه"</item>
-    <item msgid="6864027152847611413">"30 دقیقه"</item>
+    <item msgid="3342301044271143016">"۱۵ ثانیه"</item>
+    <item msgid="8881760709354815449">"۳۰ ثانیه"</item>
+    <item msgid="7589406073232279088">"۱ دقیقه"</item>
+    <item msgid="7001195990902244174">"۲ دقیقه"</item>
+    <item msgid="7489864775127957179">"۵ دقیقه"</item>
+    <item msgid="2314124409517439288">"۱۰ دقیقه"</item>
+    <item msgid="6864027152847611413">"۳۰ دقیقه"</item>
   </string-array>
   <string-array name="dream_timeout_entries">
     <item msgid="3149294732238283185">"هیچوقت"</item>
-    <item msgid="2194151041885903260">"15 ثانیه"</item>
-    <item msgid="5892295237131074341">"30 ثانیه"</item>
-    <item msgid="3538441365970038213">"1 دقیقه"</item>
-    <item msgid="412343871668955639">"2 دقیقه"</item>
-    <item msgid="5076853889688991690">"5 دقیقه"</item>
-    <item msgid="1903860996174927898">"10 دقیقه"</item>
-    <item msgid="6415509612413178727">"30 دقیقه"</item>
+    <item msgid="2194151041885903260">"۱۵ ثانیه"</item>
+    <item msgid="5892295237131074341">"۳۰ ثانیه"</item>
+    <item msgid="3538441365970038213">"۱ دقیقه"</item>
+    <item msgid="412343871668955639">"۲ دقیقه"</item>
+    <item msgid="5076853889688991690">"۵ دقیقه"</item>
+    <item msgid="1903860996174927898">"۱۰ دقیقه"</item>
+    <item msgid="6415509612413178727">"۳۰ دقیقه"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="8929270399652145290">"فوری"</item>
-    <item msgid="6736512735606834431">"5 ثانیه"</item>
-    <item msgid="8044619388267891375">"15 ثانیه"</item>
-    <item msgid="1822002388249545488">"30 ثانیه"</item>
-    <item msgid="8538071621211916519">"1 دقیقه"</item>
-    <item msgid="5663439580228932882">"2 دقیقه"</item>
-    <item msgid="49888496216106852">"5 دقیقه"</item>
-    <item msgid="9002737361305019353">"10 دقیقه"</item>
-    <item msgid="4322676235684793329">"30 دقیقه"</item>
+    <item msgid="6736512735606834431">"۵ ثانیه"</item>
+    <item msgid="8044619388267891375">"۱۵ ثانیه"</item>
+    <item msgid="1822002388249545488">"۳۰ ثانیه"</item>
+    <item msgid="8538071621211916519">"۱ دقیقه"</item>
+    <item msgid="5663439580228932882">"۲ دقیقه"</item>
+    <item msgid="49888496216106852">"۵ دقیقه"</item>
+    <item msgid="9002737361305019353">"۱۰ دقیقه"</item>
+    <item msgid="4322676235684793329">"۳۰ دقیقه"</item>
   </string-array>
   <string-array name="entries_font_size">
     <item msgid="8166647333858618801">"کوچک"</item>
@@ -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>
@@ -85,7 +89,7 @@
     <item msgid="8513729475867537913">"در حال اتصال…"</item>
     <item msgid="515055375277271756">"در حال تأیید اعتبار..."</item>
     <item msgid="1943354004029184381">"در حال دریافت آدرس IP..."</item>
-    <item msgid="4221763391123233270">"اتصال برقرار شد"</item>
+    <item msgid="4221763391123233270">"متصل"</item>
     <item msgid="624838831631122137">"معلق"</item>
     <item msgid="7979680559596111948">"در حال قطع اتصال..."</item>
     <item msgid="1634960474403853625">"اتصال قطع شد"</item>
@@ -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>
@@ -133,9 +140,9 @@
     <item msgid="2330782789550628803">"خارج از محدوده"</item>
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="8151962652413645395">"2 دقیقه"</item>
-    <item msgid="8675215713017289017">"5 دقیقه"</item>
-    <item msgid="477015974247590543">"1 ساعت"</item>
+    <item msgid="8151962652413645395">"۲ دقیقه"</item>
+    <item msgid="8675215713017289017">"۵ دقیقه"</item>
+    <item msgid="477015974247590543">"۱ ساعت"</item>
     <item msgid="5198271470953124739">"بدون مهلت زمانی"</item>
   </string-array>
   <string-array name="wifi_signal">
@@ -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>
@@ -179,7 +191,7 @@
   </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
-    <item msgid="628395202971532382">"آمار"</item>
+    <item msgid="628395202971532382">"ثابت"</item>
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"هیچکدام"</item>
@@ -206,16 +218,127 @@
     <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="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="886742181977884584">"رسانه"</item>
+    <item msgid="7924928667052300589">"دستگاه"</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>
+    <item msgid="5124443975763747838">"دکمه‌های رسانه‌ای"</item>
+    <item msgid="4547883971364273343">"فوکوس صدا"</item>
+    <item msgid="2603878814882344450">"میزان کنترل"</item>
+    <item msgid="7136963238377062018">"میزان صدا"</item>
+    <item msgid="4270236897655923007">"حجم حلقه"</item>
+    <item msgid="6325739889222559394">"میزان صدای رسانه"</item>
+    <item msgid="5762123934816216821">"میزان صدای زنگ هشدار"</item>
+    <item msgid="785049718065337473">"میزان صدای اعلان"</item>
+    <item msgid="6700305533746877052">"میزان صدای بلوتوث"</item>
+    <item msgid="2029227495214047094">"بیدار باش"</item>
+    <item msgid="26109888160231211">"کنترل موقعیت مکانی"</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>
+    <item msgid="5753789168376302997">"دکمه‌های رسانه‌"</item>
+    <item msgid="3265262911688671938">"فوکوس صدا"</item>
+    <item msgid="2098976479485046797">"میزان صدای اصلی"</item>
+    <item msgid="5660213838861789350">"میزان صدای مکالمه"</item>
+    <item msgid="7983336752371254444">"میزان صدای زنگ"</item>
+    <item msgid="7878027809189330917">"میزان صدای رسانه"</item>
+    <item msgid="7260546305036218513">"میزان صدای زنگ هشدار"</item>
+    <item msgid="9103719301075748925">"میزان صدای اعلان"</item>
+    <item msgid="7025966722295861512">"میزان صدای بلوتوث"</item>
+    <item msgid="4665183401128289653">"بیدار باش"</item>
+    <item msgid="8584357129746649222">"موقعیت مکانی"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"کوتاه"</item>
     <item msgid="2560532955514699713">"متوسط"</item>
     <item msgid="2372711992605524591">"طولانی"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"‫ART (اشکال‌زدایی)‏"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"استفاده از Dalvik"</item>
+    <item msgid="5131846588686178907">"استفاده از ART"</item>
+    <item msgid="4530003713865319928">"استفاده از نسخه اشکال‌زدایی ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"هرگز بررسی نشود"</item>
     <item msgid="6042769699089883931">"فقط بررسی محتوای DRM"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"مقیاس انیمیشن 5 برابر"</item>
     <item msgid="1069584980746680398">"مقیاس انیمیشن 10 برابر"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"هیچکدام"</item>
+    <item msgid="688482401508173818">"720X480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"tvdpi 1280x720 و 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"هیچکدام"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"غیرفعال"</item>
+    <item msgid="7688197031296835369">"نمایش نواحی بازنویسی"</item>
+    <item msgid="8332661909019981149">"نمایش شمارشگر میزان بازنویسی"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"حد استاندارد"</item>
     <item msgid="4071574792028999443">"بدون پردازش در پس‌زمینه"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"پایان مهلت زمانی"</item>
     <item msgid="7664124146786465092">"ناموفق"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"سؤال شود"</item>
+    <item msgid="5077768429488260031">"همیشه غیرمجاز"</item>
+    <item msgid="1417929597727989746">"همیشه مجاز"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7112710..9ffbc15 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"بله"</string>
     <string name="no" msgid="6731231425810196216">"خیر"</string>
     <string name="create" msgid="3578857613172647409">"ایجاد"</string>
+    <string name="allow" msgid="3349662621170855910">"اجازه دادن"</string>
+    <string name="deny" msgid="6947806159746484865">"ردکردن"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ناشناس"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"شما در حال حاضر، <xliff:g id="STEP_COUNT">%1$d</xliff:g> قدم تا برنامه‌نویس شدن فاصله دارید."</item>
+    <item quantity="other" msgid="6722953419953594148">"شما در حال حاضر، <xliff:g id="STEP_COUNT">%1$d</xliff:g> قدم تا برنامه‌نویس شدن فاصله دارید."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"شما اکنون یک برنامه‌نویس هستید!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"نیازی نیست، شما در حال حاضر یک برنامه‌نویس هستید."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"بی‌سیم و شبکه‌ها"</string>
     <string name="header_category_device" msgid="5781174212691167553">"دستگاه"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"شخصی"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"شارژ کردن"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"در حال خالی شدن"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(بی‌سیم)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"شارژ نمی‌شود"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"شارژ نمی‌شود"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"پر"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"جدا کردن از پریز"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"بی‌سیم"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"ناشناس"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"ناشناس"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"خطای ناشناس"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"سرد"</string>
     <string name="bluetooth" msgid="5549625000628014477">"بلوتوث"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"قابل شناسایی"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"قابل مشاهده برای تمام دستگاه‌های بلوتوث مجاور (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"قابل مشاهده برای تمام دستگاه‌های بلوتوث مجاور"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"برای دیگر دستگاه‌های بلوتوث قابل مشاهده نیست"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"فقط برای دستگاه‌های مرتبط شده قابل مشاهده است"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"دستگاه قابل شناسایی شود"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"پایان زمان قابل مشاهده بودن"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"مدت زمان قابل شناسایی بودن دستگاه را تنظیم کنید"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"قفل کردن شماره گیری صوتی"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ممانعت از استفاده شماره‌گیر بلوتوث هنگام قفل شدن صفحه"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"دستگاه‌های بلوتوث"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"نمایش فایل‌های دریافتی"</string>
     <string name="device_picker" msgid="8398232791303186677">"انتخاب‌گر دستگاه بلوتوث"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"درخواست مجوز بلوتوث"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"برنامه‌ای می‌خواهد بلوتوث را روشن کند. اجازه می‌دهید؟"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"برنامه‌ای در رایانهٔ لوحی شما می‌خواهد رایانهٔ شما را به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه توسط دستگاه‌های بلوتوث دیگر قابل شناسایی کند. اجازه می‌دهید؟"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"برنامه‌ای در گوشی شما می‌خواهد گوشی شما را توسط دستگاه‌های بلوتوث دیگر به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل شناسایی کند. اجازه می‌دهید؟"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"برنامه‌ای در رایانهٔ لوحی شما می‌خواهد رایانهٔ شما را توسط دستگاه‌های بلوتوث دیگر \"برای همیشه قابل شناسایی\" کند. اجازه می‌دهید؟"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"برنامه‌ای در گوشی شما می‌خواهد گوشی شما را توسط دستگاه‌های بلوتوث دیگر \"همیشه قابل شناسایی\" کند. اجازه می‌دهید؟"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"برنامه‌ای در رایانهٔ لوحی شما می‌خواهد بلوتوث را روشن کند و رایانهٔ شما را به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه توسط دستگاه‌های بلوتوث دیگر قابل شناسایی کند. اجازه می‌دهید؟"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"یک برنامه در گوشی شما می‌خواهد بلوتوث را روشن کند و باعث شود گوشی شما توسط دستگاه‌های دیگر به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل شناسایی باشد. اجازه می‌دهید؟"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"برنامه‌ای در رایانهٔ لوحی شما می‌خواهد بلوتوث را روشن کند و رایانهٔ شما را توسط برنامه‌های دیگر قابل شناسایی کند. اجازه می‌دهید؟"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"یک برنامه در گوشی شما می‌خواهد بلوتوث را روشن کند و باعث شود گوشی شما توسط دستگاه‌های دیگر قابل شناسایی باشد. اجازه می‌دهید؟"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"برنامه‌ای می‌خواهد بلوتوث را روشن کند."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"برنامه‌ای می‌خواهد رایانه لوحی شما را برای سایر دستگاه‌های بلوتوث به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل مشاهده کند."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"برنامه‌ای می‌خواهد تلفن شما را برای سایر دستگاه‌های بلوتوث به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل مشاهده کند."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"برنامه‌ای می‌خواهد رایانه لوحی شما را برای سایر دستگاه‌های بلوتوث قابل مشاهده کند. شما می‌توانید این حالت را بعداً در تنظیمات بلوتوث تغییر دهید."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"برنامه‌ای می‌خواهد تلفن شما را برای سایر دستگاه‌های بلوتوث قابل مشاهده کند. شما می‌توانید این حالت را بعداً در تنظیمات بلوتوث تغییر دهید."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"برنامه‌ای می‌خواهد بلوتوث را روشن کند و رایانه لوحی شما را برای سایر دستگاه‌ها به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل مشاهده کند."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"برنامه‌ای می‌خواهد بلوتوث را روشن کند و تلفن شما را برای سایر دستگاه‌های دیگر به مدت <xliff:g id="TIMEOUT">%1$d</xliff:g> ثانیه قابل مشاهده کند."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"برنامه‌ای می‌خواهد بلوتوث را روشن کند و رایانه لوحی شما را برای سایر دستگاه‌ها قابل مشاهده کند. شما می‌توانید این حالت را بعداً در تنظیمات بلوتوث تغییر دهید."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"برنامه‌ای می‌خواهد بلوتوث را روشن کند و تلفن شما را برای سایر دستگاه‌ها قابل مشاهده کند. شما می‌توانید این حالت را بعداً در تنظیمات بلوتوث تغییر دهید."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"روشن کردن بلوتوث؟؟؟"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"خاموش کردن بلوتوث؟؟؟"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"اتصال خودکار"</string>
@@ -161,7 +168,7 @@
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"دوباره سؤال نشود"</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="normal_date_format" msgid="7636406984925498359">"پیش‌فرض (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"پیش‌نمایش:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"اندازهٔ قلم:"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"از پروکسی HTTP توسط مرورگرها استفاده می‌شود اما ممکن است توسط برنامه‌های دیگر استفاده نشود."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"مکان:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID مجاور:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"تلاش‌های داده:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"سرویس GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"رومینگ:"</string>
@@ -239,7 +247,7 @@
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"بایت های استفاده شده:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"در حال اسکن حافظهٔ USB برای رسانه..."</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"اسکن کردن کارت SD برای رسانه..."</string>
-    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"حافظهٔ USB به عنوان فقط خواندنی متصل شد."</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"حافظهٔ USB به‌عنوان فقط خواندنی متصل شد."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"کارت SD به صورت فقط خواندنی نصب شد."</string>
     <string name="skip_label" msgid="47510779345218297">"رد شدن"</string>
     <string name="next_label" msgid="4693520878012668114">"بعدی"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"شما اتصال داده خود را از دست داده‌اید زیرا رومینگ داده را در شبکه اصلی خود خاموش کرده‌اید."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"روشن کنید"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"هنگام انجام رومینگ داده، ممکن است هزینه‌های رومینگ قابل توجهی را متحمل شوید!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"وقتی به رومینگ داده اجازه می‌دهید، ممکن است رومینگ، هزینه‌های بسیار زیادی برای شما در پی داشته باشد!\n\nاین تنظیم روی همه کاربران موجود در این رایانه لوحی تأثیر می‌گذارد."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"وقتی به رومینگ داده اجازه می‌دهید، ممکن است هزینه‌های بسیار زیادی برای شما در پی داشته باشد!\n\nاین تنظیم روی همه کاربران موجود در این تلفن تأثیر می‌گذارد."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"رومینگ داده مجاز است؟"</string>
     <string name="networks" msgid="6333316876545927039">"انتخاب اپراتور"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"انتخاب یک اپراتور شبکه"</string>
@@ -283,9 +293,9 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"تنظیم ساعت"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"انتخاب منطقهٔ زمانی"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"تنظیم تاریخ"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"فرمت تاریخ را انتخاب کنید"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"انتخاب قالب تاریخ"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"ترتیب الفبایی"</string>
-    <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"ترتیب بر اساس منطقهٔ زمانی"</string>
+    <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"بر اساس منطقهٔ زمانی مرتب شود"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"تاریخ"</string>
     <string name="time_picker_title" msgid="483460752287255019">"زمان"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"بهبود مطابقت چهره"</string>
@@ -297,6 +307,10 @@
     <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">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل محل ذخیره اطلاعات کاربری"</string>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"هر بار که رایانهٔ لوحی خود را روشن می‌کنید، برای رمزگشایی به یک پین عددی یا رمز ورود نیاز دارید"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"هر بار که تلفن خود را روشن می‌کنید، برای رمزگشایی به یک پین عددی یا رمز ورود نیاز دارید"</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>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"پس از <xliff:g id="DELAY">^1</xliff:g> ثانیه دوباره امتحان کنید."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"گذرواژهٔ خود را تایپ کنید"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"رمزگذاری ناموفق"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"رمزگذاری متوقف شد و امکان تکمیل کردن آن وجود ندارد. در نتیجه، داده‌های موجود در رایانهٔ لوحی شما دیگر قابل دسترسی نیستند. "\n\n"برای ادامه استفاده از رایانهٔ لوحی خود، باید تنظیمات کارخانه را بازنشانی کنید. با تنظیم کردن رایانهٔ لوحی پس از بازنشانی، این فرصت را خواهید داشت تا هرگونه داده‌ای را که از آن در حساب Google نسخهٔ پشتیبان تهیه شده بازیابی کنید."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"رمزگذاری متوقف شد و امکان تکمیل آن وجود ندارد. در نتیجه، داده‌های موجود در تلفن شما دیگر قابل دسترسی نیستند. "\n\n"برای ادامه استفاده از تلفن خود، باید تنظیمات کارخانه را بازنشانی کنید. با راه‌اندازی تلفن پس از بازنشانی، این فرصت را خواهید داشت تا هرگونه داده‌ای را که از آن در حساب Google نسخهٔ پشتیبان تهیه شده بازیابی کنید."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"رمزگذاری متوقف شد و امکان تکمیل کردن آن وجود ندارد. در نتیجه، داده‌های موجود در رایانهٔ لوحی شما دیگر قابل دسترسی نیستند. \n\nبرای ادامه استفاده از رایانهٔ لوحی خود، باید تنظیمات کارخانه را بازنشانی کنید. با تنظیم کردن رایانهٔ لوحی پس از بازنشانی، این فرصت را خواهید داشت تا هرگونه داده‌ای را که از آن در حساب Google نسخهٔ پشتیبان تهیه شده بازیابی کنید."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"رمزگذاری متوقف شد و امکان تکمیل آن وجود ندارد. در نتیجه، داده‌های موجود در تلفن شما دیگر قابل دسترسی نیستند. \n\nبرای ادامه استفاده از تلفن خود، باید تنظیمات کارخانه را بازنشانی کنید. با راه‌اندازی تلفن پس از بازنشانی، این فرصت را خواهید داشت تا هرگونه داده‌ای را که از آن در حساب Google نسخهٔ پشتیبان تهیه شده بازیابی کنید."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"تغییر روش ورودی"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"قفل صفحهٔ نمایش را انتخاب کنید"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"قفل پشتیبان را انتخاب کنید"</string>
@@ -339,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>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"تغییر پین بازگشایی قفل"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"تغییر رمز ورود بازگشایی قفل"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"رمز ورود باید حداقل %d نویسه باشد"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"پین باید حداقل %d نویسه باشد"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"پین باید حداقل %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>
@@ -406,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>
@@ -477,9 +500,31 @@
     <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"استفاده برای دسترسی به اینترنت"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"تنظیمات جایگاه"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"استفاده از جایگاه برای صدا"</string>
-    <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"به عنوان تلفن دارای بلندگو"</string>
+    <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"به‌عنوان تلفن دارای بلندگو"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"برای موسیقی و رسانه"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"به خاطر سپردن تنظیمات"</string>
+    <string name="wifi_display_settings_title" msgid="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="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_paired_devices" msgid="7395326840730024303">"صفحه‌نمایش‌های مرتبط شده"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"دستگاه‌های موجود"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"در حال اتصال"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"متصل"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"در دسترس"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"درحال استفاده"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"تنظیمات نمایش"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"اتصال قطع شود؟"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"این کار اتصال شما را با این دستگاه قطع می‌کند:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"گزینه‌های صفحه‌نمایش بی‌سیم"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"فراموش کردن"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"انجام شد"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"نام"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"روشن"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"خاموش"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"غیرفعال شد"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"تبادل داده هنگامیکه رایانهٔ لوحی در تماس با دستگاه دیگر است مجاز باشد"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"اجازه برای تبادل داده‌ها هنگامی که تلفن دستگاه دیگری را لمس می‌کند"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"خاموش"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"در دسترس نیست زیرا NFC خاموش است"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"در صورت روشن بودن این ویژگی، می‌توانید با نگهداشتن دستگاه‌ها نزدیک به یکدیگر، محتوای برنامهٔ کاربردی را به دستگاه دارای قابلیت NFC دیگری مخابره کنید. به عنوان مثال، می‌توانید صفحات مرورگر، ویدئوهای YouTube، تماس‌های افراد و موارد دیگر را مخابره کنید."\n\n" کافیست دستگاه‌ها را نزدیک هم بگذارید (معمولاً پشت به پشت) و سپس صفحهٔ نمایش خود را لمس کنید. برنامه‌ کاربردی آنچه را مخابره می‌شود تعیین می‌کند."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"در صورت روشن بودن این ویژگی، می‌توانید با نگهداشتن دستگاه‌ها نزدیک به یکدیگر، محتوای برنامهٔ کاربردی را به دستگاه دارای قابلیت NFC دیگری مخابره کنید. به‌عنوان مثال، می‌توانید صفحات مرورگر، ویدئوهای YouTube، تماس‌های افراد و موارد دیگر را مخابره کنید.\n\n کافیست دستگاه‌ها را نزدیک هم بگذارید (معمولاً پشت به پشت) و سپس صفحهٔ نمایش خود را لمس کنید. برنامه‌ کاربردی آنچه را مخابره می‌شود تعیین می‌کند."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"کاوش سرویس شبکه"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"به برنامه‎های دستگاه‌های دیگر اجازه داده شود برنامه‎های این دستگاه را ببینند"</string>
-    <string name="wifi_quick_toggle_title" msgid="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="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_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="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="8116564886303972764">"پین <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_in_progress" msgid="2944576520214787628">"WPS در حال انجام کار است و تکمیل آن حداکثر دو دقیقه طول می‌کشد"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"به شبکه Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> متصل شد"</string>
+    <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS در حال انجام عملیات است و ممکن است حداکثر دو دقیقه طول بکشد تا کاملاْ انجام شود."</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS انجام نشد. لطفاً چند دقیقه دیگر دوباره امتحان کنید."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"تنظیمات امنیتی روتر بیسیم (WEP) پشتیبانی نمی‌شود"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"تنظیمات امنیتی روتر بیسیم (TKIP) پشتیبانی نمی‌شود"</string>
     <string name="wifi_wps_failed_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" 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>
@@ -564,6 +621,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>
@@ -571,8 +631,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_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi پیشرفته"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"باند فرکانس Wi-Fi"</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="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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"در حال جستجو…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"تغییر نام دستگاه"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"دستگاه‌های مشابه"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"گروه‌های به خاطر سپرده شده"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"متصل نشد."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"تغییر نام دستگاه انجام نشد."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"اتصال قطع شود؟"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"اگر اتصال شما قطع شود، اتصال شما با <xliff:g id="PEER_NAME">%1$s</xliff:g> و سایر دستگاه‌های <xliff:g id="PEER_COUNT">%2$s</xliff:g> به پایان خواهد رسید."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"دعوتنامه لغو شود؟"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"آیا می‌خواهید دعوت برای ارتباط با <xliff:g id="PEER_NAME">%1$s</xliff:g> را لغو کنید؟"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"نقطه اتصال Wi-Fi قابل حمل"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"این گروه فراموش شود؟"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"نقطه اتصال قابل حمل Wi-Fi"</string>
+    <string name="wifi_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>
@@ -615,13 +687,13 @@
     <string name="all_volume_title" msgid="4296957391257836961">"میزان صدا"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"جلوه‌های موسیقی"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"میزان صدای زنگ"</string>
-    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"لرزش در حالت بیصدا"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"اعلان پیش‌فرض"</string>
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"لرزش در حالت بی‌صدا"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"صدای اعلان پیش‌فرض"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"چراغ اعلان چشمک بزند"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"آهنگ زنگ"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"اعلان"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"استفاده از صدای تماس ورودی برای اعلان‌ها"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"انتخاب آهنگ زنگ اعلان"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"صدای اعلان پیش‌فرض"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"رسانه"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"تنظیم میزان صدا برای موسیقی و ویدئو"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"هشدار"</string>
@@ -671,15 +743,16 @@
     <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="3848608373818910549">"آب نبات صفحهٔ نمایش"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"در صورت اتصال به برق، از حالت خواب شروع به کار می‌کند"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"غیرفعال شد"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"آب نبات انتخابی"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"چه وقت فعال شود"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"پس از <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> عدم استفاده"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"هرگز"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"امتحان کنید!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"هنگام قرارگرفتن در جایگاه نیز آغاز شود"</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">"برای کنترل آنچه که پس از قرار دادن تلفن در جایگاه و/یا به خواب رفتن آن روی می‌دهد، رویاپردازی را فعال کنید."</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>
@@ -701,21 +774,22 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"پین سیم کارت"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"پین اشتباه"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"پین‌ها با یکدیگر مطابقت ندارند"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"نمی‌توانید پین را تغییر دهید."\n"ممکن است پین اشتباه باشد."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"نمی‌توانید پین را تغییر دهید.\nممکن است پین اشتباه باشد."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"پین سیم کارت با موفقیت تغییر کرد"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"نمی‌توان وضعیت قفل سیم کارت را تغییر داد."\n"احتمالاً پین نادرست است."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"نمی‌توان وضعیت قفل سیم کارت را تغییر داد.\nاحتمالاً پین نادرست است."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"تأیید"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"لغو"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"وضعیت رایانهٔ لوحی"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"وضعیت تلفن"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"به‌روزرسانی‌های سیستم"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
-    <string name="firmware_version" msgid="4801135784886859972">"نسخه Android"</string>
-    <string name="model_number" msgid="3765737700545384794">"شماره مدل"</string>
+    <string name="firmware_version" msgid="4801135784886859972">"نسخهٔ Android"</string>
+    <string name="model_number" msgid="3765737700545384794">"شمارهٔ مدل"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"شناسه دستگاه"</string>
     <string name="baseband_version" msgid="1848990160763524801">"نسخهٔ باند پایه"</string>
     <string name="kernel_version" msgid="9192574954196167602">"نسخهٔ اصلی"</string>
     <string name="build_number" msgid="3075795840572241758">"شمارهٔ ساخت"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"وضعیت SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"موجود نیست"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"وضعیت"</string>
     <string name="device_status" msgid="607405385799807324">"وضعیت"</string>
@@ -732,13 +806,14 @@
     <string name="status_prl_version" msgid="1007470446618081441">"نسخه PRL"</string>
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
-    <string name="status_network_type" msgid="3279383550222116235">"نوع شبکه تلفن همراه"</string>
-    <string name="status_data_state" msgid="5503181397066522950">"وضعیت شبکه تلفن همراه"</string>
+    <string name="status_network_type" msgid="3279383550222116235">"نوع شبکهٔ تلفن همراه"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"اطلاعات اپراتور"</string>
+    <string name="status_data_state" msgid="5503181397066522950">"وضعیت شبکهٔ تلفن همراه"</string>
     <string name="status_service_state" msgid="2323931627519429503">"وضعیت سرویس"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"قدرت سیگنال"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"حافظهٔ USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"کارت SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"آزاد"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"موجود (فقط خواندنی)"</string>
     <string name="memory_size" msgid="6629067715017232195">"کل فضا"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"در حال محاسبه..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"برنامه‌ها (داده‌های برنامه و محتوای رسانه)"</string>
@@ -756,6 +832,7 @@
     <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_cache_usage" msgid="6704293333141177910">"داده‌های موجود در حافظه پنهان"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"قطع اتصال حافظه مشترک"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"جدا کردن کارت SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"قطع اتصال حافظهٔ USB داخلی"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"پاک کردن کارت SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"پاک کردن همه داده‌های موجود در حافظهٔ USB داخلی مانند موسیقی و عکس"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"همه داده‌های موجود در کارت SD مانند موسیقی و عکس‌ها را پاک می‌کند"</string>
-    <string name="read_only" msgid="6702420168629076340">" (فقط خواندنی)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"داده‌های موجود در حافظه پنهان پاک شود؟"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"با این کار داده‌های موجود در حافظه پنهان همه برنامه‌ها پاک می‌شود."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"عملکرد MTP یا PTP فعال است"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"حافظهٔ USB جدا شود؟"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"کارت SD جدا شود؟"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"در صورت جدا کردن حافظهٔ USB، برخی از برنامه‌هایی که از آن‌ها استفاده می‌کنید متوقف می‌شوند و ممکن است تا زمانی که حافظهٔ USB را دوباره نصب کنید، دیگر نتوانید از آن‌ها استفاده کنید."</string>
@@ -787,12 +866,13 @@
     <string name="storage_low_summary" msgid="7737465774892563129">"برخی از عملکردهای سیستم مانند همگام‌سازی ممکن است به نحوه صحیح کار نکنند. با حذف یا لغو پین کردن مواردی همچون برنامه‌ها یا محتوای رسانه، سعی کنید فضا را خالی کنید."</string>
     <string name="storage_menu_usb" msgid="5708207885333243384">"اتصال به کامپیوتر با USB"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"اتصال به کامپیوتر با USB"</string>
-    <string name="usb_connection_category" msgid="7805945595165422882">"اتصال به عنوان"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"اتصال به‌عنوان"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"دستگاه رسانه‌ای (MTP)"</string>
     <string name="usb_mtp_summary" msgid="4617321473211391236">"به شما امکان می‌دهد که فایل‌های رسانه‌ای را در Windows یا با استفاده از عملکرد انتقال فایل Android در Mac انتقال دهید (به www.android.com/filetransfer مراجعه کنید)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"دوربین (PTP)"</string>
     <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="apn_settings" msgid="3743170484827528406">"APNها"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"بازنشانی به داده‌های کارخانه"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"پاک کردن تمام داده‌های موجود در رایانهٔ لوحی"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"پاک کردن تمام داده‌های موجود در گوشی"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"با این کار همه داده‌های "<b>"حافظهٔ داخلی"</b>" رایانهٔ لوحی شما پاک می‌شود، از جمله:"\n\n<li>"حساب Google شما"<li>\n</li>"داده‌ها و تنظیمات برنامه و سیستم"<li>\n</li>"برنامه‌های دانلود شده"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"با این کار همه داده‌های "<b>"حافظهٔ داخلی"</b>" گوشی شما پاک می‌شود، از جمله:"\n\n<li>"حساب Google شما"</li>\n<li>"داده‌های برنامه و سیستم و تنظیمات"</li>\n<li>"برنامه‌های دانلود شده"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"شما در حال حاضر به حساب‌های زیر وارد شده‌اید:"\n</string>
+    <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>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"برای پاک کردن موسیقی، عکس‌ها و سایر داده‌های کاربر، "<b>"کارت SD"</b>" باید پاک شود."</string>
@@ -897,10 +979,15 @@
     <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="location_title" msgid="1029961368397484576">"موقعیت مکانی من"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"مکان شبکه تلفن همراه و 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="manage_mobile_plan_title" msgid="7588182101738043593">"مدیریت طرح تلفن همراه"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"شرکت مخابراتی ارائه دهنده سیم کارت ناشناس است"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s وب‌سایت شناخته‌شده‌ای برای آماده‌سازی ندارد."</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"لطفاً سیم کارت را وارد کنید و دوباره راه‌اندازی کنید"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"لطفاً به اینترنت وصل شوید"</string>
+    <string name="location_title" msgid="1029961368397484576">"موقعیت مکانی شما"</string>
+    <string name="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 رایانه لوحیتان استفاده کنند"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"به برنامه‌های کاربردی اجازه داده شود برای مشخص کردن دقیق مکان شما از GPS تلفن همراه شما استفاده کنند"</string>
@@ -909,14 +996,15 @@
     <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="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="copyright_title" msgid="865906688917260647">"حق نسخه‌برداری"</string>
     <string name="license_title" msgid="1990487604356037871">"مجوز"</string>
     <string name="terms_title" msgid="7697580845616764642">"شرایط و مقررات"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"تغییر پین بازگشایی قفل"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"تأیید الگوی ذخیره شده"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"دوباره امتحان کنید:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"یک الگوی بازگشایی قفل بکشید"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"الگوی بازگشایی قفل را ترسیم کنید:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"برای دریافت راهنمایی روی منو فشار دهید."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"پس از انجام کار، انگشت را رها کنید."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"حداقل <xliff:g id="NUMBER">%d</xliff:g> نقطه را متصل کنید. دوباره امتحان کنید:"</string>
@@ -958,20 +1046,15 @@
     <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>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"تلاش‌های اشتباه زیادی انجام شده است!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"در <xliff:g id="NUMBER">%d</xliff:g> ثانیه دوباره امتحان کنید."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"لغو"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"بعدی"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"محافظت از رایانهٔ لوحی خود"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"حفظ امنیت تلفن شما"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"با ایجاد یک الگوی شخصی باز کردن قفل صفحه، از رایانهٔ لوحی خود در برابر استفاده غیر مجاز محافظت کنید. با کشیدن انگشت خود، در صفحه بعدی نقاط را با ترتیب دلخواه متصل کنید. حداقل باید چهار نقطه را به هم متصل کنید. "\n\n"آماده هستید؟ \"بعدی\" را لمس کنید."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"با ایجاد یک الگوی باز کردن قفل صفحه شخصی، از گوشی خود در برابر استفاده غیر مجاز محافظت کنید. با استفاده از انگشت خود، در صفحه بعدی حداقل 4 نقطه را با ترتیب دلخواه متصل کنید. "\n\n"آماده شروع هستید؟ \"بعدی\" را لمس کنید."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"برنامه کاربردی در گوشی شما نصب نشد."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"مدیریت برنامه‌ها"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"مدیریت و حذف برنامه‌های نصب شده"</string>
     <string name="applications_settings" msgid="1721442176406964682">"برنامه‌ها"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"اجازه نصب برنامه‌ها از منابع ناشناخته"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"رایانهٔ لوحی و داده‌های شخصی شما بیشتر در معرض خطر حمله برنامه‌های منابع ناشناس هستند. شما موافقت می‌کنید که در قبال هر گونه آسیب وارده به رایانهٔ لوحی خود یا از دست دادن داده که در نتیجه استفاده از این برنامه‌ها روی دهد تنها خودتان مسئول هستید."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"گوشی و داده‌های شخصی شما بیشتر در معرض خطر حمله برنامه‌های منابع ناشناس هستند. شما موافقت می‌کنید که در قبال هر گونه آسیبی که در نتیجه استفاده از این برنامه‌ها به گوشی شما وارد شود فقط خودتان مسئول هستید."</string>
+    <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="application_info_label" msgid="5736524913065714880">"اطلاعات برنامه"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"داده‌های ذخیره‌سازی USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"کارت SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"حذف نصب"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"حذف نصب برای همه کاربران"</string>
+    <string name="install_text" msgid="884360662922471113">"نصب"</string>
     <string name="disable_text" msgid="6544054052049395202">"غیرفعال کردن"</string>
     <string name="enable_text" msgid="9217362512327828987">"فعال کردن"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"پاک کردن داده‌ها"</string>
@@ -1014,22 +1101,24 @@
     <string name="enable_compatibility" msgid="5806819252068617811">"مقیاس‌بندی برنامه"</string>
     <string name="unknown" msgid="1592123443519355854">"ناشناس"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"مرتب سازی بر اساس نام"</string>
-    <string name="sort_order_size" msgid="7024513286636502362">"ترتیب بر اساس اندازه"</string>
+    <string name="sort_order_size" msgid="7024513286636502362">"بر اساس اندازه مرتب شود"</string>
     <string name="show_running_services" msgid="5736278767975544570">"نمایش سرویس‌های در حال اجرا"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"فرآیندهای ذخیره شده در حافظهٔ پنهان"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"بازنشانی تنظیمات برگزیده برنامه"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"تنظیمات برگزیده برنامه بازنشانی شوند؟"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"این کار همه تنظیمات برگزیده این موارد را بازنشانی می‌کند:"\n\n" "<li>"برنامه‌های غیرفعال شده"</li>\n" "<li>"اعلان‌های برنامه غیرفعال شده"</li>\n" "<li>"برنامه‌های پیش‌فرض برای عملیات"</li>\n" "<li>"محدودیت‌های داده پس‌زمینه برای برنامه‌ها"</li>\n\n" داده برنامه را از دست نمی‌دهید."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"این کار همه تنظیمات برگزیده این موارد را بازنشانی می‌کند:\n\n "<li>"برنامه‌های غیرفعال شده"</li>\n" "<li>"اعلان‌های برنامه غیرفعال شده"</li>\n" "<li>"برنامه‌های پیش‌فرض برای عملیات"</li>\n" "<li>"محدودیت‌های داده پس‌زمینه برای برنامه‌ها"</li>\n\n" داده برنامه را از دست نمی‌دهید."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"بازنشانی برنامه‌ها"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"مدیریت فضا"</string>
     <string name="filter" msgid="2018011724373033887">"فیلتر"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"انتخاب گزینه‌های فیلتر"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"همه"</string>
-    <string name="filter_apps_third_party" msgid="7786348047690140979">"دانلود شد"</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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"در کارت SD"</string>
     <string name="disabled" msgid="9206776641295849915">"غیر فعال شد"</string>
+    <string name="not_installed" msgid="1475144352069281880">"نصب نشده"</string>
     <string name="no_applications" msgid="7336588977497084921">"برنامه‌ای موجود نیست."</string>
     <string name="internal_storage" msgid="1584700623164275282">"حافظهٔ داخلی"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"حافظهٔ USB"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> و <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>، <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>، <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"این برنامه ممکن است برای شما هزینه داشته باشد:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"ارسال پیامک ممتاز"</string>
     <string name="computing_size" msgid="1599186977475211186">"در حال محاسبه..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"اندازه بسته قابل محاسبه نیست."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"شما هیچ برنامه شخص ثالثی را نصب نکرده‌اید."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"تغییر مکان نصب دلخواه برای برنامه‌های جدید"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"برنامه داخلی غیرفعال شود؟"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"در صورت غیر فعال کردن یک برنامه داخلی، سایر برنامه‌ها ممکن است عملکرد نادرستی از خود نشان دهند."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"حذف داده‌ها و غیر فعال کردن برنامه؟"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"کاربر: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"کاربر حذف شده"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> فرآیند و <xliff:g id="NUMSERVICES">%2$d</xliff:g> سرویس"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> فرآیند و <xliff:g id="NUMSERVICES">%2$d</xliff:g> سرویس"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> فرآیند و <xliff:g id="NUMSERVICES">%2$d</xliff:g> سرویس"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"تنظیمات صفحه‌کلید فیزیکی"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"برای وارد کردن \".\"، کلید فاصله را دو بار فشار دهید."</string>
     <string name="show_password" msgid="3001113966880559611">"گذرواژه‌ها را قابل مشاهده کنید"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></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>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"برای تغییر، Control-کلید فاصله را فشار هید"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"پیش‌فرض"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"طرح‌بندی‌های صفحه‌کلید"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"فرهنگ لغت کاربر"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"فرهنگ لغت شخصی"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"فرهنگ‌های لغت شخصی"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"فرهنگ لغت شخصی"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"افزودن"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"افزودن به فرهنگ لغت"</string>
@@ -1157,6 +1252,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>
@@ -1195,26 +1292,40 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"تنظیمات صفحه‌کلید روی صفحه"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"صفحه‌کلید فیزیکی"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"تنظیمات صفحه‌کلید فیزیکی"</string>
-    <string name="development_settings_title" msgid="215179176067683667">"گزینه‌های برنامه‌نویس"</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="bt_hci_snoop_log" msgid="3340699311158865670">"فعال کردن گزارش تجسس Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ذخیره تمامی بسته‌های HCI بلوتوث در یک فایل"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"انتخاب زمان اجرا"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"انتخاب زمان اجرا"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"برای تغییر زمان اجرا از <xliff:g id="OLD">%1$s</xliff:g> به <xliff:g id="NEW">%2$s</xliff:g> دوباره راه‌اندازی شود؟"</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>
+    <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>
-    <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_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="enable_terminal_title" msgid="95572094356054120">"ترمینال محلی"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"فعال کردن ترمینال برنامه‌ کاربردی که دسترسی به برنامه محلی را پیشنهاد می‌کند"</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>
@@ -1234,29 +1345,43 @@
     <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_toggle_large_text_title" msgid="6618674985313017711">"متن بزرگ"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"دکمه روشن/خاموش به تماس پایان می‌دهد"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"گفتن گذرواژه‎ها"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"تأخیر لمس کردن و نگه داشتن"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"افزایش دسترسی به وب"</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>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"خاموش"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"وقتی این ویژگی روشن است، شما می‌توانید به سرعت ویژگی‌های قابلیت دسترسی را در دو مرحله فعال کنید:\n\nمرحله ۱: دکمه روشن/خاموش را فشار داده و نگهدارید تا صدایی را بشنوید یا لرزشی را احساس کنید.\n\nمرحله ۲: با دو انگشت لمس کرده و فشار دهید تا تأیید صوتی را بشنوید.\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_toggle_speak_password_preference_title" msgid="5986628515113204844">"گفتن گذرواژه‎ها"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"تأخیر لمس کردن و نگه داشتن"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"تنظیمات"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"روشن"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"خاموش"</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="accessibility_feature_state_on" msgid="2864292320042673806">"فعال"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"غیرفعال"</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="print_settings" msgid="4742428530112487843">"چاپ کردن"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"تنظیمات چاپ"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"خدمات"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"از <xliff:g id="SERVICE">%1$s</xliff:g> استفاده شود؟"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> می‌تواند اسنادی را که چاپ می‌کنید دریافت کند. این اسناد ممکن است حاوی اطلاعات مهمی باشند."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"سرویسی نصب نشده است"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"تنظیمات"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"افزودن چاپگرها"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"روشن"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"خاموش"</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>
@@ -1268,14 +1393,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>
+    <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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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_data_send" msgid="3875198715268918671">"داده‌های ارسالی تلفن همراه"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"داده‌های دریافتی تلفن همراه"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"‫داده‌های ارسالی Wi-Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"‫داده‌های دریافتی Wi-Fi"</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>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <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="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>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"زیر و بمی صدا"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"بر صدای متن گفته شده تأثیر می‌گذارد"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"زبان"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"زبان انتخاب نشده است"</string>
     <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>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"روشنایی <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"خودکار"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"کامل"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"نیمه"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"غیرفعال"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"ذخیره اطلاعات کاربری"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"نصب از حافظه"</string>
@@ -1390,6 +1534,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>
@@ -1406,19 +1553,16 @@
     <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">"تهیه نسخهٔ پشتیبان و بازیابی"</string>
-    <string name="privacy_settings_title" msgid="4856282165773594890">"تهیه نسخهٔ پشتیبان و بازیابی"</string>
-    <string name="backup_section_title" msgid="7952232291452882740">"تهیه نسخهٔ پشتیبان و بازیابی"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"تهیهٔ نسخهٔ پشتیبان و بازیابی"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"تهیهٔ نسخهٔ پشتیبان و بازیابی"</string>
+    <string name="backup_section_title" msgid="7952232291452882740">"تهیهٔ نسخهٔ پشتیبان و بازیابی"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"اطلاعات شخصی"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"تهیهٔ نسخهٔ پشتیبان از داده‌های شما"</string>
-    <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"هنگام نصب مجدد برنامه، تنظیمات و داده‌های نسخهٔ پشتیبان بازیابی شود"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"گرفتن گزارش مشکل"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"اطلاعات مربوط به وضعیت دستگاه کنونی شما را جمع‌آوری می‌کند تا به صورت یک پیام ایمیل ارسال شود. از زمان شروع گزارش اشکال تا آماده شدن برای ارسال اندکی زمان می‌برد؛ لطفاً صبور باشید."</string>
-    <string name="report" msgid="302437572240018342">"گزارش"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"گذرواژه نسخهٔ پشتیبان دسک‌تاپ"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"نسخه‌های پشتیبان کامل دسک‌تاپ در حال حاضر محافظت نمی‌شوند"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"برای تغییر یا حذف گذرواژه برای نسخه‌های پشتیبان کامل دسک‌تاپ لمس کنید"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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>
@@ -1483,23 +1627,23 @@
     <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_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">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"تقویم"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"مخاطبین"</string>
     <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"به Google Sync خوش آمدید!"</font>\n"این راهکاری از Google است برای همگام‌سازی داده‌ها و ایجاد امکان دسترسی به مخاطبین، قرارها و موارد بیشتر از هر کجا که هستید."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"تنظیمات همگام‌سازی برنامه"</string>
-    <string name="header_data_and_synchronization" msgid="5165024023936509896">"داده و همگام سازی"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">"داده و همگام‌سازی"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"تغییر رمز ورود"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"تنظیمات حساب"</string>
     <string name="remove_account_label" msgid="5921986026504804119">"حذف حساب"</string>
@@ -1508,8 +1652,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"حساب حذف شود؟"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"با حذف این حساب تمام پیام‌ها، مخاطبین و دیگر داده‌هااز رایانهٔ لوحی نیز حذف می‌شوند!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"با حذف این حساب تمام پیام‌ها، مخاطبین و دیگر داده‌ها از گوشی حذف می‌شوند."</string>
-    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"برخی از برنامه‌ها به این حساب نیاز دارند. فقط با بازنشانی رایانهٔ لوحی به تنظیمات کارخانه (با این کار همه داده‌های شخصی شما حذف می‌شود) در تنظیمات &gt; تهیه نسخهٔ پشتیبان و بازنشانی می‌‌توانید آنرا حذف کنید."</string>
-    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"برخی از برنامه‌ها به این حساب نیاز دارند. فقط با بازنشانی گوشی به تنظیمات کارخانه (که همه داده‌های شخصی شما را حذف می‌کند) در تنظیمات &gt; تهیه نسخهٔ پشتیبان و بازنشانی می‌توانید آنرا حذف کنید."</string>
+    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"برخی از برنامه‌ها به این حساب نیاز دارند. فقط با بازنشانی رایانهٔ لوحی به تنظیمات کارخانه (با این کار همه داده‌های شخصی شما حذف می‌شود) در تنظیمات &gt; تهیهٔ نسخهٔ پشتیبان و بازنشانی می‌‌توانید آنرا حذف کنید."</string>
+    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"برخی از برنامه‌ها به این حساب نیاز دارند. فقط با بازنشانی گوشی به تنظیمات کارخانه (که همه داده‌های شخصی شما را حذف می‌کند) در تنظیمات &gt; تهیهٔ نسخهٔ پشتیبان و بازنشانی می‌توانید آنرا حذف کنید."</string>
     <string name="provider_label" msgid="7724593781904508866">"اشتراک در پیام‌های سرویس"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"هنگام به‌روزرسانی سطوح پنجره همه فلش شوند"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"نمایش به روزرسانی‌های نمای GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"هنگام طراحی با GPU٬ نماها در داخل پنجره‌ها فلش شوند"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"نمایش به‌روزرسانی‌های لایه‌های سخت‌افزار"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"وقتی لایه‌های سخت‌افزاری به‌روزرسانی‌ می‌شوند، به رنگ سبز درآیند"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"اشکال‌زدایی بازنویسی GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"نمایش میزان استفاده از CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"همپوشانی صفحهٔ نمایش میزان استفاده از CPU فعلی"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"اجبار به تفسیر و اجرای GPU"</string>
     <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>
+    <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>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"از بین بردن هر فعالیت به محض خروج کاربر از آن"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <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" msgid="1466689968707308512">"این ویژگی سبب می‌شود زمانی که فقط شبکه‌های تلفن همراه در دسترس هستند، عملکرد برنامه‌ای که به داده پس‌زمینه وابسته است متوقف شود. "\n\n"در تنظیمات موجود در برنامه می‌توانید کنترل‌های مناسب‌تری را برای استفاده داده بدست بیاورید."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"این ویژگی سبب می‌شود زمانی که فقط شبکه‌های تلفن همراه در دسترس هستند، عملکرد برنامه‌ای که به داده پس‌زمینه وابسته است متوقف شود. \n\nدر تنظیمات موجود در برنامه می‌توانید کنترل‌های مناسب‌تری را برای استفاده داده به‌دست بیاورید."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="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>
@@ -1620,22 +1769,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" 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_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>
@@ -1650,7 +1802,7 @@
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"گواهی سرور IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"نمایش گزینه‌های پیشرفته"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"دامنه‌های جستجوی DNS"</string>
-    <string name="vpn_dns_servers" msgid="5570715561245741829">"سرور DNS (به عنوان مثال 8.8.8.8)"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"سرور DNS (به‌عنوان مثال 8.8.8.8)"</string>
     <string name="vpn_routes" msgid="3818655448226312232">"مسیرهای هدایت (مانند 10.0.0.0/8)"</string>
     <string name="vpn_username" msgid="1863901629860867849">"نام کاربری"</string>
     <string name="vpn_password" msgid="6756043647233596772">"رمز ورود"</string>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"افزودن نمایه VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"ویرایش نمایه"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"حذف نمایه"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN همیشه فعال"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"یک نمایه VPN را برای اتصال دائم انتخاب نمایید. فقط در صورتیکه به این VPN متصل باشید ترافیک شبکه مجاز خواهد بود."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"هیچکدام"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPN همیشه فعال به یک آدرس IP برای سرور و DNS نیاز دارد."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"اتصال شبکه موجود نیست. لطفاً دوباره امتحان کنید."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"یک گواهی‌نامه موجود نیست. لطفاً نمایه را ویرایش کنید."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"سیستم"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"لغو"</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">"به‌روزرسانی‌های دیگر سیستم"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"کاربران و محدودیت‌ها"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"کاربران"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"افزودن کاربر"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"ویرایش جزئیات"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"اطلاعات کاربر"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"نام"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"محدودیت‌های محتوا"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"پین لازم است"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"رتبه‌بندی محتوا"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"برنامه‌های سیستمی"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"برنامه‌های نصب شده"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"رد کردن"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"حذف کاربر"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"بچه مزاحم"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"غیرفعال"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"مجاز"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"در حال اعمال"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"کاربران"</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="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_confirm_remove_message" msgid="5284111415714437285">"آیا مطمئن هستید که می‌خواهید کاربر و تمام داده‌های مربوطه را از دستگاه حذف کنید؟"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"تغییر اندازه قلم"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"محدودیت‌ها"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"حذف محدودیت‌ها"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"تغییر پین"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"نمایش اعلان‌ها"</string>
     <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="user_restrictions_title" msgid="7745810037152772035">"محدودیت‌های محتوا و برنامه"</string>
+    <string name="user_rename" msgid="8523499513614655279">"تغییر نام"</string>
+    <string name="app_restrictions_custom_label" msgid="6160672982086584261">"تنظیم محدودیت‌های برنامه"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"کنترل شده توسط <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"این برنامه در نمایه‌های محدود پشتیبانی نمی‌شود"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"این برنامه می‌تواند به حساب‌های شما دسترسی یابد"</string>
+    <string name="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 fb8efd9..1511b42 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,16 +218,127 @@
     <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="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"mediapainikkeet"</item>
+    <item msgid="4547883971364273343">"äänen painopiste"</item>
+    <item msgid="2603878814882344450">"pää-äänenvoimakkuus"</item>
+    <item msgid="7136963238377062018">"puheäänen voimakkuus"</item>
+    <item msgid="4270236897655923007">"soittoäänen voimakkuus"</item>
+    <item msgid="6325739889222559394">"median äänenvoimakkuus"</item>
+    <item msgid="5762123934816216821">"hälytyksen äänenvoimakkuus"</item>
+    <item msgid="785049718065337473">"ilmoituksen äänenvoimakkuus"</item>
+    <item msgid="6700305533746877052">"bluetooth-äänenvoimakkuus"</item>
+    <item msgid="2029227495214047094">"ei virransäästötilaa"</item>
+    <item msgid="26109888160231211">"sijainnin seuranta"</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>
+    <item msgid="5753789168376302997">"Mediapainikkeet"</item>
+    <item msgid="3265262911688671938">"Äänen painopiste"</item>
+    <item msgid="2098976479485046797">"Pää-äänenvoimakkuus"</item>
+    <item msgid="5660213838861789350">"Puheäänen voimakkuus"</item>
+    <item msgid="7983336752371254444">"Soittoäänen voimakkuus"</item>
+    <item msgid="7878027809189330917">"Median äänenvoimakkuus"</item>
+    <item msgid="7260546305036218513">"Hälytyksen voimakkuus"</item>
+    <item msgid="9103719301075748925">"Ilmoituksen äänenvoimakkuus"</item>
+    <item msgid="7025966722295861512">"Bluetooth-äänenvoimakkuus"</item>
+    <item msgid="4665183401128289653">"Ei virransäästötilaa"</item>
+    <item msgid="8584357129746649222">"Sijainti"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Lyhyt"</item>
     <item msgid="2560532955514699713">"Keskipitkä"</item>
     <item msgid="2372711992605524591">"Pitkä"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (virheenkorjaus)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Käytä Dalvik-ympäristöä"</item>
+    <item msgid="5131846588686178907">"Käytä ART-ympäristöä"</item>
+    <item msgid="4530003713865319928">"Käytä ART-virheenkorjauskoontiversiota"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Älä tarkista koskaan"</item>
     <item msgid="6042769699089883931">"Tarkista vain DRM-suojattu sisältö"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Animaation mittakaava 5-kertainen"</item>
     <item msgid="1069584980746680398">"Animaation mittakaava 10-kertainen"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Ei mitään"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi ja 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Ei mitään"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Ei käytössä"</item>
+    <item msgid="7688197031296835369">"Näytä päällekkäiset alueet"</item>
+    <item msgid="8332661909019981149">"Näytä päällekkäisyyslaskuri"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Vakioraja"</item>
     <item msgid="4071574792028999443">"Ei taustaprosesseja"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Aikaraja"</item>
     <item msgid="7664124146786465092">"Epäonnistui"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Kysy"</item>
+    <item msgid="5077768429488260031">"Älä salli koskaan"</item>
+    <item msgid="1417929597727989746">"Salli aina"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index bcd9b48..764f316 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Kyllä"</string>
     <string name="no" msgid="6731231425810196216">"Ei"</string>
     <string name="create" msgid="3578857613172647409">"Luo"</string>
+    <string name="allow" msgid="3349662621170855910">"Salli"</string>
+    <string name="deny" msgid="6947806159746484865">"Hylkää"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Tuntematon"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Kehittäjäasetukset otetaan käyttöön <xliff:g id="STEP_COUNT">%1$d</xliff:g> vaiheen päästä."</item>
+    <item quantity="other" msgid="6722953419953594148">"Kehittäjäasetukset otetaan käyttöön <xliff:g id="STEP_COUNT">%1$d</xliff:g> vaiheen päästä."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Olet nyt kehittäjä!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Ei tarvitse klikata, olet jo kehittäjä."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"LANGATTOMAT YHTEYDET JA VERKOT"</string>
     <string name="header_category_device" msgid="5781174212691167553">"LAITE"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"HENKILÖKOHTAINEN"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Ladataan"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Tyhjennetään akkua"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(langaton)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Ei laturissa"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ei laturissa"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Täynnä"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Irrotettu laturista"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"langaton"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Tuntematon"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Tuntematon"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Tuntematon virhe"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Kylmää"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Tunnistettavissa"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Näkyy kaikille lähistöllä oleville Bluetooth-laitteille (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Näkyy kaikille lähistöllä oleville Bluetooth-laitteille"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ei näy muille Bluetooth-laitteille"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Näkyy vain laitepareille"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Aseta laite tunnistettavaksi"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Näkyvyyden aikakatkaisu"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Määritä, kuinka kauan laite on tunnistettavissa"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lukitse äänipuhelut"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Estä Bluetooth-puhelut kun näyttö on lukittu"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-laitteet"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Näytä vastaanotetut tiedostot"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth-laitevalitsin"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-yhteyspyyntö"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Sovellus haluaa ottaa Bluetoothin käyttöön. Sallitaanko?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Tablet-laitteesi sovellus haluaa asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi. Sallitaanko?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Puhelimesi sovellus haluaa asettaa puhelimen muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi. Sallitaanko?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Tablet-laitteesi sovellus haluaa asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi. Sallitaanko?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Puhelimesi sovellus haluaa asettaa puhelimen muiden Bluetooth-laitteiden tunnistettavaksi. Sallitaanko?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Tablet-laitteesi sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi. Sallitaanko?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Puhelimesi sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa puhelimen muiden laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi. Sallitaanko?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Tablet-laitteesi sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa tablet-laitteesi muiden Bluetooth-laitteiden tunnistettavaksi. Sallitaanko?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Puhelimesi sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa puhelimen muiden laitteiden tunnistettavaksi. Sallitaanko?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Sovellus haluaa ottaa Bluetoothin käyttöön."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Sovellus haluaa asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Sovellus haluaa asettaa puhelimen muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Sovellus haluaa asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi. Voit muuttaa valintaa myöhemmin Bluetooth-asetuksista."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Sovellus haluaa asettaa puhelimen muiden Bluetooth-laitteiden tunnistettavaksi. Voit muuttaa valintaa myöhemmin Bluetooth-asetuksista."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa tablet-laitteen muiden Bluetooth-laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa puhelimen muiden laitteiden tunnistettavaksi <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunnin ajaksi."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa tablet-laitteen muiden laitteiden tunnistettavaksi. Voit muuttaa valintaa myöhemmin Bluetooth-asetuksista."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Sovellus haluaa ottaa Bluetooth-yhteyden käyttöön ja asettaa puhelimen muiden laitteiden tunnistettavaksi. Voit muuttaa valintaa myöhemmin Bluetooth-asetuksista."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth otetaan käyttöön…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth poistetaan käytöstä..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Yhdistä automaattisesti"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Selain saa käyttää HTTP-välityspalvelinta mutta muut sovellukset eivät."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Sijainti:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naapuri-CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tiedonsiirtoyrityksiä:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-palvelu:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Verkkoyhteys katkesi, koska poistuit kotiverkkosi alueelta eikä roaming-tilaa ole otettu käyttöön."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Ota käyttöön"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Jos sallit verkkoyhteyden roaming-tilassa, roaming-maksut saattavat kasvaa suuriksi!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Jos sallit tiedonsiirron roaming-tilassa, sinulle voi koitua suuria roaming-maksuja.\n\nTämä asetus vaikuttaa kaikkiin tämän tablet-laitteen käyttäjiin."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Jos sallit tiedonsiirron roaming-tilassa, sinulle voi koitua suuria roaming-maksuja.\n\nTämä asetus vaikuttaa kaikkiin tämän puhelimen käyttäjiin."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Sallitaanko tiedonsiirto roaming-tilassa?"</string>
     <string name="networks" msgid="6333316876545927039">"Operaattorin valinta"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Valitse verkko-operaattori"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Omistajan tiedot"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Vaatii PIN-koodin tai salasanan, jonka avulla tablet-laitteesi salaus puretaan aina kytkiessäsi sen virran päälle"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Vaatii PIN-koodin tai salasanan, jonka avulla puhelimesi salaus puretaan aina kytkiessäsi sen virran päälle"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Salattu"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Voit salata tilisi, asetuksesi, lataamasi sovellukset ja niiden tiedot sekä media- ja muut tiedostot. Kun tablet-laitteesi on salattu, sinun tulee antaa PIN-koodi tai salasana poistaaksesi salauksen aina kytkiessäsi laitteen virran päälle. Voit poistaa tablet-laitteesi salauksen vain palauttamalla siihen tehdasasetukset, jolloin kaikki tietosi poistetaan."\n\n"Salaus kestää vähintään tunnin. Se tulee aloittaa täydellä akulla, ja tablet-laitteen tulee olla kytkettynä laturiin koko salauksen ajan. Jos keskeytät salauksen, menetät laitteesi tietoja."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Voit salata tilisi, asetuksesi, lataamasi sovellukset ja niiden tiedot sekä media- ja muut tiedostot. Kun puhelimesi on salattu, sinun tulee antaa PIN-koodi tai salasana poistaaksesi salauksen aina kytkiessäsi laitteen virran päälle. Voit poistaa puhelimesi salauksen vain palauttamalla siihen tehdasasetukset, jolloin kaikki tietosi poistetaan."\n\n"Salaus kestää vähintään tunnin. Se tulee aloittaa täydellä akulla, ja puhelimen tulee olla kytkettynä laturiin koko salauksen ajan. Jos keskeytät salauksen, menetät laitteesi tietoja."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Voit salata tilisi, asetuksesi, lataamasi sovellukset ja niiden tiedot sekä media- ja muut tiedostot. Kun tablet-laitteesi on salattu, sinun tulee antaa PIN-koodi tai salasana poistaaksesi salauksen aina kytkiessäsi laitteen virran päälle. Voit poistaa tablet-laitteesi salauksen vain palauttamalla siihen tehdasasetukset, jolloin kaikki tietosi poistetaan.\n\nSalaus kestää vähintään tunnin. Se tulee aloittaa täydellä akulla, ja tablet-laitteen tulee olla kytkettynä laturiin koko salauksen ajan. Jos keskeytät salauksen, menetät laitteesi tietoja."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Voit salata tilisi, asetuksesi, lataamasi sovellukset ja niiden tiedot sekä media- ja muut tiedostot. Kun puhelimesi on salattu, sinun tulee antaa PIN-koodi tai salasana poistaaksesi salauksen aina kytkiessäsi laitteen virran päälle. Voit poistaa puhelimesi salauksen vain palauttamalla siihen tehdasasetukset, jolloin kaikki tietosi poistetaan.\n\nSalaus kestää vähintään tunnin. Se tulee aloittaa täydellä akulla, ja puhelimen tulee olla kytkettynä laturiin koko salauksen ajan. Jos keskeytät salauksen, menetät laitteesi tietoja."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Salaa tablet-laite"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Salaa puhelin"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Lataa akku ja yritä uudelleen."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Yritä uudelleen <xliff:g id="DELAY">^1</xliff:g> sekunnin kuluttua."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Kirjoita salasana"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Salaus epäonnistui"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Salaus keskeytyi, eikä sitä voi suorittaa loppuun. Tästä johtuen tablet-laitteesi tietoja ei voi enää käyttää. "\n\n"Voit jatkaa tablet-laitteesi käyttöä, kun palautat tehdasasetukset. Kun olet määrittänyt tablet-laitteesi asetukset tehdasasetusten palautuksen jälkeen, voit palauttaa tiedot, jotka olet varmuuskopioinut Google-tiliisi."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Salaus keskeytyi, eikä sitä voi suorittaa loppuun. Tästä johtuen puhelimesi tietoja ei voi enää käyttää. "\n\n"Voit jatkaa puhelimesi käyttöä, kun palautat tehdasasetukset. Kun olet määrittänyt puhelimesi asetukset tehdasasetusten palautuksen jälkeen, voit palauttaa tiedot, jotka olet varmuuskopioinut Google-tiliisi."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Salaus keskeytyi, eikä sitä voi suorittaa loppuun. Tästä johtuen tablet-laitteesi tietoja ei voi enää käyttää. \n\nVoit jatkaa tablet-laitteesi käyttöä, kun palautat tehdasasetukset. Kun olet määrittänyt tablet-laitteesi asetukset tehdasasetusten palautuksen jälkeen, voit palauttaa tiedot, jotka olet varmuuskopioinut Google-tiliisi."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Salaus keskeytyi, eikä sitä voi suorittaa loppuun. Tästä johtuen puhelimesi tietoja ei voi enää käyttää. \n\nVoit jatkaa puhelimesi käyttöä, kun palautat tehdasasetukset. Kun olet määrittänyt puhelimesi asetukset tehdasasetusten palautuksen jälkeen, voit palauttaa tiedot, jotka olet varmuuskopioinut Google-tiliisi."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Vaihda syöttötapaa"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Valitse ruudunlukitus"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Valitse varalukko"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Muuta lukituksen poistoon tarvittava PIN-koodi"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Vaihda lukituksen poiston salasana"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Salasanan täytyy olla vähintään %d merkkiä"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koodin täytyy olla vähintään %d merkin pituinen"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-koodin täytyy olla vähintään %d merkin pituinen"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Kosketa Jatka kun olet valmis"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Jatka"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Salasanan on oltava lyhyempi kuin <xliff:g id="NUMBER">%d</xliff:g> merkkiä."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kaiuttimena"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Musiikille ja medialle"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Muista asetukset"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Laiteparinäytöt"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Käytettävissä olevat laitteet"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Yhdistetään"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Yhdistetty"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Käytettävissä"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Käytössä"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Näyttöasetukset"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Katkaistaanko yhteys?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Katkaisee yhteyden laitteeseen:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Langattomien näyttöjen asetukset"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Unohda"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Valmis"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Nimi"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Käytössä"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Ei käytössä"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Ei käytössä"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Salli tiedonsiirto, kun tablet-laite koskettaa toista laitetta"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Salli tiedonsiirto, kun puhelin koskettaa toista laitetta"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Pois käytöstä"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Ei käytettävissä, koska NFC on poistettu käytöstä"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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\nAseta 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="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="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="8116564886303972764">"Näppäile pin-koodi <xliff:g id="NUMBER">%1$s</xliff:g> wifi-reitittimeen. 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_in_progress" msgid="2944576520214787628">"WPS on jo käynnissä ja sen suorittaminen voi kestää kaksi minuuttia."</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Langattoman reitittimen suojausasetusta (TKIP) ei tueta."</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Todennusvirhe. Yritä myöhemmin uudelleen."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Havaittiin toinen WPS-käyttökerta. Yritä uudelleen muutaman minuutin kuluttua."</string>
     <string name="wifi_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>
@@ -564,6 +621,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\nAnnetaanko 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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Tallenna"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Verkon tallentaminen epäonnistui."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Peruuta"</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_skip_anyway" msgid="6965361454438011190">"Ohita kuitenkin"</string>
+    <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\nTablet-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\nPuhelimen asetusten määrittäminen voi vaatia paljon tiedonsiirtoa."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Haetaan..."</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Nimeä laite uudelleen"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Vertaislaitteet"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Muistissa olevat ryhmät"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Ei yhteyttä"</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Laitteen nimeäminen uudelleen epäonnistui."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Katkaistaanko yhteys?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Jos kosketat Katkaise yhteys, yhteys laitteeseen <xliff:g id="PEER_NAME">%1$s</xliff:g> ja <xliff:g id="PEER_COUNT">%2$s</xliff:g> muuhun laitteeseen katkaistaan."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Kannettava wifi-yhteyspiste"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Unohdetaanko tämä ryhmä?"</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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Musiikkitehosteet"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Soittoäänen voimakkuus"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Käytä värinää äänettömässä tilassa"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Oletusilmoitus"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Ilmoituksen oletusääni"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Vilkuta ilmoitusvaloa"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Soittoääni"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Ilmoitus"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Käytä ilmoituksille puhelun äänenvoimakkuutta"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Valitse soittoääni ilmoituksille"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Ilmoituksen oletusääni"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Media"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Aseta musiikin ja videoiden äänenvoimakkuus"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Hälytys"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Kun laite on ollut käyttämättä <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Taustakuva"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Valitse taustakuva"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Screen Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Käynnistyy virransäästötilassa, jos virta on päällä"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Ei käytössä"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Candy valittu"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Käyttöönottoaika"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Kun laite on ollut käyttämättä <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Ei koskaan"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Kokeile!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Käynnistä myös telakoituna"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Unelmat"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Telakoituna tai virransäästötilassa ja ladattaessa"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Kumpi vain"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Latauksen aikana"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Telakoituna"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Pois käytöstä"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Jos haluat hallita puhelimen toimintaa telakoituna ja/tai lepotilassa, ota Unelmat käyttöön."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Milloin unelmoidaan"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Aloita nyt"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Asetukset"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaattinen kirkkaus"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Kirjasimen koko"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Kirjasinkoko"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM-kortin PIN-koodi"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Väärä PIN-koodi"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN-koodit eivät täsmää"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"PIN-koodin vaihtaminen epäonnistui."\n"Saatoit antaa väärän PIN-koodin."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"PIN-koodin vaihtaminen epäonnistui.\nSaatoit antaa väärän PIN-koodin."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-kortin PIN-koodin vaihtaminen onnistui"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM-kortin lukitustilan muuttaminen epäonnistui."\n"PIN-koodi on mahdollisesti virheellinen."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM-kortin lukitustilan muuttaminen epäonnistui.\nPIN-koodi on mahdollisesti virheellinen."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Peruuta"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tablet-laitteen tila"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Baseband-versio"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel-versio"</string>
     <string name="build_number" msgid="3075795840572241758">"Ohjelmistoversion numero"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux-tila"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Ei käytettävissä"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Tila"</string>
     <string name="device_status" msgid="607405385799807324">"Tila"</string>
@@ -733,12 +807,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">"Mobiiliverkon tyyppi"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Operaattorin tiedot"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Mobiiliverkon tila"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Palvelun tila"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-tallennustila"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kortti"</string>
     <string name="memory_available" msgid="5052397223077021181">"Käytettävissä"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Saatavilla (vain luku)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Tallennustilaa yhteensä"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Lasketaan…"</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Sovellukset (sovellusten tiedot ja mediasisältö)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Kuvat, videot"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Ääni (musiikki, soittoäänet, podcastit jne.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Muut"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Välimuistitiedot"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Poista jaettu tila käyt."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Poista SD-kortti käytöstä"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Poista sis. USB-tila käytöstä"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Tyhjennä SD-kortti"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Poistaa kaikki sisäisen USB-tallennustilan tiedot, kuten musiikin tai valokuvat."</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Poistaa kaikki SD-kortin tiedot, kuten musiikin ja valokuvat"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Vain luku)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Tyhjennetäänkö välimuistitiedot?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Kaikkien sovell. välimuistitiedot tyhjennetään."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP- tai PTP-toiminto on käytössä"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Poista USB-tila käytöstä?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Poistetaanko SD-kortti käytöstä?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Jos poistat USB-tallennustilan käytöstä, osaa käyttämistäsi sovelluksista ei voi käyttää, ennen kuin otat USB-tilan uudelleen käyttöön."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Voit käyttää kameraohjelmistoa kuvien siirtämiseen ja siirtää tiedostoja tietokoneilta, jotka eivät tue MTP:tä"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Asenna tiedostonsiirtotyökalut"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Muut käyttäjät"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Akun tila"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akun taso"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN:t"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Tehdasasetuksien palauttaminen"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Poistaa kaikki tablet-laitteen tiedot"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Poistaa kaikki puhelimen tiedot"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tämä poistaa kaikki tablet-laitteesi "<b>"sisäisen tallennustilan"</b>" tiedot, kuten:"\n\n<li>"Google-tilisi"</li>\n<li>"Järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"Ladatut sovellukset"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tämä poistaa kaikki puhelimesi "<b>"sisäisen tallennustilan"</b>" tiedot, kuten:"\n\n<li>"Google-tilisi"</li>\n<li>"Järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"Ladatut sovellukset"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olet kirjautunut sisään seuraaviin tileihin:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tämä poistaa kaikki tablet-laitteesi "<b>"sisäisen tallennustilan"</b>" tiedot, kuten:\n\n"<li>"Google-tilisi"</li>\n<li>"Järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"Ladatut sovellukset"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tämä poistaa kaikki puhelimesi "<b>"sisäisen tallennustilan"</b>" tiedot, kuten:\n\n"<li>"Google-tilisi"</li>\n<li>"Järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"Ladatut sovellukset"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olet kirjautunut sisään seuraaviin tileihin:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiikki"</li>\n<li>"Valokuvat"</li>\n<li>"Muut käyttäjän tiedot"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Jos haluat poistaa musiikin, kuvat ja muut käyttäjän tiedot, "<b>"USB-tallennustila"</b>" tulee tyhjentää."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Jos haluat poistaa musiikin, kuvat ja muut käyttäjän tiedot, "<b>"SD-kortti"</b>" tulee tyhjentää."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Jaettu internetyhteys katkaistaan laitteesta <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ohje"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiiliverkot"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Hallitse mobiilisopimusta"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Tuntematon SIM-kortin operaattori"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Ei tunnettua käyttäjien hallintasivustoa: %1$s"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Aseta SIM-kortti ja käynnistä uudelleen"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Muodosta yhteys internetiin"</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>
@@ -910,13 +997,14 @@
     <string name="use_location_title" msgid="5206937465504979977">"Sijainti ja Google-haku"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Anna Googlen käyttää sijaintia hakutulosten ja muiden palveluiden parantamiseen."</string>
     <string name="location_access_title" msgid="7064108942964081243">"Sijaintitietojen käyttö"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Anna lupaa pyytäneille sovelluksille lupa käyttää sijaintitietoja"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Anna pyytäneille sovelluksille lupa käyttää sijaintitietoja"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Sijainnin lähteet"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Tietoja tablet-laitteesta"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Tietoja puhelimesta"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Näytä lakitiedot, tila, ohjelmiston versio"</string>
     <string name="legal_information" msgid="5769301644270604095">"Oikeudelliset tiedot"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Avustajat"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Lakitiedot"</string>
     <string name="copyright_title" msgid="865906688917260647">"Tekijänoikeudet"</string>
     <string name="license_title" msgid="1990487604356037871">"Käyttölupa"</string>
     <string name="terms_title" msgid="7697580845616764642">"Käyttöehdot"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Muuta lukituksen poistoon tarvittava PIN-koodi"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Vahvista tallennettu kuvio"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Yritä uudelleen:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Piirrä lukituksenpoistokuvio"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Piirrä lukituksenpoistokuvio:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Saat ohjeita painamalla Valikko-painiketta."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Nosta sormi, kun olet valmis."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Yhdistä vähintään <xliff:g id="NUMBER">%d</xliff:g> pistettä. Yritä uudelleen:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Lukituksenpoistokuvion piirtäminen"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Liikaa virheellisiä yrityksiä!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Yritä uudelleen <xliff:g id="NUMBER">%d</xliff:g> sekunnin kuluttua."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Peruuta"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Seuraava"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Tablet-laitteen suojaaminen"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Puhelimen suojaaminen"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Suojaa tablet-laitetta luvattomalta käytöltä luomalla henkilökohtainen ruudun lukituksenpoistokuvio. Yhdistä seuraavassa ruudussa olevat pisteet sormellasi haluamassasi järjestyksessä. Yhdistä vähintään neljä pistettä. "\n\n"Oletko valmis? Kosketa Seuraava."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Suojaa puhelintasi luvattomalta käytöltä luomalla henkilökohtainen näytön lukituksenpoistokuvio. Yhdistä seuraavassa ruudussa olevat pisteet (vähintään neljä) sormellasi haluamassasi järjestyksessä."\n\n"Oletko valmis? Kosketa Seuraava."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Sovellusta ei ole asennettu puhelimeesi."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Hallinnoi sovelluksia"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Hallinnoi ja poista asennettuja sovelluksia"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Sovellukset"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Salli tuntemattomista lähteistä tulevien sovelluksien asentaminen"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tablet-laite ja henkilötiedot ovat alttiimpia tuntemattomista lähteistä tulevien sovelluksien kautta tapahtuville hyökkäyksille. Hyväksyt, että olet itse vastuussa mahdollisista tablet-laitteelle aiheutuvista vahingoista tai tietojen menetyksestä, joka voi johtua näiden sovelluksien käytöstä."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Puhelimesi ja henkilötiedot ovat alttiimpia tuntemattomista lähteistä tulevien sovelluksien kautta tapahtuville hyökkäyksille. Hyväksyt, että olet itse vastuussa mahdollisista puhelimelle aiheutuvista vahingoista tai tietojen menetyksestä, joka voi johtua näiden sovelluksien käytöstä."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Vahvista sovellukset"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Estä mahdollisesti haitallisten sovellusten asennus tai näytä varoitus ennen asennusta"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Lisäasetukset"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Ota lisää asetuksia käyttöön."</string>
     <string name="application_info_label" msgid="5736524913065714880">"Sovelluksen tiedot"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-tallennustilan tiedot"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kortti"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Poista"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Poista kaikilta käyttäjiltä"</string>
+    <string name="install_text" msgid="884360662922471113">"Asenna"</string>
     <string name="disable_text" msgid="6544054052049395202">"Poista käytöstä"</string>
     <string name="enable_text" msgid="9217362512327828987">"Ota käyttöön"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Tyhjennä tiedot"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Näytä välimuistiprosessit"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Nollaa sovellusasetukset"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Nollaa sovellusasetukset?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Tämä nollaa kaikki seuraavat asetukset:"\n\n" "<li>"Käytöstä poistetut sovellukset"</li>\n" "<li>"Käytöstä poistetut sovellusilmoitukset"</li>\n" "<li>"Toimintojen oletussovellukset"</li>\n" "<li>"Taustasovellusten tietojenkäyttörajoitukset"</li>\n\n" Et menetä mitään sovellusten tietoja."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Tämä nollaa kaikki seuraavat asetukset:\n\n "<li>"Käytöstä poistetut sovellukset"</li>\n" "<li>"Käytöstä poistetut sovellusilmoitukset"</li>\n" "<li>"Toimintojen oletussovellukset"</li>\n" "<li>"Taustasovellusten tietojenkäyttörajoitukset"</li>\n\n" Et menetä mitään sovellusten tietoja."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Nollaa sovellukset"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Hallinnoi tallennustilaa"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD-kortilla"</string>
     <string name="disabled" msgid="9206776641295849915">"Pois käytöstä"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Ei asennettu"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ei sovelluksia."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Sisäinen tallennustila"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-tila"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> ja <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Tämä sovellus voi veloittaa rahaa:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Lähetä maksullinen tekstiviesti"</string>
     <string name="computing_size" msgid="1599186977475211186">"Lasketaan..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Paketin koon laskeminen epäonnistui."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Et ole asentanut yhtään kolmannen osapuolen sovellusta."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Vaihda uusien sovelluksien ensisijaista asennussijaintia."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Poista sis. sovellus käytöstä?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Jos poistat sisäänrakennetun sovelluksen käytöstä, muut sovellukset voivat toimia virheellisesti."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Poistetaanko tiedot ja poistetaanko sovellus käytöstä?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Käyttäjä: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Poistettu käyttäjä"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> prosessi ja <xliff:g id="NUMSERVICES">%2$d</xliff:g> palvelu"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> prosessi ja <xliff:g id="NUMSERVICES">%2$d</xliff:g> palvelua"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> prosessia ja <xliff:g id="NUMSERVICES">%2$d</xliff:g> palvelu"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Fyysisen näppäimistön asetukset"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Lisää \".\" painamalla välilyöntiä kahdesti"</string>
     <string name="show_password" msgid="3001113966880559611">"Näytä salasanat"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Tämä syöttötapa saattaa kerätä kaiken kirjoittamasi tekstin, mukaan luettuna henkilökohtaiset tiedot kuten salasanat ja luottokortin numerot. Se on lähtöisin sovelluksesta <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Käytetäänkö tätä syöttötapaa?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Tämä oikoluku voi ehkä kerätä kaiken kirjoittamasi tekstin, mukaan lukien henkilötiedot, kuten salasanat ja luottokorttien numerot. Se on lähtöisin sovelluksesta <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Käytetäänkö tätä oikolukua?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Asetukset"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Vaihda painamalla Ctrl+välilyönti"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Oletus"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Näppäimistöasettelut"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Käyttäjän sanakirja"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Oma sanakirja"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Omat sanakirjat"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Oma sanakirja"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Lisää"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Lisää sanakirjaan"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Näyttö ei sammu puhelimen latautuessa"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ota Bluetoothin HCI-tarkkailuloki käyttöön"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tallenna kaikki Bluetoothin HCl-paketit tiedostoon"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Valitse suoritusympäristö"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Valitse suoritusympäristö"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Käynnistetäänkö uudelleen niin, että suoritusympäristö on <xliff:g id="OLD">%1$s</xliff:g> eikä <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Salli sijaintien imitointi"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Salli sijaintien imitointi"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Tarkista ADB:n/ADT:n kautta asennetut sovellukset haitallisen toiminnan varalta."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Suojaa USB-tallennustila"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Sovellusten on pyydettävä lupa USB-tallennustilan lukemiseen"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Suojataanko USB-tallennustila?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Jos USB-tallennustila on suojattu, sovellusten on pyydettävä lupa ulkoisen tallennustilan käyttämiseen."\n\n"Jotkin sovellukset toimivat vasta, kun kehittäjät päivittävät ne."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Jos USB-tallennustila on suojattu, sovellusten on pyydettävä lupa ulkoisen tallennustilan käyttämiseen.\n\nJotkin sovellukset toimivat vasta, kun kehittäjät päivittävät ne."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Suojaa SD-kortti"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Sovellusten on pyydettävä lupa SD-kortin lukemiseen"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Suojataanko SD-kortti?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Jos SD-kortti on suojattu, sovellusten on pyydettävä lupa ulkoisen tallennustilan käyttämiseen."\n\n"Jotkin sovellukset toimivat vasta, kun kehittäjät päivittävät ne."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Jos SD-kortti on suojattu, sovellusten on pyydettävä lupa ulkoisen tallennustilan käyttämiseen.\n\nJotkin sovellukset toimivat vasta, kun kehittäjät päivittävät ne."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Paikallinen pääte"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Ota käyttöön päätesov. joka mahdollistaa paikall. liittymäkäytön"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Valitse gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Valitse widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Luo widget ja salli käyttö?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Esteettömyysasetukset"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Palvelut"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Järjestelmä"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Suuri teksti"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Virtapainike katkaisee puhelun"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Puhu salasanat"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Pitkän kosketuksen viive"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Paranna internetin esteettömyyttä"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Suurennuseleet"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kun tämä ominaisuus on käytössä, voit lähentää ja loitontaa kolmoisnapauttamalla ruutua.\n\nLähennetyssä tilassa voit\n"<ul><li>"panoroida vetämällä vähintään kahta sormea ruudun poikki"</li>\n<li>"säätää lähennyksen tasoa nipistämällä vähintään kaksi sormea yhteen tai levittämällä ne erilleen."</li></ul>\n\n"Voit myös suurentaa sormesi alla olevan kohteen väliaikaisesti kolmoisnapauttamalla ja pitämällä viimeisen napautuksen ruudulla. Suurennetussa tilassa voit tutkia ruudun eri osia sormella vetämällä. Nostamalla sormen pääset takaisin edelliseen tilaan.\n\nHuomaa: suurennus kolmoisnapauttamalla toimii kaikkialla paitsi näppäimistössä ja siirtymispalkissa."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Esteettömyystilan pikakuvake"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Käytössä"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Pois käytöstä"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kun tämä ominaisuus on käytössä, voit ottaa esteettömyystoiminnot käyttöön nopeasti kahden vaiheen kautta.\n\nVaihe 1: paina virtapainiketta, kunnes kuulet äänen tai tunnet värinän.\n\nVaihe 2: kosketa kahdella sormella, kunnes kuulet äänivahvistuksen.\n\nJos laitteella on useita käyttäjiä, tämän pikanäppäimen käyttö lukitusruudussa ottaa esteettömyystilan käyttöön väliaikaisesti, kunnes laitteen lukitus poistetaan."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Suuri teksti"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Näytön suurennus"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Päivitä näytön suurennus automaatt."</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Päivitä näytön suurennus sovellussiirtymissä"</string>
+    <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_menu_item_settings" msgid="3344942964710773365">"Asetukset"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Käytössä"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Pois"</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="accessibility_feature_state_on" msgid="2864292320042673806">"Käytössä"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Pois käyt."</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="print_settings" msgid="4742428530112487843">"Tulostetaan"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Tulostusasetukset"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Palvelut"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Otetaanko palvelu <xliff:g id="SERVICE">%1$s</xliff:g> käyttöön?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> voi vastaanottaa tulostamiasi dokumentteja. Ne voivat sisältää arkaluonteisia tietoja."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Ei asennettuja palveluita"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Asetukset"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Lisää tulostimia"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Käytössä"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Ei käyt."</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Akku"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Mikä on käyttänyt akkua"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Akun käyttötietoja ei saatav."</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Tiedot vastaanotettu"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Lähetetty mobiilitiedonsiirto"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Vastaanotet. mobiilitiedonsiirto"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Lähetetty wifi-tiedonsiirto"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Vastaanotettu wifi-tiedonsiirto"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Ääni"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Käytössäoloaika"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Pysäytä tai poista sovellus"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Hallinnoi GPS:ää manuaalisesti estääksesi sovellusta käyttämästä sitä."</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Sovellus saattaa tarjota käyttöön asetuksia, joiden avulla akun käyttöä voidaan vähentää."</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Käyttäjien käyttämä akun virta"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> laturin irrottamisen jälkeen"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Laturin irrottamisen jälkeen (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Käyttö yhteensä"</string>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Äänenkorkeus"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Vaikuttaa puhutun tekstin äänenkorkeuteen"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Kieli"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Kieltä ei ole valittu"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Asettaa puhutulle tekstille kielikohtaisen äänen"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Kuuntele esimerkki"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Toista lyhyt esittely puhesynteesistä"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Kirkkaus <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"auto"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"kirkkain"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"puolittainen"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"himmein"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Käyttöoikeustietojen tallennus"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Asenna tallennustilasta"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Palauta varmuuskopioidut asetukset ja tiedot, kun sovellus asennetaan uudelleen."</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Luo virheraportti"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Toiminto kerää tietoja nykyisestä laitteen tilasta ja lähettää ne sähköpostitse. Kestää hetken aikaa, ennen kuin virheraportti on valmis lähetettäväksi, ole kärsivällinen."</string>
-    <string name="report" msgid="302437572240018342">"Luo raportti"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Varmuuskop. salasana"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Tietokoneen kaikkien tietojen varmuuskopiointia ei ole tällä hetkellä suojattu."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Muuta tai vaihda tietokoneen kaikkien tietojen varmuuskopioinnin salasana koskettamalla"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nMuodosta 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>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalenteri"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Yhteystiedot"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Tervetuloa käyttämään Google Sync -palvelua!"</font>" "\n"Se on Googlen tapa synkronoida tietoja, ja sen avulla voit käyttää yhteystietojasi, tapaamisiasi ynnä muita tietoja mistä tahansa."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Tervetuloa käyttämään Google Sync -palvelua!"</font>" \nSe on Googlen tapa synkronoida tietoja, ja sen avulla voit käyttää yhteystietojasi, tapaamisiasi ynnä muita tietoja mistä tahansa."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Sovelluksen synkronointiasetukset"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Tiedot ja synkronointi"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Vaihda salasana"</string>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Väläytä koko ikkunoiden pinnat päivitettäessä"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Näytä GPU:n näytön päiv."</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Väläytä ikkunoiden sisältö GPU:lla piirrettäessä"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Näytä laitt.tason päiv."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Näytä laitteistotasot vihreinä niiden päivittyessä"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"GPU-objektien päällekkäisyys"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Näytä suorittimen käyttö"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Näytön peittokuva näyttää nykyisen suoritinkäytön"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Pakota GPU-hahmonnus"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simuloi toissijaiset näytöt"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Sovellukset"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Älä säilytä toimintoja"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Tuhoa kaikki toiminnot, kun käyttäjä poistuu"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Ei taustatiedons. mobiiliverkossa. Käytä wifiä, jos mahdollista."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Aseta mobiilitiedonsiirtoraja sov. taustatiedonsiirron rajoittamiseksi"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Rajoitetaanko taustatiedonsiirtoa?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Toiminto saattaa estää taustatiedonsiirrosta riippuvaisten sovellusten toiminnan, jos käytettävissä on vain mobiiliverkkoja."\n\n"Voit säätää tiedonsiirron asetuksia tarkemmin sovelluksessa."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Toiminto saattaa estää taustatiedonsiirrosta riippuvaisten sovellusten toiminnan, jos käytettävissä on vain mobiiliverkkoja.\n\nVoit säätää tiedonsiirron asetuksia tarkemmin sovelluksessa."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Taustatiedonsiirron rajoittaminen on mahdollista vain, jos olet asettanut mobiilitiedonsiirtorajan."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Otetaanko aut. synkr. käyttöön?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Kaikki tileihisi verkossa tekemäsi muutokset kopioidaan tablet-laitteellesi automaattisesti."\n\n"Jotkut tilit voivat myös automaattisesti kopioida tablet-laitteella tehdyt muutokset verkkoon. Google-tili toimii tällä tavalla."\n\n"Valitse kunkin tilin synkronoitavat tiedot siirtymällä kohtaan Asetukset &gt; Tilit."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Kaikki tileihisi verkossa tekemäsi muutokset kopioidaan puhelimellesi automaattisesti."\n\n"Jotkut tilit voivat myös automaattisesti kopioida puhelimella tehdyt muutokset verkkoon. Google-tili toimii tällä tavalla."\n\n"Valitse kunkin tilin synkronoitavat tiedot siirtymällä kohtaan Asetukset &gt; Tilit."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Kaikki tileihisi verkossa tekemäsi muutokset kopioidaan tablet-laitteellesi automaattisesti.\n\nJotkut tilit voivat myös automaattisesti kopioida tablet-laitteella tehdyt muutokset verkkoon. Google-tili toimii tällä tavalla.\n\nValitse kunkin tilin synkronoitavat tiedot siirtymällä kohtaan Asetukset &gt; Tilit."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Kaikki tileihisi verkossa tekemäsi muutokset kopioidaan puhelimellesi automaattisesti.\n\nJotkut tilit voivat myös automaattisesti kopioida puhelimella tehdyt muutokset verkkoon. Google-tili toimii tällä tavalla.\n\nValitse kunkin tilin synkronoitavat tiedot siirtymällä kohtaan Asetukset &gt; Tilit."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Poistetaanko automaatt. synkr.?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Tämä vähentää tiedonsiirtomäärää ja akun käyttöä, mutta jokainen tili tulee synkronoida manuaalisesti, jos haluat niiden tiedot käyttöösi. Et myöskään saa ilmoituksia, jos tietoja päivitetään."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Käyttöjakson nollauspäivä"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Aseta tiedonsiirtovaroitus"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Aseta tiedonsiirtoraja"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Tiedonsiirron rajoittaminen"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobiiliyhteytesi poistetaan käytöstä, jos määritetty tiedonsiirtoraja saavutetaan.\n\nTablet-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\nPuhelin 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" 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\nTä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\nTä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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Poistetut sovellukset ja käyttäjät"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> vastaanotettu, <xliff:g id="SENT">%2$s</xliff:g> lähetetty"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: n. <xliff:g id="TOTAL">%1$s</xliff:g> käytetty."</string>
     <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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Lisää VPN-profiili"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Muokkaa profiilia"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Poista profiili"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Aina käytössä oleva VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Valitse VPN-profiili, johon muodostettu yhteys on aina käytössä. Verkkoliikenne sallitaan vain tämän VPN-yhteyden ollessa käytössä."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"-"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Aina käytössä oleva VPN edellyttää, että sekä palvelimella että DNS-palvelulla on IP-osoite."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Ei verkkoyhteyttä. Yritä myöhemmin uudelleen."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Varmenne puuttuu. Muokkaa profiilia."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Järjestelmä"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Peruuta"</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">"Järjestelmän lisäpäivitykset"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Käyttäjät ja rajoitukset"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Käyttäjät"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Lisää käyttäjä"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Muokkaa tietoja"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Käyttäjätiedot"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Nimi"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Sisältörajoitukset"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Vaadi PIN-koodi"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Sisällön ikärajoitus"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Järjestelmäsovellukset"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Asennetut sovellukset"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Hylkää"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Poista käyttäjä"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Ärsyttävä pentu"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Ei käytössä"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Salliva"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Täytäntöönpano"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Käyttäjät"</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="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\nKun luot uuden käyttäjän, hänen täytyy määrittää omat asetuksensa.\n\nKaikki 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\nKaikki 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_confirm_remove_message" msgid="5284111415714437285">"Haluatko varmasti poistaa laitteesta käyttäjän ja kaikki tähän yhdistetyt tiedot?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Muuta kirjasinkokoa"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Rajoitukset"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Poista rajoitukset"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Vaihda PIN-koodi"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Näytä ilmoitukset"</string>
     <string name="help_label" msgid="1107174367904110532">"Ohje"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Käytettävä tili"</string>
+    <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="6160672982086584261">"Aseta sovelluksen rajoituksia"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Ohjaaja: <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Tätä sovellusta ei tueta rajoitetuissa profiileissa"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Tämä sovellus saa käyttää tilejäsi"</string>
+    <string name="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 3304e32..f892846 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>
@@ -91,7 +95,7 @@
     <item msgid="1634960474403853625">"Déconnecté"</item>
     <item msgid="746097431216080650">"Échec"</item>
     <item msgid="6367044185730295334">"Bloqué"</item>
-    <item msgid="503942654197908005">"Évite momentanément une mauvaise connexion"</item>
+    <item msgid="503942654197908005">"Mauvaise connexion évitée momentanément"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -105,7 +109,7 @@
     <item msgid="197508606402264311">"Déconnecté"</item>
     <item msgid="8578370891960825148">"Échec"</item>
     <item msgid="5660739516542454527">"Bloqué"</item>
-    <item msgid="1805837518286731242">"Évite momentanément une mauvaise connexion"</item>
+    <item msgid="1805837518286731242">"Mauvaise connexion évitée momentanément"</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">"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,16 +218,127 @@
     <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="886742181977884584">"Multimédia"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"boutons pour contenus multimédias"</item>
+    <item msgid="4547883971364273343">"priorité audio"</item>
+    <item msgid="2603878814882344450">"volume général"</item>
+    <item msgid="7136963238377062018">"volume de la voix"</item>
+    <item msgid="4270236897655923007">"volume des sonneries"</item>
+    <item msgid="6325739889222559394">"volume des contenus multimédias"</item>
+    <item msgid="5762123934816216821">"volume des alarmes"</item>
+    <item msgid="785049718065337473">"volume des notifications"</item>
+    <item msgid="6700305533746877052">"volume Bluetooth"</item>
+    <item msgid="2029227495214047094">"maintenir activé"</item>
+    <item msgid="26109888160231211">"suivre la position"</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>
+    <item msgid="5753789168376302997">"Boutons multimédias"</item>
+    <item msgid="3265262911688671938">"Priorité audio"</item>
+    <item msgid="2098976479485046797">"Volume général"</item>
+    <item msgid="5660213838861789350">"Volume de la voix"</item>
+    <item msgid="7983336752371254444">"Volume de la sonnerie"</item>
+    <item msgid="7878027809189330917">"Volume des contenus multimédias"</item>
+    <item msgid="7260546305036218513">"Volume de l\'alarme"</item>
+    <item msgid="9103719301075748925">"Volume des notifications"</item>
+    <item msgid="7025966722295861512">"Volume Bluetooth"</item>
+    <item msgid="4665183401128289653">"Maintenir activé"</item>
+    <item msgid="8584357129746649222">"Localisation"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Court"</item>
     <item msgid="2560532955514699713">"Moyen"</item>
     <item msgid="2372711992605524591">"Long"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (débogage)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Utiliser Dalvik"</item>
+    <item msgid="5131846588686178907">"Utiliser ART"</item>
+    <item msgid="4530003713865319928">"Utiliser le build de débogage ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Ne jamais vérifier"</item>
     <item msgid="6042769699089883931">"Vérifier le contenu GDN uniquement"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Échelle d\'animation 5x"</item>
     <item msgid="1069584980746680398">"Échelle d\'animation 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Aucun"</item>
+    <item msgid="688482401508173818">"720 x 480 mdpi"</item>
+    <item msgid="1725473474827398815">"1 280 x 720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1 920 x 1 080 xdpi"</item>
+    <item msgid="3646519549495410112">"1 280x720 tvdpi et 1 920x1 080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Aucun"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Désactivé"</item>
+    <item msgid="7688197031296835369">"Afficher les zones de conflit"</item>
+    <item msgid="8332661909019981149">"Afficher le compteur des conflits"</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>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Expiration du délai"</item>
     <item msgid="7664124146786465092">"Échec."</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Demander"</item>
+    <item msgid="5077768429488260031">"Ne jamais autoriser"</item>
+    <item msgid="1417929597727989746">"Toujours autoriser"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6a2383b..a3d940d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Oui"</string>
     <string name="no" msgid="6731231425810196216">"Non"</string>
     <string name="create" msgid="3578857613172647409">"Créer"</string>
+    <string name="allow" msgid="3349662621170855910">"Autoriser"</string>
+    <string name="deny" msgid="6947806159746484865">"Refuser"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Inconnu"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Plus que <xliff:g id="STEP_COUNT">%1$d</xliff:g> étape pour devenir un développeur."</item>
+    <item quantity="other" msgid="6722953419953594148">"Plus que <xliff:g id="STEP_COUNT">%1$d</xliff:g> étapes pour devenir un développeur."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Vous êtes désormais un développeur !"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Inutile, vous êtes déjà un développeur."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"SANS FIL ET RÉSEAUX"</string>
     <string name="header_category_device" msgid="5781174212691167553">"APPAREIL"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PERSONNEL"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Batterie en charge"</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_discharging" msgid="6222697503392774475">"Baisse du niveau de charge"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(sans fil)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"N\'est pas en charge"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Débranchée"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Chargée"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Débranché"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"sans fil"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"CA + USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Inconnu"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Inconnu"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Erreur inconnue"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Peu populaire"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Identifiable"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Identifiable par tous appareils Bluetooth à proximité (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Identifiable par appareils Bluetooth à proximité"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Non identifiable par d\'autres appareils Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Identifiable uniquement par les appareils associés"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Permettre l\'identification de l\'appareil"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Délai de visibilité"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Définir la durée pendant laquelle l\'appareil est identifiable"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquer les appels par reconnaissance vocale"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Désactiver les appels via le Bluetooth lorsque l\'écran est verrouillé"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Appareils Bluetooth"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Afficher les fichiers reçus"</string>
     <string name="device_picker" msgid="8398232791303186677">"Sélecteur d\'appareil Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Demande d\'autorisation Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Une application souhaite activer Bluetooth. Autoriser cette action ?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Une application de votre tablette souhaite rendre votre tablette identifiable par d\'autres appareils Bluetooth pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Autoriser cette action ?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Une application de votre téléphone souhaite rendre votre téléphone identifiable par d\'autres appareils Bluetooth pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Autoriser cette action ?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Une application de votre tablette souhaite rendre votre tablette \"toujours identifiable\" par d\'autres appareils Bluetooth. Autoriser cette action ?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Une application de votre téléphone souhaite rendre votre téléphone \"toujours identifiable\" par d\'autres appareils Bluetooth. Autoriser cette action ?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Une application de votre tablette souhaite activer Bluetooth et rendre votre tablette identifiable par d\'autres appareils pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Autoriser cette action ?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Une application de votre téléphone souhaite activer Bluetooth et rendre votre téléphone identifiable par d\'autres appareils pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes. Autoriser cette action ?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Une application de votre tablette souhaite activer Bluetooth et rendre votre tablette identifiable par d\'autres appareils. Autoriser cette action ?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Une application de votre téléphone souhaite activer Bluetooth et rendre votre téléphone identifiable par d\'autres appareils. Autoriser cette action ?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Une application requiert l\'activation du Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Une application nécessite que d\'autres appareils Bluetooth puissent détecter votre tablette pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Une application nécessite que d\'autres appareils Bluetooth puissent détecter votre téléphone pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Une application nécessite que d\'autres appareils Bluetooth puissent détecter votre tablette. Vous pourrez ensuite annuler cette opération dans les paramètres du Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Une application nécessite que d\'autres appareils Bluetooth puissent détecter votre téléphone. Vous pourrez ensuite annuler cette opération dans les paramètres du Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Une application requiert l\'activation du Bluetooth et nécessite que d\'autres appareils puissent détecter votre tablette pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Une application requiert l\'activation du Bluetooth et nécessite que d\'autres appareils puissent détecter votre téléphone pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Une application requiert l\'activation du Bluetooth et nécessite que d\'autres appareils puissent détecter votre tablette. Vous pourrez ensuite annuler cette opération dans les paramètres du Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Une application requiert l\'activation du Bluetooth et nécessite que d\'autres appareils puissent détecter votre téléphone. Vous pourrez ensuite annuler cette opération dans les paramètres du Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Activation du Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Désactivation du Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Connexion automatique"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Le proxy HTTP est utilisé par le navigateur, mais ne peut pas l\'être par les autres applications."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Emplacement :"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID voisin :"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Infos sur la cellule :"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentatives :"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Service GPRS :"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinérance :"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Vous avez été déconnecté, car vous avez quitté votre réseau domestique et l\'itinérance des données est désactivée."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Activer"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Lorsque vous activez l\'itinérance des données, des frais d\'itinérance importants peuvent s\'appliquer."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Lorsque vous autorisez l\'itinérance des données, des frais d\'itinérance importants peuvent s\'appliquer !\n\nCe paramètre affecte tous les utilisateurs de cette tablette."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Lorsque vous autorisez l\'itinérance des données, des frais d\'itinérance importants peuvent s\'appliquer !\n\nCe paramètre affecte tous les utilisateurs de ce téléphone."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Autoriser l\'itinérance des données ?"</string>
     <string name="networks" msgid="6333316876545927039">"Sélection de l\'opérateur"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Sélectionner un opérateur de réseau"</string>
@@ -297,7 +307,11 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Infos propriétaire"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Saisir texte à afficher sur écran de verrouillage"</string>
-    <string name="location_settings_title" msgid="4483843407328665068">"Accès aux données de localisation"</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>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Définir les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Exiger un code PIN ou un mot de passe numérique pour déchiffrer la tablette à chaque fois qu\'elle est allumée"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Exiger un code PIN ou un mot de passe numérique pour déchiffrer le téléphone à chaque fois qu\'il est allumé"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Chiffré"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre tablette chiffrée, vous devez saisir un code PIN ou un mot de passe numérique pour la déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre tablette qu\'en rétablissant la configuration d\'usine, ce qui effacera l\'ensemble de vos données."\n\n"Le chiffrement peut prendre une heure, voire plus. La batterie doit être chargée lors du démarrage du processus, et la tablette doit rester branchée jusqu\'à la fin. Si vous interrompez le processus, vous perdrez certaines de vos données, voire la totalité."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre téléphone chiffré, vous devez saisir un code PIN ou un mot de passe numérique pour le déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre téléphone qu\'en rétablissant la configuration d\'usine, ce qui effacera l\'ensemble de vos données."\n\n"Le chiffrement peut prendre une heure, voire plus. La batterie doit être chargée lors du démarrage du processus, et le téléphone doit rester branché jusqu\'à la fin. Si vous interrompez le processus, vous perdrez certaines de vos données, voire la totalité."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre tablette chiffrée, vous devez saisir un code PIN ou un mot de passe numérique pour la déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre tablette qu\'en rétablissant la configuration d\'usine, ce qui effacera l\'ensemble de vos données.\n\nLe chiffrement peut prendre une heure, voire plus. La batterie doit être chargée lors du démarrage du processus, et la tablette doit rester branchée jusqu\'à la fin. Si vous interrompez le processus, vous perdrez certaines de vos données, voire la totalité."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre téléphone chiffré, vous devez saisir un code PIN ou un mot de passe numérique pour le déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre téléphone qu\'en rétablissant la configuration d\'usine, ce qui effacera l\'ensemble de vos données.\n\nLe chiffrement peut prendre une heure, voire plus. La batterie doit être chargée lors du démarrage du processus, et le téléphone doit rester branché jusqu\'à la fin. Si vous interrompez le processus, vous perdrez certaines de vos données, voire la totalité."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Chiffrer la tablette"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Chiffrer le téléphone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Veuillez charger votre batterie, puis réessayer."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Réessayez dans <xliff:g id="DELAY">^1</xliff:g> secondes."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Saisissez votre mot de passe."</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Échec du chiffrement"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre tablette ne sont plus accessibles."\n\n"Pour continuer d\'utiliser votre tablette, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre tablette."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre téléphone ne sont plus accessibles."\n\n"Pour continuer d\'utiliser votre téléphone, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre tablette ne sont plus accessibles.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre tablette."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre téléphone ne sont plus accessibles.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Changer le mode de saisie"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Sélect. verr. écran"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Verrouillage secondaire"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Modifier le code PIN de déverrouillage"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Modifier le mot de passe de déverrouillage"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Le mot de passe doit comporter au moins %d caractères."</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Le code PIN doit comporter au moins %d caractères."</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Le code PIN doit comporter au moins %d chiffres."</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Appuyez sur Continuer une fois l\'opération terminée."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuer"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Le mot de passe doit comporter moins de <xliff:g id="NUMBER">%d</xliff:g> caractères."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Comme téléphone à haut-parleur"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pour la musique et le multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Mémoriser ces paramètres"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Affichages associés"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Appareils disponibles"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Connexion en cours…"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Connecté"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponible"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"En cours d\'utilisation"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Paramètres d\'affichage"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Voulez-vous vraiment vous déconnecter ?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Cette opération va mettre fin à votre connexion avec :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Options d\'affichage sans fil"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Supprimer"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"OK"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Nom"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Activé"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Désactivé"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Désactivé"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Autoriser l\'échange de données lorsque la tablette est en contact avec un autre appareil"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Autoriser l\'échange de données lorsque le téléphone touche un autre appareil"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Désactivé"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponible, car la NFC est désactivée"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="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="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\nIl 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="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="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="8116564886303972764">"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_in_progress" msgid="2944576520214787628">"La configuration WPS est déjà en cours et peut prendre jusqu\'à deux minutes."</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"La configuration de sécurité du routeur sans fil (TKIP) n\'est pas compatible."</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Échec de l\'authentification. Veuillez réessayer."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Une autre session WPS a été détectée. Veuillez réessayer dans quelques minutes."</string>
     <string name="wifi_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>
@@ -554,16 +611,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\nDonner 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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Enregistrer"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Échec de l\'enregistrement du réseau."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Annuler"</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_skip_anyway" msgid="6965361454438011190">"Ignorer quand même"</string>
+    <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\nLa 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\nLa 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="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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Recherche en cours…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Renommer l\'appareil"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Appareils associés"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Groupes mémorisés"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Impossible de se connecter."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Échec du changement de nom de l\'appareil."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Déconnecter ?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Si vous vous déconnectez, votre connexion avec <xliff:g id="PEER_NAME">%1$s</xliff:g> et <xliff:g id="PEER_COUNT">%2$s</xliff:g> autres appareils prendra fin."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Point d\'accès Wi-Fi"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Voulez-vous vraiment supprimer ce groupe ?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Point d\'accès Wi-Fi mobile"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Effets musicaux"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume de la sonnerie"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer en mode silencieux"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Notification par défaut"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Son de notification par défaut"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Voyant de notification"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Sonnerie"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utiliser le volume des appels entrants pour les notifications"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Sélectionner une sonnerie de notification"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Son de notification par défaut"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Multimédia"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Régler le volume pour la musique et les vidéos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarme"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fond d\'écran"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Sélectionner fond d\'écran dans"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Économiseur d\'écran"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Activer à la mise en veille, si l\'appareil est branché"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Désactivé"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Économiseur sélectionné"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Délai d\'activation"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Jamais"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Essayer"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Activer également lorsque l\'appareil est installé dans la station d\'accueil"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Écran de veille interactif"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Lorsque l\'appareil est installé sur la station d\'accueil ou lorsqu\'il est en veille et en charge"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Dans les deux cas"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Pendant la charge"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Sur la station d\'accueil"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Désactivé"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Pour contrôler le comportement du téléphone lorsqu\'il se trouve sur une station d\'accueil et/ou lorsqu\'il est en veille, activez l\'écran de veille interactif."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quand activer"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Commencer"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Paramètres"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Taille de la police"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Taille de police"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"Code PIN de la carte SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Code PIN incorrect."</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Les codes PIN ne correspondent pas."</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Impossible de modifier le code PIN."\n"Le code PIN est peut-être incorrect."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Impossible de modifier le code PIN.\nLe code PIN est peut-être incorrect."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Le code PIN de la carte SIM a été modifié."</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Impossible de changer l\'état de verrouillage de la carte SIM."\n"Le code PIN est peut-être incorrect."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Impossible de changer l\'état de verrouillage de la carte SIM.\nLe code PIN est peut-être incorrect."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annuler"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"État de la tablette"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Version de bande de base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Version du noyau"</string>
     <string name="build_number" msgid="3075795840572241758">"Numéro de build"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"État SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Non disponible"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"État"</string>
     <string name="device_status" msgid="607405385799807324">"État"</string>
@@ -733,12 +807,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">"Type de réseau mobile"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Informations sur l\'opérateur"</string>
     <string name="status_data_state" msgid="5503181397066522950">"État du réseau mobile"</string>
     <string name="status_service_state" msgid="2323931627519429503">"État du service"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Mémoire de stockage USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Carte SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"Disponible"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Disponible (en lecture seule)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espace total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calcul en cours"</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Applis (données des applis et contenu multimédia)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Images, vidéos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (musique, sonneries, podcasts, etc.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Divers"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Données mises en cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Désinstal. mémoire partagée"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Désinstaller la carte SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Désinstaller mémoire USB interne"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Effacer la carte SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Effacer les données de la mémoire de stockage USB interne (ex. : musique, photos)"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Effacer toutes les données de la carte SD, telles que la musique et les photos"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Lecture seule)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Effacer les données mises en cache ?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Les données en cache des applis seront effacées."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"La fonctionnalité MTP ou PTP est active."</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Désinstaller mémoire USB ?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Désinstaller la carte SD ?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Si vous désinstallez la mémoire de stockage USB, certaines applications en cours d\'utilisation seront fermées. Elles risquent de rester indisponibles jusqu\'à ce que la mémoire de stockage USB soit réinstallée."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Appareil photo (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Permet de transférer des photos à l\'aide du logiciel photo et de transférer des fichiers sur les ordinateurs non compatibles avec le protocole MTP."</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installer des outils de transfert de fichiers"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Autres utilisateurs"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"État de la batterie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Niveau de la batterie"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Restaurer valeurs d\'usine"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Effacer toutes les données de la tablette"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Effacer toutes les données du téléphone"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :"\n\n<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Cette action effacera toutes les données du "<b>"stockage interne"</b>" de votre téléphone, y compris :"\n\n<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Vous êtes actuellement connecté aux comptes suivants :"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Cette action effacera toutes les données du "<b>"stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musique"</li>\n<li>"Photos"</li>\n<li>"Autres données utilisateur"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"carte SD"</b>"."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Le partage connexion avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g> va être annulé."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Aide"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Réseaux mobiles"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Gérer le forfait mobile"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Opérateur SIM inconnu"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Aucun site Web de configuration connu pour %1$s"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insérez la carte SIM, puis redémarrez."</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Connectez-vous à Internet."</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>
@@ -910,13 +997,14 @@
     <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>
     <string name="about_settings_summary" msgid="3371517697156165959">"Informations légales, état et version du logiciel"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informations légales"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Collaborateurs"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Infos réglementaires"</string>
     <string name="copyright_title" msgid="865906688917260647">"Droits d\'auteur"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Conditions d\'utilisation"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Modifier le code PIN de déverrouillage"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmer le schéma enregistré"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Réessayer :"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dessinez un schéma de déverrouillage :"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Dessiner un schéma de déverrouillage :"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Appuyez sur Menu pour obtenir de l\'aide."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Ôtez le doigt lorsque vous avez terminé."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Reliez au moins <xliff:g id="NUMBER">%d</xliff:g> points. Veuillez réessayer :"</string>
@@ -960,18 +1048,13 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Dessiner un schéma pour déverrouiller l\'écran"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Faire apparaître le schéma"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrer au toucher"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Verr. auto bouton MARCHE-ARRÊT"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Verr. auto MARCHE-ARRÊT"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Créer un schéma"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Modifier le schéma de déverrouillage"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Comment dessiner un schéma de déverrouillage :"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Trop de tentatives échouées !"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Réessayer dans <xliff:g id="NUMBER">%d</xliff:g> secondes."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Annuler"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Suivant"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sécurisation de votre tablette"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Sécurisation de votre téléphone"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protégez votre tablette contre toute utilisation non autorisée en créant un schéma personnel de déverrouillage de l\'écran. À l\'aide de votre doigt, reliez les points dans l\'ordre de votre choix sur l\'écran suivant. Vous devez relier au moins quatre points. "\n\n"Vous êtes prêt ? Appuyez sur \"Suivant\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protégez votre téléphone contre toute utilisation non autorisée en créant un schéma personnel de déverrouillage de l\'écran. Avec votre doigt, reliez au moins quatre points dans l\'ordre de votre choix sur l\'écran suivant. "\n\n"Vous êtes prêt ? Appuyez sur \"Suivant\"."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"L\'application n\'est pas installée sur votre téléphone."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gérer les applications"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gérer et supprimer les applications installées"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Applications"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Autoriser l\'installation d\'applications issues de sources inconnues"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Votre tablette et vos données personnelles sont plus vulnérables face aux attaques d\'applications provenant de sources inconnues. Vous reconnaissez être seul responsable de tout dommage subi par votre tablette ou de toute perte de données pouvant découler de l\'utilisation de ces applications."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Votre téléphone et vos données personnelles sont plus vulnérables face aux attaques d\'applications provenant de sources inconnues. Vous reconnaissez être seul responsable de tout dommage subi par votre téléphone ou de toute perte de données pouvant découler de l\'utilisation de ces applications."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Vérifier les applications"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Ne pas autoriser l\'installation d\'applications potentiellement dangereuses ou afficher un avertissement"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Paramètres avancés"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Activer d\'autres paramètres"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informations sur l\'application"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Données sur USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Carte SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Désinstaller"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Désinstaller pour tous les utilisateurs"</string>
+    <string name="install_text" msgid="884360662922471113">"Installer"</string>
     <string name="disable_text" msgid="6544054052049395202">"Désactiver"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activer"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Effacer les données"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Voir processus en cache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Réinitialiser préf. applis"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Réinitialiser préférences ?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Cette opération entraîne la réinitialisation de toutes les préférences pour : "\n\n" "<li>"les applications désactivées ;"</li>\n" "<li>"les notifications des applications désactivées ;"</li>\n" "<li>"les applications utilisées par défaut pour certaines actions ;"</li>\n" "<li>"les restrictions relatives aux données en arrière-plan pour les applications."</li>\n\n" Vous ne perdrez aucune des données relatives à ces applications."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Cette opération entraîne la réinitialisation de toutes les préférences pour : \n\n "<li>"les applications désactivées ;"</li>\n" "<li>"les notifications des applications désactivées ;"</li>\n" "<li>"les applications utilisées par défaut pour certaines actions ;"</li>\n" "<li>"les restrictions relatives aux données en arrière-plan pour les applications."</li>\n\n" Vous ne perdrez aucune des données relatives à ces applications."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Réinitialiser applis"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gérer l\'espace"</string>
     <string name="filter" msgid="2018011724373033887">"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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Sur la carte SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Désactivée"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Non installée"</string>
     <string name="no_applications" msgid="7336588977497084921">"Aucune application"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Stockage interne"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Mémoire USB"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> et <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Cette application peut engendrer des frais :"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Envoyer un SMS premium"</string>
     <string name="computing_size" msgid="1599186977475211186">"Traitement..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Impossible de calculer la taille du package."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Aucune application tierce n\'est installée."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Modifier l\'emplacement d\'installation par défaut pour les nouvelles applications"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Désactiver appli intégrée ?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Si vous désactivez une application intégrée, cela peut provoquer des dysfonctionnements d\'autres applications."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Supprimer les données et désactiver l\'application ?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Utilisateur : <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Utilisateur supprimé"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processus et <xliff:g id="NUMSERVICES">%2$d</xliff:g> service"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processus et <xliff:g id="NUMSERVICES">%2$d</xliff:g> services"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processus et <xliff:g id="NUMSERVICES">%2$d</xliff:g> service"</string>
@@ -1127,8 +1225,7 @@
     <string name="auto_punctuate" msgid="4595367243950425833">"Ponctuation automatique"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Paramètres du clavier physique"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Appuyez deux fois sur la touche Espace pour insérer \".\""</string>
-    <string name="show_password" msgid="3001113966880559611">"Faire apparaître les mots de passe"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
+    <string name="show_password" msgid="3001113966880559611">"Faire apparaître mots de passe"</string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Ce mode de saisie est susceptible d\'enregistrer le texte que vous saisissez, y compris vos données personnelles, telles que les mots de passe et les numéros de carte de paiement. Il provient de l\'application <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Voulez-vous vraiment l\'activer ?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Ce correcteur orthographique peut recueillir l\'ensemble du texte saisi, y compris des données personnelles comme des mots de passe et des numéros de carte de paiement. Il provient de l\'application <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Utiliser ce correcteur orthographique ?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Paramètres"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Appuyez sur Ctrl+Espace pour changer disposition"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Par défaut"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Dispositions du clavier"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dictionnaire personnel"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dictionnaire personnel"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Dictionnaires personnels"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Dictionnaire personnel"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Ajouter"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Ajouter au dictionnaire"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"L\'écran ne se met jamais en veille lors du chargement"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activer les journaux par espionnage HCI Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Enregistrer tous les paquets HCI Bluetooth dans un fichier"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Sélect. moteur d\'exécution"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Sélect. moteur d\'exécution"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Redémarrer pour remplacer le moteur d\'exécution <xliff:g id="OLD">%1$s</xliff:g> par <xliff:g id="NEW">%2$s</xliff:g> ?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Positions fictives"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Autoriser les positions fictives"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Vérifiez que les applications installées par ADB/ADT ne présentent pas de comportement dangereux."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protéger mémoire de stockage USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Les applis doivent demander l\'autorisation pour lire la mémoire."</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Protéger mémoire stockage USB ?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Lorsque la mémoire de stockage USB est protégée, les applications doivent demander l\'autorisation de lire les données de la mémoire de stockage externe."\n\n"Certaines applications peuvent ne pas fonctionner jusqu\'à ce que leurs développeurs les mettent à jour."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Lorsque la mémoire de stockage USB est protégée, les applications doivent demander l\'autorisation de lire les données de la mémoire de stockage externe.\n\nCertaines applications peuvent ne pas fonctionner jusqu\'à ce que leurs développeurs les mettent à jour."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Protéger la carte SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Les applications doivent demander autorisation de lire carte SD."</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Protéger la carte SD ?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Lorsque la carte SD est protégée, les applications doivent demander l\'autorisation de lire les données de la mémoire de stockage externe."\n\n"Certaines applications peuvent ne pas fonctionner jusqu\'à ce que leurs développeurs les mettent à jour."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Lorsque la carte SD est protégée, les applications doivent demander l\'autorisation de lire les données de la mémoire de stockage externe.\n\nCertaines applications peuvent ne pas fonctionner jusqu\'à ce que leurs développeurs les mettent à jour."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal local"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Activer l\'application Terminal permettant l\'accès au shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Choisir un gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Choisir un widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Créer un widget et autoriser l\'accès ?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Paramètres d\'accessibilité"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Services"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Système"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Grands caractères"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Marche/arrêt pour raccrocher"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Énoncer mots de passe"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Délai de pression"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Améliorer l\'accessibilité du Web"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gestes d\'agrandissement"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Lorsque cette fonctionnalité est activée, vous pouvez effectuer des zooms avant et arrière en appuyant trois fois sur l\'écran.\n\nLorsque vous effectuez un zoom avant, vous pouvez :\n"<ul><li>"Effectuer un panoramique : faites glisser deux doigts ou plus sur l\'écran."</li>\n<li>"Régler le niveau de zoom : pincez deux doigts ou plus, ou écartez-les."</li></ul>\n\n"Vous pouvez également agrandir le contenu se trouvant sous votre doigt en appuyant trois fois sur l\'écran et en prolongeant la troisième pression. Lorsque la loupe est activée, vous pouvez faire glisser votre doigt sur l\'écran pour en explorer les différentes parties. Relevez votre doigt pour revenir à l\'état précédent.\n\nRemarque : vous pouvez appuyer trois fois sur l\'écran pour agrandir le contenu partout, sauf sur le clavier et la barre de navigation."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Raccourci d\'accessibilité"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Activé"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Désactivé"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Lorsque cette fonctionnalité est activée, vous pouvez rapidement activer les fonctionnalités d\'accessibilité en deux étapes :\n\nÉtape 1 : Appuyez de manière prolongée sur le bouton Marche/Arrêt jusqu\'à ce que le téléphone sonne ou vibre.\n\nÉtape 2 : Appuyez de manière prolongée avec deux doigts jusqu\'à ce que vous entendiez la confirmation audio.\n\nSi l\'appareil est utilisé par plusieurs personnes, l’utilisation de ce raccourci sur l\'écran de verrouillage active l\'accessibilité de manière temporaire jusqu\'au déverrouillage de l\'appareil."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Grands caractères"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Loupe"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Mise à jour auto de la loupe"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Mettre à jour la loupe si transition entre applis"</string>
+    <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_menu_item_settings" msgid="3344942964710773365">"Paramètres"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Activé"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"Activé"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Désactivé"</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="print_settings" msgid="4742428530112487843">"Impression"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Paramètres d\'impression"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Services"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"Le service <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> peut recevoir les tâches d\'impression. Il est possible que les documents que vous imprimez contiennent des données confidentielles."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Aucun service installé"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Paramètres"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Ajouter des imprimantes"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Activé"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Désactivé"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batterie"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Répartition de l\'utilisation de la batterie"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Info d\'utilisation batterie indispo"</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Données reçues"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Données mobiles envoyées"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Données mobiles reçues"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Données Wi‑Fi envoyées"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Données Wi‑Fi reçues"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Vidéo"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Durée d\'activation"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Arrêter ou désinstaller l\'application"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Contrôler manuellement le GPS pour éviter que l\'application ne l\'utilise"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"L\'application dispose peut-être de paramètres permettant de réduire l\'utilisation de la batterie."</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Batterie utilisée par l\'utilisateur"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Débranché depuis <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Depuis le dernier débranchement (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Utilisation totale"</string>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ton"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affecte le ton utilisé par la synthèse vocale"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Langue"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Langue non sélectionnée"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Définir la langue utilisée par la synthèse vocale"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Écouter un échantillon"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Lire une courte démonstration de la synthèse vocale"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Luminosité <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatique"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"maximale"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"moyenne"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"désactivée"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Stockage des identifiants"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installer depuis la mémoire"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Lors de la réinstallation d\'une application, restaurer les paramètres et les données sauvegardées"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Établir un rapport de bug"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Cela permet de recueillir des informations concernant l\'état actuel de votre appareil, qui sont ensuite envoyées sous forme d\'e-mail. Merci de patienter pendant la préparation du rapport de bug. Cette opération peut prendre quelques instants."</string>
-    <string name="report" msgid="302437572240018342">"Générer le rapport"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Mot de passe sauvegarde PC"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Les sauvegardes complètes sur PC ne sont pas protégées actuellement."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Appuyez pour modifier ou supprimer le mot de passe utilisé pour les sauvegardes complètes sur PC."</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nAppuyez 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>
@@ -1482,7 +1626,7 @@
     <string name="background_data_summary" msgid="8328521479872763452">"Synchronisation, envoi et réception de données à tout moment"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Dés. données arr.-plan ?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"La désactivation des données en arrière-plan économise la batterie et réduit l\'utilisation des données. Certaines applications peuvent continuer d\'utiliser la connexion Internet en arrière-plan."</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"Synchro auto des données des applis"</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"Synchro auto"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Synchronisation activée"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Synchronisation désactivée"</string>
     <string name="sync_error" msgid="5060969083117872149">"Erreur de synchronisation"</string>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Faire clignoter les surfaces à chaque mise à jour"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Afficher mises à jour GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Faire clignoter les éléments dessinés avec le GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Mises à jour couches mat."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Couches matérielles en vert une fois mises à jour"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Déboguer les conflits GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Afficher mém. CPU utilisée"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposition écran indiquant mémoire CPU utilisée"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forcer le rendu GPU"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simul. affich. secondaires"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Applications"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ne pas conserver activités"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Supprimer immédiatement les activités abandonnées"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Désactiver données arrière-plan sur réseaux mobiles. Utiliser autres réseaux si dispos."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Pour restreindre les données en arrière-plan, définissez un quota de données mobiles."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Limiter les données en arrière-plan ?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Cette fonctionnalité peut empêcher certaines applications de s\'exécuter lorsque celles-ci sont dépendantes des données en arrière-plan et que seuls des réseaux mobiles sont disponibles."\n\n"Vous trouverez des options plus adaptées en matière de contrôle de la consommation des données dans les paramètres de l\'application."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Cette fonctionnalité peut empêcher certaines applications de s\'exécuter lorsque celles-ci sont dépendantes des données en arrière-plan et que seuls des réseaux mobiles sont disponibles.\n\nVous trouverez des options plus adaptées en matière de contrôle de la consommation des données dans les paramètres de l\'application."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"La limitation des données en arrière-plan n\'est disponible que lorsque vous avez défini un plafond de données mobiles."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Activer synchro auto données ?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Les modifications que vous apportez à vos comptes sur le Web sont automatiquement copiées sur votre tablette."\n\n"Certains comptes permettent également de copier automatiquement sur le Web toutes les modifications que vous effectuez sur la tablette. C\'est le cas des comptes Google."\n\n"Pour sélectionner le type d\'informations à synchroniser au sein de chaque compte, accédez à Paramètres &gt; Comptes."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Les modifications que vous apportez à vos comptes sur le Web sont automatiquement copiées sur votre téléphone."\n\n"Certains comptes permettent également de copier automatiquement sur le Web toutes les modifications que vous effectuez sur le téléphone. C\'est le cas des comptes Google."\n\n"Pour sélectionner le type d\'informations à synchroniser au sein de chaque compte, accédez à Paramètres &gt; Comptes."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Les modifications que vous apportez à vos comptes sur le Web sont automatiquement copiées sur votre tablette.\n\nCertains comptes permettent également de copier automatiquement sur le Web toutes les modifications que vous effectuez sur la tablette. C\'est le cas des comptes Google.\n\nPour sélectionner le type d\'informations à synchroniser au sein de chaque compte, accédez à Paramètres &gt; Comptes."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Les modifications que vous apportez à vos comptes sur le Web sont automatiquement copiées sur votre téléphone.\n\nCertains comptes permettent également de copier automatiquement sur le Web toutes les modifications que vous effectuez sur le téléphone. C\'est le cas des comptes Google.\n\nPour sélectionner le type d\'informations à synchroniser au sein de chaque compte, accédez à Paramètres &gt; Comptes."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Désactiver synchro auto données ?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Cela limite la consommation des données et l\'utilisation de la batterie, mais vous devrez synchroniser manuellement chaque compte pour recueillir les informations récentes. Par ailleurs, vous ne recevrez pas de notifications en cas de mise à jour."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Date de réinitialisation du cycle de consommation"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Définir avertissement utilisation des données"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Définir un quota d\'utilisation des données"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitation de la consommation de données mobiles"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Votre connexion Internet mobile sera désactivée une fois le seuil défini atteint.\n\nLa 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\nLa 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" 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\nCe 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\nCe 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Applications et utilisateurs supprimés"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> reçus, <xliff:g id="SENT">%2$s</xliff:g> envoyés"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g> : environ <xliff:g id="TOTAL">%1$s</xliff:g> utilisés"</string>
     <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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Ajouter un profil VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Modifier le profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Supprimer le profil"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN permanent"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Sélectionnez un profil VPN auquel rester connecté en permanence. Le trafic réseau ne sera autorisé que lorsque vous serez connecté à ce VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Aucun"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Le VPN permanent nécessite une adresse IP pour le serveur et le DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Aucune connexion réseau. Veuillez réessayer ultérieurement."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Certificat manquant. Veuillez modifier le profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Système"</string>
@@ -1687,24 +1843,86 @@
     <!-- no translation found for percentage (5866131581207788624) -->
     <skip />
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Mises à jour supplémentaires du système"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Utilisateurs et restrictions"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Utilisateurs"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Ajouter utilisateur"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Modifier les informations"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Informations sur l\'utilisateur"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Nom"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Restrictions liées au contenu"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Exiger un code PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Classification du contenu"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Applications système"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Applications installées"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Supprimer"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Suppr. l\'utilisateur"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Enfant turbulent"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Désactivé"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissif"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Application"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Utilisateurs"</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="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\nLorsque vous créez un utilisateur, celui-ci doit suivre une procédure de configuration.\n\nN\'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\nN\'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_confirm_remove_message" msgid="5284111415714437285">"Voulez-vous vraiment supprimer le compte utilisateur ainsi que toutes les données associées de l\'appareil ?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Modifier la taille de la police"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Restrictions"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Annuler les restrictions"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Modifier le code PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Afficher notifications"</string>
     <string name="help_label" msgid="1107174367904110532">"Aide"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Compte pour contenu"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ID de photo"</string>
     <string name="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="6160672982086584261">"Définir des restrictions d\'applis"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Contrôlées par <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Cette application n\'accepte pas les profils limités."</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Cette application peut accéder à vos comptes."</string>
+    <string name="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 63c672d..678b837 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,16 +218,127 @@
     <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="886742181977884584">"मीडिया"</item>
+    <item msgid="7924928667052300589">"उपकरण"</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>
+    <item msgid="5124443975763747838">"मीडिया बटन"</item>
+    <item msgid="4547883971364273343">"ऑडियो फ़ोकस"</item>
+    <item msgid="2603878814882344450">"मास्टर वॉल्यूम"</item>
+    <item msgid="7136963238377062018">"ध्वनि वॉल्यूम"</item>
+    <item msgid="4270236897655923007">"रिंग वॉल्यूम"</item>
+    <item msgid="6325739889222559394">"मीडिया वॉल्‍यूम"</item>
+    <item msgid="5762123934816216821">"अलार्म वॉल्यूम"</item>
+    <item msgid="785049718065337473">"सूचना वॉल्‍यूम"</item>
+    <item msgid="6700305533746877052">"bluetooth वॉल्यूम"</item>
+    <item msgid="2029227495214047094">"सचेत रखें"</item>
+    <item msgid="26109888160231211">"मॉनिटर का स्थान"</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>
+    <item msgid="5753789168376302997">"मीडिया बटन"</item>
+    <item msgid="3265262911688671938">"ऑडियो फ़ोकस"</item>
+    <item msgid="2098976479485046797">"मास्टर वॉल्यूम"</item>
+    <item msgid="5660213838861789350">"ध्वनि वॉल्यूम"</item>
+    <item msgid="7983336752371254444">"रिंग वॉल्यूम"</item>
+    <item msgid="7878027809189330917">"मीडिया वॉल्‍यूम"</item>
+    <item msgid="7260546305036218513">"अलार्म वॉल्यूम"</item>
+    <item msgid="9103719301075748925">"सूचना वॉल्‍यूम"</item>
+    <item msgid="7025966722295861512">"Bluetooth वॉल्‍यूम"</item>
+    <item msgid="4665183401128289653">"सचेत रखें"</item>
+    <item msgid="8584357129746649222">"स्थान"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"कम"</item>
     <item msgid="2560532955514699713">"मध्यम"</item>
     <item msgid="2372711992605524591">"अधिक"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (डीबग)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Dalvik का उपयोग करें"</item>
+    <item msgid="5131846588686178907">"ART का उपयोग करें"</item>
+    <item msgid="4530003713865319928">"ART डीबग बिल्ड का उपयोग करें"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"कभी न जांचें"</item>
     <item msgid="6042769699089883931">"केवल DRM सामग्री जांचें"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"एनिमेशन स्‍केल 5x"</item>
     <item msgid="1069584980746680398">"एनिमेशन स्‍केल 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"कोई नहीं"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi और 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"कोई नहीं"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"बंद"</item>
+    <item msgid="7688197031296835369">"ओवरड्रॉ क्षेत्रों को दिखाएं"</item>
+    <item msgid="8332661909019981149">"ओवरड्रॉ काउंटर दिखाएं"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"मानक सीमा"</item>
     <item msgid="4071574792028999443">"कोई पृष्ठभूमि प्रक्रियाएं नहीं"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"समयबाह्य"</item>
     <item msgid="7664124146786465092">"विफल"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"पूछें"</item>
+    <item msgid="5077768429488260031">"कभी भी अनुमति न दें"</item>
+    <item msgid="1417929597727989746">"हमेशा अनुमति दें"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 2128f67..a99ff8b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"हां"</string>
     <string name="no" msgid="6731231425810196216">"नहीं"</string>
     <string name="create" msgid="3578857613172647409">"बनाएं"</string>
+    <string name="allow" msgid="3349662621170855910">"अनुमति दें"</string>
+    <string name="deny" msgid="6947806159746484865">"अस्वीकार करें"</string>
     <string name="device_info_default" msgid="7847265875578739287">"अज्ञात"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"अब आप डेवलपर बनने से <xliff:g id="STEP_COUNT">%1$d</xliff:g> चरण दूर हैं"</item>
+    <item quantity="other" msgid="6722953419953594148">"अब आप डेवलपर बनने से <xliff:g id="STEP_COUNT">%1$d</xliff:g> चरण दूर हैं."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"अब आप डेवलपर बन गए हैं!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"आवश्यकता नहीं, आप पहले से ही डेवलपर हैं."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"वायरलेस और नेटवर्क"</string>
     <string name="header_category_device" msgid="5781174212691167553">"उपकरण"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"व्यक्तिगत"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"चार्ज हो रही है"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"डिस्‍चार्ज हो रही है"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(वायरलेस)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"चार्ज नहीं हो रही है"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"चार्ज नहीं हो रही है"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"भरी"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"अनप्लग किया गया"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"वायरलेस"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"अज्ञात"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"अज्ञात"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"अज्ञात त्रुटि"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"ठंडा"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"खोज योग्‍य"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"आसपास के सब Bluetooth उप. के लि‍ए दृश्‍यमान (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"सभी आस-पास के Bluetooth उपकरणों के लि‍ए दृश्‍यमान"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"अन्‍य Bluetooth उपकरणों के लि‍ए दृश्‍यमान नहीं"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"केवल युग्‍मि‍त उपकरणों के लि‍ए दृश्‍यमान"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"उपकरण को खोज योग्‍य बनाएं"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"दृश्यता समयबाह्य"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"सेट करें कि कितनी देर तक उपकरण खोज योग्‍य रहेगा"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ध्‍वनि डायलिंग लॉक करें"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"जब स्‍क्रीन लॉक हो, तो bluetooth डायलर के उपयोग को रोकें"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth उपकरण"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"प्राप्त फ़ाइलें दिखाएं"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth उपकरण चयनकर्ता"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth अनूमति अनुरोध"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"कोई एप्‍लिकेशन Bluetooth चालू करना चाहता है. अनुमति दें?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"आपके टेबलेट पर कोई एप्‍लिकेशन <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्‍य Bluetooth उपकरणों द्वारा आपके टेबलेट को खोजने योग्‍य बनाना चाहता है. अनुमति दें?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"आपके फ़ोन पर कोई एप्‍लिकेशन <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्‍य Bluetooth उपकरणों द्वारा आपके फ़ोन को खोजने योग्‍य बनाना चाहता है. अनुमति दें?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"आपके टेबलेट पर कोई एप्‍लिकेशन आपके टेबलेट को अन्‍य Bluetooth उपकरणों द्वारा “हमेशा खोजने योग्‍य” बनाना चाहता है. अनुमति दें?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"आपके फ़ोन पर कोई एप्‍लिकेशन आपके फ़ोन को अन्‍य Bluetooth उपकरणों द्वारा “हमेशा खोजने योग्‍य” बनाना चाहता है. अनुमति दें?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"आपके टेबलेट पर कोई एप्‍लिकेशन Bluetooth चालू करना चाहता है और आपके टेबलेट को अन्‍य उपकरणों द्वारा <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए खोजने योग्‍य बनाना चाहता है. अनुमति दें?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"आपके फ़ोन पर कोई एप्‍लिकेशन Bluetooth चालू करना चाहता है और आपके फ़ोन को अन्‍य उपकरणों द्वारा <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए खोजने योग्‍य बनाना चाहता है. अनुमति दें?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"आपके टेबलेट पर कोई एप्‍लिकेशन Bluetooth चालू करना चाहता है और आपके टेबलेट को अन्‍य उपकरणों द्वारा खोजने योग्‍य बनाना चाहता है. अनुमति दें?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"आपके फ़ोन पर कोई एप्‍लिकेशन Bluetooth चालू करना चाहता है और आपके फ़ोन को अन्‍य उपकरणों द्वारा खोजने योग्‍य बनाना चाहता है. अनुमति दें?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"एक एप्लिकेशन Bluetooth को चालू करना चाहता है."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"एक एप्लिकेशन आपके टेबलेट को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य Bluetooth उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"एक एप्लिकेशन आपके फ़ोन को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य Bluetooth उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"एक एप्लिकेशन आपके टेबलेट को अन्य Bluetooth उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में Bluetooth सेटिंग में बदल सकते हैं."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"एक एप्लिकेशन आपके फ़ोन को अन्य Bluetooth उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में Bluetooth सेटिंग में बदल सकते हैं."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"एक एप्लिकेशन Bluetooth को चालू करना और आपके टेबलेट को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"एक एप्लिकेशन Bluetooth को चालू करना और आपके फ़ोन को <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंड के लिए अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"एक एप्लिकेशन Bluetooth को चालू करना और आपके टेबलेट को अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में Bluetooth सेटिंग में बदल सकते हैं."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"एक एप्लिकेशन Bluetooth को चालू करना और आपके फ़ोन को अन्य उपकरणों हेतु दृश्यमान बनाना चाहता है. आप इसे बाद में Bluetooth सेटिंग में बदल सकते हैं."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth चालू हो रहा है.."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth बंद कर रहे हैं…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"स्‍वत: कनेक्‍ट करें"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP प्रॉक्सी का उपयोग ब्राउज़र द्वारा किया जाता है लेकिन अन्य एप्‍लिकेशन द्वारा उपयोग नहीं किया जा सकता."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"स्थान:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"समीपस्‍थ CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"सेल जानकारी:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"डेटा प्रयास:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS सेवा:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"रोमिंग:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"आपने डेटा कनेक्टिविटी खो दी है क्योंकि आपने डेटा रोमिंग बंद रखकर अपना होम नेटवर्क छोड़ दिया."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"इसे चालू करें"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"जब आप डेटा रोमिंग की अनुमति देते हैं, तो परिणामस्वरूप आप पर रोमिंग शुल्‍क लग सकते हैं!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"जब आप डेटा रोमिंग की अनुमति देते हैं, तो हो सकता है कि आपको अधिक रोमिंग शुल्क लगे!\n\nयह सेटिंग इस टेबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"जब आप डेटा रोमिंग की अनुमति देते हैं, तो हो सकता है कि आपको अधिक रोमिंग शुल्क लगे!\n\nयह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"डेटा रोमिंग की अनुमति दें?"</string>
     <string name="networks" msgid="6333316876545927039">"ऑपरेटर चयन"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"कोई नेटवर्क ऑपरेटर चुनें"</string>
@@ -291,12 +301,16 @@
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"चेहरे का मिलान बेहतर बनाएं"</string>
     <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"जीवंतता जांच"</string>
     <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"अनलॉक करते समय आंख झपकाने की आवश्‍यकता है"</string>
-    <string name="lock_after_timeout" msgid="4590337686681194648">"स्वचालित रूप से लॉक करें"</string>
+    <string name="lock_after_timeout" 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_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">"मेरा स्‍थान, स्‍क्रीन अनलॉक, सिम कार्ड लॉक, क्रेडेंशियल संग्रहण लॉक सेट करें"</string>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"हर बार अपना टेबलेट चालू करते समय आपको उसे डीक्रिप्‍ट करने के लिए एक संख्‍यात्‍मक पिन या पासवर्ड की आवश्‍यकता होती है"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"हर बार अपना फ़ोन चालू करते समय आपको उसे डीक्रिप्‍ट करने के लिए एक संख्‍यात्‍मक पिन या पासवर्ड की आवश्‍यकता होती है"</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>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> सेकंड में पुन: प्रयास करें."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"अपना पासवर्ड लिखें"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"एन्क्रिप्‍शन विफल"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"एन्‍क्रिप्‍शन बाधित किया था और पूर्ण नहीं हो सकता. परिणामस्‍वरूप, आपके टेबलेट का डेटा अब पहुंच योग्‍य नहीं है. "\n\n" अपने टेबलेट का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करना होगा. जब आप रीसेट करने के बाद अपना टेबलेट सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"एन्‍क्रिप्‍शन बाधित था और पूर्ण नहीं हो सकता. इसके परिणामस्‍वरूप, आपके फ़ोन का डेटा अब पहुंच योग्‍य नहीं है. "\n\n"अपने फ़ोन का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करना होगा. जब आप रीसेट करने के बाद अपना फ़ोन सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"एन्‍क्रिप्‍शन बाधित किया था और पूर्ण नहीं हो सकता. परिणामस्‍वरूप, आपके टेबलेट का डेटा अब पहुंच योग्‍य नहीं है. \n\n अपने टेबलेट का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करना होगा. जब आप रीसेट करने के बाद अपना टेबलेट सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"एन्‍क्रिप्‍शन बाधित था और पूर्ण नहीं हो सकता. इसके परिणामस्‍वरूप, आपके फ़ोन का डेटा अब पहुंच योग्‍य नहीं है. \n\nअपने फ़ोन का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करना होगा. जब आप रीसेट करने के बाद अपना फ़ोन सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"इनपुट पद्धति‍ स्विच करें"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"स्‍क्रीन लॉक चुनें"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"बैकअप लॉक चुनें"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"अनलॉक पिन बदलें"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"अनलॉक पासवर्ड बदलें"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"पासवर्ड में कम से कम %d वर्ण होने चाहिए"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"पिन में कम से कम %d वर्ण होने चाहिए"</string>
+    <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>
@@ -406,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>
@@ -480,6 +503,28 @@
     <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_empty_list_wifi_display_off" msgid="1225626898926363100">"उपकरणों को देखने के लिए, वायरलेस प्रदर्शन चालू करें."</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_paired_devices" msgid="7395326840730024303">"युग्मित प्रदर्शन"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"उपलब्ध उपकरण"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"कनेक्ट कर रहा है"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"कनेक्ट किया गया"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"उपलब्ध"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"उपयोग में"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"प्रदर्शन सेटिंग"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"डिस्‍कनेक्‍ट करें?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"इससे &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; के साथ आपका कनेक्शन समाप्त हो जाएगा"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"वायरलेस प्रदर्शन के विकल्प"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"भूलें"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"पूर्ण"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"नाम"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"चालू"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"बंद"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"अक्षम"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"जब टेबलेट अन्य उपकरण को स्पर्श करे तो डेटा विनिमय करने दें"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"जब फ़ोन अन्य उपकरण को स्पर्श करे तो डेटा विनिमय करने दें"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"बंद"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"अनुपलब्‍ध है क्‍योंकि NFC बंद है"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"जब यह सुविधा चालू हो, तो आप एप्लिकेशन सामग्री को किसी अन्‍य NFC-सक्षम उपकरण पर दोनों उपकरणों को पास-पास रख कर बीम कर सकते हैं. उदाहरण के लिए, आप ब्राउज़र पृष्ठ, YouTube वीडियो, लोग संपर्क, इत्‍यादि बहुत कुछ बीम कर सकते हैं."\n\n"बस दोनों उपकरणों को साथ लाएं (आमतौर पर एक के पीछे एक) और फिर अपनी स्‍क्रीन को स्‍पर्श करें. एप्लिकेशन पता लगा लेता है कि क्‍या बीम हुआ."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"जब यह सुविधा चालू हो, तो आप एप्लिकेशन सामग्री को किसी अन्‍य NFC-सक्षम उपकरण पर दोनों उपकरणों को पास-पास रख कर बीम कर सकते हैं. उदाहरण के लिए, आप ब्राउज़र पृष्ठ, YouTube वीडियो, लोग संपर्क, इत्‍यादि बहुत कुछ बीम कर सकते हैं.\n\nबस दोनों उपकरणों को साथ लाएं (आमतौर पर एक के पीछे एक) और फिर अपनी स्‍क्रीन को स्‍पर्श करें. एप्लिकेशन पता लगा लेता है कि क्‍या बीम हुआ."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"नेटवर्क सेवा खोज"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"अन्‍य उपकरणों पर एप्‍लिकेशन को इस उपकरण पर एप्‍लिकेशन खोजने दें"</string>
-    <string name="wifi_quick_toggle_title" msgid="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="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="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="8116564886303972764">"अपने 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_in_progress" msgid="2944576520214787628">"WPS पहले से ही प्रगति में है और पूर्ण होने में दो मिनट लग सकते हैं"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Wi-Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्ट है"</string>
+    <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS पहले से ही चल रहा है और पूर्ण होने में दो मिनट तक लग सकते हैं"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS विफल रहा. कृपया कुछ मिनटों में पुन: प्रयास करें."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"वायरलेस राउटर सुरक्षा सेटिंग (WEP) समर्थित नहीं है"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"वायरलेस राउटर सुरक्षा सेटिंग (TKIP) समर्थित नहीं है"</string>
     <string name="wifi_wps_failed_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>
@@ -561,9 +618,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>
@@ -571,8 +631,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_advanced_titlebar" msgid="1627063574532930090">"उन्‍नत Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi फ़्रीक्वेंसी बैंड"</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="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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"खोज रहा है…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"उपकरण का नाम बदलें"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"पीयर उपकरण"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"याद रखे गए समूह"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"कनेक्‍ट नहीं किया जा सका."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"उपकरण का नाम बदलने में विफल रहा."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"डिस्‍कनेक्‍ट करें?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"यदि आप डिस्‍कनेक्‍ट करते हैं, तो <xliff:g id="PEER_NAME">%1$s</xliff:g> और <xliff:g id="PEER_COUNT">%2$s</xliff:g> अन्‍य उपकरणों के साथ आपका कनेक्‍शन समाप्त हो जाएगा."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"आमंत्रण रद्द करें?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"क्या आप <xliff:g id="PEER_NAME">%1$s</xliff:g> से कनेक्ट होने का आमंत्रण रद्द करना चाहते हैं?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"पोर्टेबल Wi-Fi हॉट स्‍पॉट"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"इस समूह को भूलें?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"पोर्टेबल Wi-Fi हॉटस्‍पॉट"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"संगीत प्रभाव"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"रिंगर वॉल्‍यूम"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"मौन होने पर कंपन करें"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"डिफ़ॉल्ट सूचना"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"डिफ़ॉल्ट सूचना ध्वनि"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"पल्‍स सूचना प्रकाश"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"रिंगटोन"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"सूचना"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"सूचनाओं के लिए इनकमिंग कॉल वॉल्‍यूम का उपयोग करें"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"सूचना रिंगटोन चुनें"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"डिफ़ॉल्ट सूचना ध्वनि"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"मीडिया"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"संगीत और वीडियो के लिए वॉल्‍यूम सेट करें"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"अलार्म"</string>
@@ -666,20 +738,21 @@
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"टेबलेट घुमाने पर स्‍वचालित रूप से अभिविन्‍यास स्‍विच करें"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"फ़ोन घुमाने पर अभिविन्‍यास स्‍वचालित रूप से स्‍विच करें"</string>
     <string name="brightness" msgid="2354961343555249270">"चमक"</string>
-    <string name="brightness_summary" msgid="838917350127550703">"स्‍क्रीन की चमक समायोजित करें"</string>
+    <string name="brightness_summary" msgid="838917350127550703">"स्‍क्रीन की चमक एडजस्ट करें"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"निष्क्रिय"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"नि‍ष्‍क्रि‍यता के <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> के बाद"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"वॉलपेपर"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"यहां से वॉलपेपर चुनें:"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"स्क्रीन कैंडी"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"निष्क्रिय मोड में पावर से कनेक्‍ट होने पर प्रारंभ हो जाएगा"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"अक्षम"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"चयनित कैंडी"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"कब सक्रिय करें"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> निष्क्रिय रहने के बाद"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"कभी नहीं"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"इसे आज़माएं!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"डॉक किए जाने पर भी प्रारंभ करें"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</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_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>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"सिम पिन"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"गलत पिन"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"पिनों का मिलान नहीं होता"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"पिन नहीं बदल सकता."\n"संभवत: गलत पिन."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"पिन नहीं बदल सकता.\nसंभवत: गलत पिन."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"सिम पिन सफलतापूर्वक बदला गया"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"सिम कार्ड लॉक स्‍थिति नहीं बदल सकता."\n"संभवत: गलत पिन."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"सिम कार्ड लॉक स्‍थिति नहीं बदल सकता.\nसंभवत: गलत पिन."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"ठीक"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"रद्द करें"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"टेबलेट स्‍थिति"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Baseband संस्‍करण"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel संस्‍करण"</string>
     <string name="build_number" msgid="3075795840572241758">"बिल्‍ड नबंर"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux स्‍थिति"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"उपलब्ध नहीं"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"स्थिति"</string>
     <string name="device_status" msgid="607405385799807324">"स्थिति"</string>
@@ -733,12 +807,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">"मोबाइल नेटवर्क प्रकार"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"ऑपरेटर जानकारी"</string>
     <string name="status_data_state" msgid="5503181397066522950">"मोबाइल नेटवर्क की स्‍थिति"</string>
     <string name="status_service_state" msgid="2323931627519429503">"सेवा स्‍थिति"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"सिग्‍नल शक्ति"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB संग्रहण"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD कार्ड"</string>
     <string name="memory_available" msgid="5052397223077021181">"उपलब्ध"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"उपलब्ध (केवल पढ़ने योग्य)"</string>
     <string name="memory_size" msgid="6629067715017232195">"कुल स्‍थान"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"गणना हो रही है..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"एप्लिकेशन (एप्लिकेशन डेटा और मीडिया सामग्री)"</string>
@@ -756,6 +832,7 @@
     <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_cache_usage" msgid="6704293333141177910">"संचित डेटा"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"शेयर किया गया संग्रहण अनमाउंट करें"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD कार्ड अनमाउंट करें"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"आंतरिक USB संग्रहण अनमाउंट करें"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD कार्ड मिटाएं"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"आंतरिक USB संग्रहण का सभी डेटा मिटाता है, जैसे संगीत और फ़ोटो"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"SD कार्ड का सभी डेटा मिटाता है, जैसे संगीत और फ़ोटो"</string>
-    <string name="read_only" msgid="6702420168629076340">" (केवल पढ़ने के लिए)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"संचित डेटा साफ़ करें?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"इससे सभी एप्लिकेशन का संचित डेटा साफ़ हो जाएगा."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP या PTP प्रकार्य सक्रिय है"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"USB संग्रहण अनमाउंट करें?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"SD कार्ड को अनमाउंट करें?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"यदि आप USB संग्रहण को अनमाउंट करते हैं, तो आपके द्वारा उपयोग किए जा रहे कुछ एप्‍लिकेशन बंद हो जाएंगे और जब तक आप USB संग्रहण को पुन: माउंट नहीं करते, तब तक अनुपलब्‍ध रह सकते हैं."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"कैमरा (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"आपको कैमरा सॉफ़्टवेयर का उपयोग करके फ़ोटो स्‍थानांतरित करने देता है, और MTP का समर्थन न करने वाले कंप्‍यूटरों पर कोई भी फ़ाइलें स्‍थानांतरित करने देता है"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"फ़ाइल स्थानांतरण उपकरण इंस्‍टॉल करें"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"अन्य उपयोगकर्ता"</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>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"फ़ैक्टरी डेटा रीसेट"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"टेबलेट से सभी डेटा मिटाएं"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"फ़ोन से सभी डेटा मिटाएं"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"इससे आपके टेबलेट के "<b>"आंतरिक संग्रहण"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:"\n\n<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और एप्‍लिकेशन डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए एप्‍लिकेशन"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"इससे आपके फ़ोन के "<b>"आंतरिक संग्रहण"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:"\n\n<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और एप्‍लिकेशन डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए एप्‍लिकेशन"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"आप वर्तमान में निम्‍न खातों में साइन इन हैं:"\n</string>
+    <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>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"संगीत, चित्र और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>"SD कार्ड"</b>" को साफ़ करना होगा."</string>
@@ -897,10 +979,15 @@
     <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="manage_mobile_plan_title" msgid="7588182101738043593">"मोबाइल प्लान प्रबंधित करें"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"अज्ञात SIM ऑपरेट"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s की कोई भी ज्ञात प्रावधान वेबसाइट नहीं है"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"कृपया SIM कार्ड डालें और पुन: प्रारंभ करें"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"कृपया इंटरनेट से कनेक्ट करें"</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>
@@ -917,6 +1004,7 @@
     <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="copyright_title" msgid="865906688917260647">"कॉपीराइट"</string>
     <string name="license_title" msgid="1990487604356037871">"लाइसेंस"</string>
     <string name="terms_title" msgid="7697580845616764642">"नियम और शर्तें"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"अनलॉक पिन बदलें"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"सहेजे गए प्रतिमान की पुष्टि करें"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"पुनः प्रयास करें:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"अनलॉक प्रतिमान आरेखित करें"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"अनलॉक प्रतिमान आरेखित करें:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"सहायता के लिए मेनू दबाएं."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"पूर्ण होने पर अंगुली हटा लें."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"कम से कम <xliff:g id="NUMBER">%d</xliff:g> बिंदु कनेक्‍ट करें. पुन: प्रयास करें:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"अनलॉक प्रतिमान कैसे आरेखित करें"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"बहुत से गलत प्रयास!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> सेकंड में पुन: प्रयास करें."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"रद्द करें"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"अगला"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"अपने टेबलेट को सुरक्षित करना"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"आपके फ़ोन को सुरक्षित करना"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"कोई निजी स्‍क्रीन अनलॉक प्रतिमान बनाकर अपने टेबलेट को अनधिकृत उपयोग से बचाएं. बिंदुओं को किसी भी क्रम में जोड़ने के लिए अपनी अंगुली को अगली स्‍क्रीन पर स्लाइड करें. आपको कम से कम चार बिंदुओं को जोड़ना होगा. "\n\n"प्रारंभ करने के लिए तैयार हैं? अगला स्पर्श करें."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"व्यक्तिगत स्‍क्रीन अनलॉक प्रतिमान बनाकर अपने फ़ोन को अनधिकृत उपयोग से बचाएं. कम से कम चार बिंदुओं को किसी भी क्रम में जोड़ने के लिए अपनी अंगुली को अगली स्‍क्रीन पर स्लाइड करें. "\n\n"शुरू करने के लिए तैयार हैं? अगला स्पर्श करें."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"आपके फ़ोन पर एप्लिकेशन इंस्टॉल नहीं है."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"एप्लिकेशन प्रबंधित करें"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"इंस्‍टॉल किए गए एप्‍लिकेशन प्रबंधित करें और निकालें"</string>
     <string name="applications_settings" msgid="1721442176406964682">"एप्लिकेशन"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"अज्ञात स्रोतों से एप्लिकेशन इंस्टॉल करने दें"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"आपका टेबलेट एवं निजी डेटा अज्ञात स्रोतों के एप्‍लिकेशन के आक्रमण के प्रति अधिक भेद्य हैं. आप इस बात से सहमत हैं कि आप इन एप्‍लिकेशन के उपयोग परिणामस्वरूप आपके टेबलेट को होने वाली क्षति या डेटा की हानि के लिए पूर्ण रूप से ज़िम्मेदार हैं."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"आपका फ़ोन एवं निजी डेटा अज्ञात स्रोतों के एप्‍लिकेशन के आक्रमण के प्रति अधिक भेद्य हैं. आप इस बात से सहमत हैं कि आप इन एप्‍लिकेशन के उपयोग परिणामस्वरूप आपके फ़ोन को होने वाली क्षति या डेटा की हानि के लिए पूर्ण रूप से ज़िम्मेदार हैं."</string>
+    <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="application_info_label" msgid="5736524913065714880">"एप्‍लिकेशन जानकारी"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB संग्रहण डेटा"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD कार्ड"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"अनइंस्टॉल करें"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"सभी उपयोगकर्ताओं के लिए अनइंस्टॉल करें"</string>
+    <string name="install_text" msgid="884360662922471113">"इंस्टॉल करें"</string>
     <string name="disable_text" msgid="6544054052049395202">"अक्षम करें"</string>
     <string name="enable_text" msgid="9217362512327828987">"सक्षम करें"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"डेटा साफ़ करें"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"कैश की गई प्रक्रियाएं दिखाएं"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"एप्लि. प्राथमिकताएं रीसेट करें"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"एप्लि. प्राथमिकताएं रीसेट करें?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"इससे इनके लिए सभी प्राथमिकताएं रीसेट हो जाएंगी:"\n\n" "<li>"अक्षम एप्लिकेशन"</li>\n" "<li>"अक्षम एप्लिकेशन सूचनाएं"</li>\n" "<li>"क्रियाओं के लिए डिफ़ॉल्ट एप्लिकेशन"</li>\n" "<li>"एप्लिकेशन के लिए पृष्ठभूमि डेटा प्रतिबंध"</li>\n\n" आपका एप्लिकेशन डेटा नहीं खोएगा."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"इससे इनके लिए सभी प्राथमिकताएं रीसेट हो जाएंगी:\n\n "<li>"अक्षम एप्लिकेशन"</li>\n" "<li>"अक्षम एप्लिकेशन सूचनाएं"</li>\n" "<li>"क्रियाओं के लिए डिफ़ॉल्ट एप्लिकेशन"</li>\n" "<li>"एप्लिकेशन के लिए पृष्ठभूमि डेटा प्रतिबंध"</li>\n\n" आपका एप्लिकेशन डेटा नहीं खोएगा."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"एप्लिकेशन रीसेट करें"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"स्‍थान प्रबंधित करें"</string>
     <string name="filter" msgid="2018011724373033887">"फ़िल्टर"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"फ़िल्‍टर विकल्‍प चुनें"</string>
     <string name="filter_apps_all" msgid="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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD कार्ड पर"</string>
     <string name="disabled" msgid="9206776641295849915">"अक्षम किया गया"</string>
+    <string name="not_installed" msgid="1475144352069281880">"इंस्‍टॉल नहीं है"</string>
     <string name="no_applications" msgid="7336588977497084921">"कोई एप्‍लिकेशन नहीं."</string>
     <string name="internal_storage" msgid="1584700623164275282">"आंतरिक संग्रहण"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB संग्रहण"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> और <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"यह एप्लिकेशन आपसे शुल्क ले सकता है:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"प्रीमियम SMS भेजें?"</string>
     <string name="computing_size" msgid="1599186977475211186">"गणना कर रहा है…"</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"पैकेज आकार की गणना नहीं की जा सकी."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"आपके पास कोई भी तृतीय-पक्ष एप्‍लिकेशन इंस्‍टॉल नहीं है."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"नए एप्‍लिकेशन के लिए पसंदीदा इंस्‍टॉलेशन स्‍थान बदलें"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"अंतर्निहित एप्लि. अक्षम करें?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"यदि आप कोई अंतर्निहित एप्‍लिकेशन अक्षम करते हैं, तो अन्‍य एप्‍लिकेशन गलत व्यवहार कर सकते हैं."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"डेटा हटाएं और एप्लिकेशन को अक्षम करें?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"उपयोगकर्ता: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"निकाला गया उपयोगकर्ता"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> प्रक्रिया और <xliff:g id="NUMSERVICES">%2$d</xliff:g> सेवा"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> प्रक्रिया और <xliff:g id="NUMSERVICES">%2$d</xliff:g> सेवाएं"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> प्रक्रियाएं और <xliff:g id="NUMSERVICES">%2$d</xliff:g> सेवा"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"भौतिक कीबोर्ड सेटिंग"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"\".\" सम्‍मिलित करने के लिए Space कुंजी दो बार दबाएं"</string>
     <string name="show_password" msgid="3001113966880559611">"पासवर्ड दृश्यमान बनाएं"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></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>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"स्‍विच करने हेतु, Control-Spacebar दबाएं"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"डिफ़ॉल्ट"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"कीबोर्ड लेआउट"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"उपयोगकर्ता शब्‍दकोश"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"व्यक्तिगत डिक्शनरी"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"व्यक्तिगत डिक्शनरी"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"व्यक्तिगत शब्दकोष"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"जोड़ें"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"शब्‍दकोश में जोड़ें"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI स्‍नूप लॉग सक्षम करें"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"फ़ाइल के सभी Bluetooth HCI पैकेट कैप्‍चर करें"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"रनटाइम चुनें"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"रनटाइम चुनें"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"रनटाइम को <xliff:g id="OLD">%1$s</xliff:g> से <xliff:g id="NEW">%2$s</xliff:g> में बदलने के लिए रीबूट करें?"</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>
+    <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>
-    <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_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="enable_terminal_title" msgid="95572094356054120">"स्थानीय टर्मिनल"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"स्थानीय शेल एक्सेस ऑफ़र करने वाला टर्मिनल एप्लिकेशन सक्षम करें"</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>
@@ -1234,29 +1345,43 @@
     <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_toggle_large_text_title" msgid="6618674985313017711">"बड़ा पाठ"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"पावर बटन कॉल बंद करता है"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"पासवर्ड बोलें"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"स्‍पर्श करके रखने का विलंब"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"वेब पहुंचयोग्यता बढ़ाएं"</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>
+    <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_toggle_speak_password_preference_title" msgid="5986628515113204844">"पासवर्ड बोलें"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"स्‍पर्श करके रखने का विलंब"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"सेटिंग"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"चालू"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"बंद"</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="accessibility_feature_state_on" msgid="2864292320042673806">"चालू"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"बंद"</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="print_settings" msgid="4742428530112487843">"प्रिंटिंग"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"प्रिंटिंग सेटिंग"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"सेवाएं"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> का उपयोग करें?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> आपके द्वारा प्रिंट किए जाने वाले दस्तावेज़ों को प्राप्त कर सकती है. ऐसे दस्तावेज़ों में संवेदनशील डेटा हो सकता है."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"कोई सेवा इंस्‍टॉल नहीं है"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"सेटिंग"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"प्रिंटर जोड़ें"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"चालू"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"बंद"</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>
@@ -1268,22 +1393,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 चालू"</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>
     <string name="details_subtitle" msgid="32593908269911734">"विवरणों का उपयोग करें"</string>
-    <string name="controls_subtitle" msgid="390468421138288702">"पावर उपयोग समायोजित करें"</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>
@@ -1293,11 +1418,13 @@
     <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_data_send" msgid="3875198715268918671">"मोबाइल डेटा भेजा गया"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"मोबाइल डेटा प्राप्त हुआ"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Wi‑Fi डेटा भेजा गया"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Wi‑Fi डेटा प्राप्त हुआ"</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>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"एप्‍लिकेशन रोकें या अनइंस्‍टॉल करें"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"एप्‍लिकेशन द्वारा GPS का उपयोग किए जाने से रोकने के लिए GPS को मैन्‍युअल रूप से नियंत्रित करें"</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>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"पिच"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"बोले गए पाठ के लहजे को प्रभावित करता है"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"भाषा"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"भाषा नहीं चुनी गई है"</string>
     <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>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"चमक <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"स्वचालित"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"अधिकतम"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"आधा"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"बंद"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"क्रेडेंशियल संग्रहण"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"संग्रहण से इंस्‍टॉल करें"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <string name="backup_section_title" msgid="7952232291452882740">"बैकअप लें और पुनर्स्‍थापित करें"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"निजी डेटा"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"मेरे डेटा का बैक अप लें"</string>
-    <string name="backup_data_summary" msgid="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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"किसी एप्‍लिकेशन को पुन: इंस्‍टॉल करने पर, बैकअप ली गई सेटिंग और डेटा पुनर्स्‍थापित करें"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"बग रिपोर्ट लें"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"ईमेल संदेश के रूप में भेजने के लिए, इसके द्वारा आपके उपकरण की वर्तमान स्थिति के बारे में जानकारी एकत्रित की जाएगी. बग रिपोर्ट प्रारंभ करने से लेकर भेजने के लिए तैयार करने में कुछ समय लगेगा; कृपया धैर्य रखें."</string>
-    <string name="report" msgid="302437572240018342">"रिपोर्ट"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"डेस्‍कटॉप बैकअप पासवर्ड"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"डेस्‍कटॉप पूर्ण बैकअप वर्तमान में सुरक्षित नहीं हैं"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"डेस्कटॉप के पूर्ण बैकअप के पासवर्ड को बदलने या निकालने के लिए स्‍पर्श करें."</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,33 +1611,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>
@@ -1538,6 +1681,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>
@@ -1549,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"विंडो सतहें अपडेट होने पर उन सभी को फ़्लैश करें"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU दृश्‍य अपडेट दिखाएं"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPU के साथ आरेखित करने पर विंडो में दृश्‍यों को फ़्लैश करें"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"हार्डवेयर लेयर अप. दिखाएं"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"हार्डवेयर लेयर अपडेट होने पर हरे फ़्लैश होते हैं"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"GPU ओवरड्रॉ डीबग करें"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU उपयोग दिखाएं"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"स्‍क्रीन ओवरले वर्तमान CPU उपयोग को दिखा रहा है"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"बलपूर्वक GPU रेंडर करें"</string>
     <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>
+    <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>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"उपयोगकर्ता के छोड़ते ही प्रत्‍येक गतिविधि समाप्त करें"</string>
     <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>
@@ -1592,8 +1740,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>
@@ -1608,11 +1756,11 @@
     <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" msgid="1466689968707308512">"यह सुविधा केवल मोबाइल नेटवर्क उपलब्ध होने पर उस एप्ल‍िकेशन को कार्य करने से रोक सकती है जो पृष्ठभूमि डेटा पर निर्भर है."\n\n"आपको एप्ल‍िकेशन में उपलब्ध सेटिंग में अधिक उपयुक्त डेटा उपयोग नियंत्रण मिल सकते हैं."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"यह सुविधा केवल मोबाइल नेटवर्क उपलब्ध होने पर उस एप्ल‍िकेशन को कार्य करने से रोक सकती है जो पृष्ठभूमि डेटा पर निर्भर है.\n\nआपको एप्ल‍िकेशन में उपलब्ध सेटिंग में अधिक उपयुक्त डेटा उपयोग नियंत्रण मिल सकते हैं."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="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>
@@ -1621,22 +1769,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" 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>
@@ -1668,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">" VPN प्रोफ़ाइल जोड़ें"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"प्रोफ़ाइल संपादित करें"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"प्रोफ़ाइल हटाएं"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"हमेशा-चालू VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"वह VPN प्रोफ़ाइल चुनें जिससे हमेशा कनेक्ट रहना है. नेटवर्क ट्रैफ़िक की अनुमति केवल इस VPN से कनेक्ट रहने पर ही दी जाएगी."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"कोई नहीं"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"हमेशा-चालू VPN हेतु, सर्वर और DNS दोनों के लिए IP पता होना आवश्यक है."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"कोई नेटवर्क कनेक्शन नहीं है. कृपया बाद में पुन: प्रयास करें."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"प्रमाणपत्र गुम है. प्रोफ़ाइल संपा. करें."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"सिस्‍टम"</string>
@@ -1686,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"रद्द करें"</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">"अतिरिक्त सिस्‍टम अपडेट"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"उपयोगकर्ता और प्रतिबंध"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"उपयोगकर्ता"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"उपयोगकर्ता जोड़ें"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"विवरण संपादित करें"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"उपयोगकर्ता जानकारी"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"नाम"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"सामग्री प्रतिबंध"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"पिन आवश्‍यक है"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"सामग्री रेटिंग"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"सिस्टम एप्‍लिकेशन"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"इंस्‍टॉल किए गए एप्‍लिकेशन"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"छोड़ें"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"उपयोगकर्ता निकालें"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"शैतान बच्चा"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"अक्षम"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"अनुमति देने वाला"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"लागू किया जा रहा है"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"उपयोगकर्ता"</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="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_confirm_remove_message" msgid="5284111415714437285">"क्‍या आप वाकई उपकरण से उपयोगकर्ता और सभी संबंधित डेटा निकालना चाहते हैं?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"फ़ॉन्ट आकार बदलें"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"प्रतिबंध"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"प्रतिबंधों को निकालें"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"पिन बदलें"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"सूचना दिखाएं"</string>
     <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="user_restrictions_title" msgid="7745810037152772035">"एप्लिकेशन और सामग्री प्रतिबंध"</string>
+    <string name="user_rename" msgid="8523499513614655279">"नाम बदलें"</string>
+    <string name="app_restrictions_custom_label" msgid="6160672982086584261">"एप्लिकेशन प्रतिबंधों को सेट करें"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g> द्वारा नियंत्रित"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"यह एप्लिकेशन प्रतिबंधित प्रोफ़ाइल में समर्थित नहीं है"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"यह एप्लिकेशन आपके खातों को एक्सेस कर सकता है"</string>
+    <string name="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 0f87f8b..6ef5fdc 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,16 +218,127 @@
     <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="886742181977884584">"Mediji"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"medijski gumbi"</item>
+    <item msgid="4547883971364273343">"audiofokus"</item>
+    <item msgid="2603878814882344450">"glavna glasnoća"</item>
+    <item msgid="7136963238377062018">"glasnoća glasa"</item>
+    <item msgid="4270236897655923007">"glasnoća zvona"</item>
+    <item msgid="6325739889222559394">"glasnoća medija"</item>
+    <item msgid="5762123934816216821">"glasnoća alarma"</item>
+    <item msgid="785049718065337473">"glasnoća obavijesti"</item>
+    <item msgid="6700305533746877052">"glasnoća Bluetootha"</item>
+    <item msgid="2029227495214047094">"zadrži u aktivnom stanju"</item>
+    <item msgid="26109888160231211">"praćenje lokacije"</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>
+    <item msgid="5753789168376302997">"Medijski gumbi"</item>
+    <item msgid="3265262911688671938">"Audiofokus"</item>
+    <item msgid="2098976479485046797">"Glavna glasnoća"</item>
+    <item msgid="5660213838861789350">"Glasnoća glasa"</item>
+    <item msgid="7983336752371254444">"Glasnoća zvona"</item>
+    <item msgid="7878027809189330917">"Glasnoća medija"</item>
+    <item msgid="7260546305036218513">"Glasnoća alarma"</item>
+    <item msgid="9103719301075748925">"Glasnoća obavijesti"</item>
+    <item msgid="7025966722295861512">"Glasnoća Bluetootha"</item>
+    <item msgid="4665183401128289653">"Zadrži u aktivnom stanju"</item>
+    <item msgid="8584357129746649222">"Lokacija"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kratko"</item>
     <item msgid="2560532955514699713">"Srednje"</item>
     <item msgid="2372711992605524591">"Dugo"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (uklanjanje program. pogrešaka)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Upotrijebi Dalvik"</item>
+    <item msgid="5131846588686178907">"Upotrijebi ART"</item>
+    <item msgid="4530003713865319928">"Upotrijebi verziju ART-a za uklanjanje programskih pogrešaka"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nikad ne provjeravaj"</item>
     <item msgid="6042769699089883931">"Provjeri samo DRM sadržaj"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Animacija razmjera 5 x"</item>
     <item msgid="1069584980746680398">"Animacija razmjera 10 x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Ništa"</item>
+    <item msgid="688482401508173818">"720 x 480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280 x 720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280 x 720 tvdpi, 1920 x 1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Ništa"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Isključeno"</item>
+    <item msgid="7688197031296835369">"Pokaži područja slojnih iscrtavanja"</item>
+    <item msgid="8332661909019981149">"Pokaži brojač slojnih iscrtavanja"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardna granica"</item>
     <item msgid="4071574792028999443">"Nema pozadinskih procesa"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Privremeni prekid"</item>
     <item msgid="7664124146786465092">"Neuspješno"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Postavi pitanje"</item>
+    <item msgid="5077768429488260031">"Ne dopuštaj nikada"</item>
+    <item msgid="1417929597727989746">"Dopusti uvijek"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index c317c39..336d73c 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Da"</string>
     <string name="no" msgid="6731231425810196216">"Ne"</string>
     <string name="create" msgid="3578857613172647409">"Izradi"</string>
+    <string name="allow" msgid="3349662621170855910">"Dopusti"</string>
+    <string name="deny" msgid="6947806159746484865">"Odbij"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nepoznato"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Još <xliff:g id="STEP_COUNT">%1$d</xliff:g> korak i postat ćete razvojni programer."</item>
+    <item quantity="other" msgid="6722953419953594148">"Još <xliff:g id="STEP_COUNT">%1$d</xliff:g> koraka i postat ćete razvojni programer ."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Sad ste razvojni programer!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Nema potrebe, već ste razvojni programer."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEŽIČNO POVEZIVANJE i MREŽE"</string>
     <string name="header_category_device" msgid="5781174212691167553">"UREĐAJ"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"OSOBNO"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Punjenje"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Pražnjenje"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(bežično povezivanje)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Ne puni se"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ne puni se"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Puna"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Neuključeno"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"bežično povezivanje"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Nepoznato"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Nepoznato"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Nepoznata pogreška"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Hladno"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Moguće prepoznavanje"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Vidljivo svim Bluetooth uređajima u blizini (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Vidljivo svim Bluetooth uređajima u blizini"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nije vidljiv drugim Bluetooth uređajima"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Vidljivo samo uparenim uređajima"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Omogući prepoznavanje uređaja"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Vidljivost je istekla"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Odredite koliko će dugo biti moguće otkriti uređaj"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Zaključaj biranje glasom"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Spriječite upotrebu Bluetooth birača ako je zaslon zaključan"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth uređaji"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Prikaži primljene datoteke"</string>
     <string name="device_picker" msgid="8398232791303186677">"Birač Bluetooth uređaja"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Zatraženo je Bluetooth dopuštenje"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Aplikacija želi uključiti Bluetooth. Dopustiti?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Aplikacija na vašem tabletnom računalu želi omogućiti otkrivanje vašeg tabletnog računala drugim Bluetooth uređajima u trajanju od <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Dopustiti?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Aplikacija na vašem telefonu želi omogućiti otkrivanje vašeg telefona drugim Bluetooth uređajima u trajanju od <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Dopustiti?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Aplikacija na vašem tabletnom računalu želi omogućiti trajno otkrivanje vašeg tabletnog računala drugim Bluetooth uređajima. Dopustiti?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Aplikacija na vašem telefonu želi omogućiti trajno otkrivanje vašeg telefona drugim Bluetooth uređajima. Dopustiti?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Aplikacija na vašem tabletnom računalu želi uključiti Bluetooth i omogućiti otkrivanje vašeg tabletnog računala drugim uređajima u trajanju od <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Dopustiti?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Aplikacija na vašem telefonu želi uključiti Bluetooth i omogućiti prepoznavanje vašeg telefona drugim uređajima u trajanju od <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Dopustiti?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Aplikacija na vašem tabletnom računalu želi omogućiti otkrivanje vašeg tabletnog računala drugim Bluetooth uređajima. Dopustiti?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Aplikacija na vašem telefonu želi uključiti Bluetooth i omogućiti prepoznavanje vašeg telefona drugim uređajima. Dopustiti?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikacija želi uključiti Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikacija želi vaše tabletno računalo učiniti vidljivim drugim Bluetooth uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikacija želi vaš telefon učiniti vidljivim drugim Bluetooth uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikacija želi učiniti vaše tabletno računalo vidljivim drugim Bluetooth uređajima. To možete kasnije promijeniti u postavkama Bluetootha."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Aplikacija želi učiniti vaš telefon vidljivim drugim Bluetooth uređajima. To možete kasnije promijeniti u postavkama Bluetootha."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Aplikacija želi uključiti Bluetooth i vaše tabletno računalo učiniti vidljivim drugim uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Aplikacija želi uključiti Bluetooth i vaš telefon učiniti vidljivim drugim uređajima na <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Aplikacija želi uključiti Bluetooth i vaše tabletno računalo učiniti vidljivim drugim uređajima. To možete kasnije promijeniti u postavkama Bluetootha."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Aplikacija želi uključiti Bluetooth i vaš telefon učiniti vidljivim drugim uređajima. To možete kasnije promijeniti u postavkama Bluetootha."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Uključivanje Bluetootha…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Isključivanje Bluetootha?"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatsko povezivanje"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Preglednik upotrebljava HTTP proxy poslužitelj, ali druge aplikacije ne mogu ga upotrebljavati."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokacija:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Susjedski CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informacije o ćeliji:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokušaji za podatke:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS usluga:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Izgubili ste podatkovnu vezu jer ste isključili mrežni roaming podataka."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Uključi"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Ako omogućite roaming podataka, može doći do značajnih troškova roaminga!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Kada dopustite podatkovni roaming, mogu nastati značajni troškovi roaminga!\n\nOva postavka utječe na sve korisnike na ovom tabletu."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Kada dopustite podatkovni roaming, mogu nastati značajni troškovi roaminga!\n\nOva postavka utječe na sve korisnike na ovom telefonu."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Dopusti roaming podataka?"</string>
     <string name="networks" msgid="6333316876545927039">"Odabir operatora"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Odaberite mrežnog operatera"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info o vlasniku"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Traži brojčani PIN ili zaporku za dekripciju tablet računala svaki put kada se uključi"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Traži brojčani PIN ili zaporku za dekripciju telefona svaki put kada se uključi"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Kriptirano"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Možete kriptirati svoje račune, postavke, preuzete aplikacije i njihove podatkovne, multimedijske i ostale datoteke. Nakon kriptiranja tabletnog računala morate upisati numerički PIN ili zaporku kako biste ga dešifrirali svaki put kada ga uključite: svoje tabletno računalo možete dešifrirati samo vraćanjem u tvorničko stanje čime se brišu svi vaši podaci."\n\n"Enkripcija traje jedan sat ili dulje. Morate započeti s napunjenom baterijom i tabletno računalo držati priključeno dok se enkripcija ne završi. Ako prekinete postupak enkripcije, izgubit ćete neke ili sve svoje podatke."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Možete kriptirati svoje račune, postavke, preuzete aplikacije i njihove podatkovne, multimedijske i ostale datoteke. Nakon kriptiranja telefona morate upisati numerički PIN ili zaporku kako biste ga dešifrirali svaki put kada ga uključite. Svoj telefon možete dešifrirati samo vraćanjem na tvorničke postavke čime se brišu svi vaši podaci."\n\n"Enkripcija traje jedan sat ili dulje. Morate započeti s napunjenom baterijom i telefon držati priključen dok se enkripcija ne završi. Ako prekinete postupak enkripcije, izgubit ćete neke ili sve svoje podatke."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Možete kriptirati svoje račune, postavke, preuzete aplikacije i njihove podatkovne, multimedijske i ostale datoteke. Nakon kriptiranja tabletnog računala morate upisati numerički PIN ili zaporku kako biste ga dešifrirali svaki put kada ga uključite: svoje tabletno računalo možete dešifrirati samo vraćanjem u tvorničko stanje čime se brišu svi vaši podaci.\n\nEnkripcija traje jedan sat ili dulje. Morate započeti s napunjenom baterijom i tabletno računalo držati priključeno dok se enkripcija ne završi. Ako prekinete postupak enkripcije, izgubit ćete neke ili sve svoje podatke."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Možete kriptirati svoje račune, postavke, preuzete aplikacije i njihove podatkovne, multimedijske i ostale datoteke. Nakon kriptiranja telefona morate upisati numerički PIN ili zaporku kako biste ga dešifrirali svaki put kada ga uključite. Svoj telefon možete dešifrirati samo vraćanjem na tvorničke postavke čime se brišu svi vaši podaci.\n\nEnkripcija traje jedan sat ili dulje. Morate započeti s napunjenom baterijom i telefon držati priključen dok se enkripcija ne završi. Ako prekinete postupak enkripcije, izgubit ćete neke ili sve svoje podatke."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Kriptiraj tablet uređaj"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Kriptiraj telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Napunite bateriju i pokušajte ponovo."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Pokušajte ponovo za <xliff:g id="DELAY">^1</xliff:g> s."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Unesite svoju zaporku"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripcija neuspješna"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripcija je prekinuta i ne može se dovršiti. Podaci na vašem tabletnom računali zbog toga više nisu dostupni."\n\n"Da biste nastavili upotrebljavati svoje tabletno računalo, trebate provesti vraćanje u tvorničko stanje. Prilikom postavljanja tabletnog računala nakon vraćanja u tvorničko stanje imat ćete priliku vratiti sve podatke za koje ste na Google računu izradili sigurnosnu kopiju."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripcija je prekinuta i ne može se dovršiti. Stoga podaci na vašem telefonu više nisu dostupni. "\n\n"Da biste nastavili upotrebljavati ​​telefon, morate vratiti tvorničke postavke. Kada nakon toga postavite svoj telefon, imat ćete priliku vratiti sve podatke čije su sigurnosne kopije stvorene na vašem Google računu."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripcija je prekinuta i ne može se dovršiti. Podaci na vašem tabletnom računali zbog toga više nisu dostupni.\n\nDa biste nastavili upotrebljavati svoje tabletno računalo, trebate provesti vraćanje u tvorničko stanje. Prilikom postavljanja tabletnog računala nakon vraćanja u tvorničko stanje imat ćete priliku vratiti sve podatke za koje ste na Google računu izradili sigurnosnu kopiju."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripcija je prekinuta i ne može se dovršiti. Stoga podaci na vašem telefonu više nisu dostupni. \n\nDa biste nastavili upotrebljavati ​​telefon, morate vratiti tvorničke postavke. Kada nakon toga postavite svoj telefon, imat ćete priliku vratiti sve podatke čije su sigurnosne kopije stvorene na vašem Google računu."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Promjena načina unosa"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Odaberite zaključavanje zaslona"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Odabir sig. zaključ."</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Promijeni PIN za otključavanje"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Promijeni zaporku za otključavanje"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Zaporka mora imati najmanje ovoliko znakova: %d"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN mora imati najmanje ovoliko znakova %d"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN mora imati najmanje ovoliko znakova: %d"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Dodirnite Nastavak kad završite"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Nastavi"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Zaporka mora imati manje od ovoliko znakova: <xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kao telefonski zvučnik"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Za glazbu i medije"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamti postavke"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Upareni zasloni"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dostupni uređaji"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Povezivanje"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Povezan"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Dostupan"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"U upotrebi"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Postavke zaslona"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Isključiti?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"To će prekinuti vašu vezu s uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Opcije bežičnog prikaza"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Zaboravi"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Gotovo"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Naziv"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Uključeno"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Isključeno"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Onemogućeno"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Dopusti razmjenu podataka kada tabletno računalo dodiruje drugi uređaj"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Dopusti razmjenu podataka kada telefon dodiruje drugi uređaj"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Isključeno"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nije dostupno jer je NFC isključen"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="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="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\nJednostavno 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="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="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="8116564886303972764">"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_in_progress" msgid="2944576520214787628">"Već je u tijeku WPS, a do dovršetka može proteći do dvije minute"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Sigurnosna postavka bežičnog usmjerivača (TKIP) nije podržana"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentifikacija nije uspjela. Pokušajte ponovo."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Otkrivena je još jedna WPS sesija. Pokušajte ponovo za nekoliko minuta."</string>
     <string name="wifi_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>
@@ -564,6 +621,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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Spremi"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Spremanje mreže nije uspjelo"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Odustani"</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_skip_anyway" msgid="6965361454438011190">"Svejedno preskoči"</string>
+    <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\nZa 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\nZa postavljanje telefona može biti potrebna značajna mrežna aktivnost."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Traženje..."</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Preimenuj uređaj"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Paralelni uređaji"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Zapamćene grupe"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Povezivanje nije bilo moguće."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Preimenovanje uređaja nije uspjelo."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Isključiti?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Ako odspojite, prekinut će se veza s uređajem <xliff:g id="PEER_NAME">%1$s</xliff:g> i <xliff:g id="PEER_COUNT">%2$s</xliff:g> te ostalim uređajima."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Prijenosna pristupna WiFi točka"</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_p2p_delete_group_message" msgid="834559380069647086">"Zaboraviti ovu grupu?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prijenosna Wi-Fi žarišna točka"</string>
+    <string name="wifi_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 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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Glazbeni efekti"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Glasnoća zvona"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibracija ako je bešumno"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Zadana obavijest"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Zadani zvuk obavijesti"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsno svjetlo obavijesti"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvuk zvona"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Obavijest"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Koristi glasnoću dolaznog poziva za obavijesti"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Odabir melodije zvona obavijesti"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Zadani zvuk obavijesti"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Mediji"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Postavite glasnoću za glazbu i videozapise"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Pozadinska slika"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Odabir pozadinske slike iz"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Čuvar zaslona"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Pokreće se u mirovanju ako je priključeno napajanje"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Onemogućeno"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Odabrani čuvar"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Kada aktivirati"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> u mirovanju"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nikad"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Isprobajte!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Pokreni i na priključnoj stanici"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Sanjarenje"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kada je uređaj na priključnoj stanici ili kada miruje i puni se"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Bilo koje"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Tijekom punjenja"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Kada je na priključnoj stanici"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Isključeno"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Da biste kontrolirali događaje dok je telefon na priključnoj stanici i/ili dok miruje, uključite značajku Sanjarenje."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kada sanjariti"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Započni sad"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Postavke"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatska svjetlina"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Veličina fonta"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Netočan PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN-ovi se ne podudaraju"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Nije moguće promijeniti PIN."\n"PIN je možda netočan."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Nije moguće promijeniti PIN.\nPIN je možda netočan."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Uspješno je promijenjen PIN SIM-a"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Nije moguće promijeniti stanje zaključanosti SIM kartice."\n"Možda je PIN pogrešan."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Nije moguće promijeniti stanje zaključanosti SIM kartice.\nMožda je PIN pogrešan."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"U redu"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Odustani"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status tabletnog uređaja"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Osnovna verzija"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Verzija jezgre"</string>
     <string name="build_number" msgid="3075795840572241758">"Broj međuverzije"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Status SELinuxa"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nije dostupno"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -733,12 +807,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">"Vrsta mobilne mreže"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Informacije o operateru"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Stanje mobilne mreže"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Stanje usluge"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB memorija"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD kartica"</string>
     <string name="memory_available" msgid="5052397223077021181">"Dostupno"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Dostupno (samo za čitanje)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Ukupno prostora"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Izračun u tijeku..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikacije (podaci aplikacije i medijski sadržaj)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Slike, videozapisi"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (glazba, melodije zvona, podkastovi itd.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Razno"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Podaci iz predmemorije"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Isklj. dijeljenu pohranu"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Isključi SD karticu"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Isključi unutarnju USB memoriju"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Izbriši karticu SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Briše sve podatke na unutarnjoj memoriji USB, poput glazbe ili fotografija"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Briše sve podatke na kartici SD, poput glazbe i fotografija"</string>
-    <string name="read_only" msgid="6702420168629076340">" (samo za čitanje)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Brisati podatke iz predmemorije?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Obrisat ćete predmem. podatke za sve aplikacije."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP ili PTP funkcija aktivna je"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Isključiti USB pohranu?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Isključiti SD karticu?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Ako isključite USB pohranu, neke aplikacije koje upotrebljavate zaustavit će se i mogu biti nedostupne dok ponovo ne uključite USB pohranu."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Fotoaparat (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Omogućuje vam prijenos fotografija pomoću softvera fotoaparata i prijenos bilo koje datoteke na računala koji ne podržavaju MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instaliraj alate za prijenos datoteka"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Drugi korisnici"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Status baterije"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Razina baterije"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN-ovi"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Vraćanje na tvorničko stanje"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Briše sve podatke na tabletnom uređaju"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Izbriši sve podatke na telefonu"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" tabletnog računala, uključujući:"\n\n<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" telefona, uključujući:"\n\n<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutačno ste prijavljeni na sljedeće račune:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" tabletnog računala, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutačno ste prijavljeni na sljedeće račune:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Glazba"</li>\n<li>"Fotografije"</li>\n<li>"Ostali korisnički podaci"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, "<b>"USB pohrana"</b>" treba biti izbrisana."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, trebate izbrisati "<b>"SD karticu"</b>"."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> će biti oslobođen."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoć"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilne mreže"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Upravljanje mobilnim paketom"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Nepoznati SIM operater"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s nema poznatu web-lokaciju za niz usluga"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Umetnite SIM karticu i pokrenite ponovo"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Povežite se s internetom"</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>
@@ -917,6 +1004,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Prikaži pravne informacije, status, verziju softvera"</string>
     <string name="legal_information" msgid="5769301644270604095">"Pravne informacije"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Suradnici"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Informacije o propisima"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorska prava"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenca"</string>
     <string name="terms_title" msgid="7697580845616764642">"Uvjeti i odredbe"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Promijeni PIN za otključavanje"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potvrdi spremljeni uzorak"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Pokušajte ponovo:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Iscrtajte uzorak za otključavanje"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Iscrtajte uzorak za otključavanje:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pritisnite Izbornik za pomoć."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Maknite prst ako ste gotovi."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Povežite barem ovoliko točaka: <xliff:g id="NUMBER">%d</xliff:g>. Pokušajte ponovo:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kako iscrtati uzorak za otključavanje"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Previše netočnih pokušaja!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Pokušajte ponovo za <xliff:g id="NUMBER">%d</xliff:g> s."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Odustani"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Dalje"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Osiguravanje tabletnog uređaja"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Osiguravanje telefona"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Zaštitite svoje tabletno računalo od neautorizirane upotrebe stvaranjem osobnog uzorka za otključavanje zaslona. Klizite prstom kako biste točke na zaslonu povezali bilo kojim redoslijedom. Trebate povezati najmanje četiri točke."\n\n"Jeste li spremni? Dodirnite Dalje."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Zaštitite svoj telefon od neovlaštene upotrebe izradom vlastitog uzorka za otključavanje zaslona. Na sljedećem zaslonu klizite prstom da biste spojili najmanje četiri točke bilo kojim redoslijedom. "\n\n"Spremni za početak? Dodirnite \"Dalje\"."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Aplikacija nije instalirana na vašem telefonu."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Upravljanje aplikacijama"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Upravljanje instaliranim aplikacijama i njihovo uklanjanje"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplikacije"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Dopustite instalaciju aplikacija iz nepoznatih izvora"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Vaše tabletno računalo i osobni podaci izloženiji su napadima aplikacija iz nepoznatih izvora. Prihvaćate isključivu odgovornost za svu štetu nastalu na tabletnom računalu ili gubitak podataka uzrokovan upotrebom tih aplikacija."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Vaš telefon i osobni podaci izloženiji su napadima aplikacija iz nepoznatih izvora. Prihvaćate isključivu odgovornost za svu štetu nastalu na telefonu ili gubitak podataka uzrokovan upotrebom tih aplikacija."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Potvrdi aplikacije"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Onemogući ili upozori prije instalacije aplikacija koje mogu uzrokovati štetu"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Napredne postavke"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Omogućiti više opcija postavki"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informacije o aplikaciji"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB uređaj za pohranu podataka"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD kartica"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Deinstaliraj"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Deinstaliraj za sve korisnike"</string>
+    <string name="install_text" msgid="884360662922471113">"Instaliraj"</string>
     <string name="disable_text" msgid="6544054052049395202">"Onemogući"</string>
     <string name="enable_text" msgid="9217362512327828987">"Omogući"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Izbriši podatke"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Prikaži procese iz predmemorije"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Poništi postavke"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Poništiti postavke?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"To će poništiti sve postavke za:"\n\n" "<li>"onemogućene aplikacije"</li>\n" "<li>"onemogućene obavijesti aplikacija"</li>\n" "<li>"zadane aplikacije za radnje"</li>\n" "<li>"ograničenja pozadinskih podataka za aplikacije"</li>\n\n" Nećete izgubiti podatke iz aplikacija."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"To će poništiti sve postavke za:\n\n "<li>"onemogućene aplikacije"</li>\n" "<li>"onemogućene obavijesti aplikacija"</li>\n" "<li>"zadane aplikacije za radnje"</li>\n" "<li>"ograničenja pozadinskih podataka za aplikacije"</li>\n\n" Nećete izgubiti podatke iz aplikacija."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Poništi aplikacije"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostorom"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na SD kartici"</string>
     <string name="disabled" msgid="9206776641295849915">"Onemogućeno"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Nije instalirano"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nema aplikacija."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Unutarnja pohrana"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Memorija USB"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> i <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Ova aplikacija može naplaćivati upotrebu:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Pošalji premium SMS"</string>
     <string name="computing_size" msgid="1599186977475211186">"Izračunavanje..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Nije moguće izračunati veličinu paketa."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Nemate instaliranih aplikacija treće strane."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Promijenite željenu lokaciju instalacije za nove aplikacije."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Onemogući ugrađenu aplikaciju?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Ako onemogućite ugrađenu aplikaciju, druge će se aplikacije možda ponašati nepredviđeno."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Izbrisati podatke i onemogućiti aplikaciju?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Korisnik: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Uklonjeni korisnik"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces i <xliff:g id="NUMSERVICES">%2$d</xliff:g> usluga"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces i <xliff:g id="NUMSERVICES">%2$d</xliff:g> usluga"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"Broj procesa: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, broj usluga: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Postavke fizičke tipkovnice"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Pritisnite razmaknicu dvaput za umetanje \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Zaporke vidljive"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Ovaj način unosa možda može prikupljati sav tekst koji unosite, uključujući osobne podatke poput zaporki i brojeva kreditnih kartica. To omogućuje aplikacija <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Upotrijebiti taj način unosa?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Ovaj alat za provjeru pravopisa može prikupljati sav tekst koji upisujete, uključujući osobne podatke kao što su zaporke i brojevi kreditnih kartica. Dolazi s aplikacije <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Upotrebljavati taj alat za provjeru pravopisa?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Postavke"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Za prijelaz pritisnite Ctrl i razmaknicu."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Zadano"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Izgledi tipkovnice"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Korisnički rječnik"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Osobni rječnik"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osobni rječnici"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Osobni rječnik"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Dodaj"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Dodaj u rječnik"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Zaslon nikad neće prijeći u mirovanje tijekom punjenja"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Omogući zapisnik naredbe \"snoop\" za Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Snimi sve Bluetooth HCI pakete u datoteci"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Odabir vremena izvođenja"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Odabir vremena izvođenja"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Želite li pokrenuti ponovo da biste promijenili vrijeme izvođenja s <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Dopusti probne lokacije"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Dopusti probne lokacije"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Provjerite uzrokuju li aplikacije instalirane putem ADB-a/ADT-a poteškoće."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Zaštiti USB pohranu"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplikacije moraju tražiti dozvolu za čitanje USB pohrane"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Zaštititi USB pohranu?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Kad je USB pohrana zaštićena, aplikacije moraju tražiti dozvolu za čitanje podataka s vanjske pohrane."\n\n"Neke aplikacije možda neće raditi dok ih razvojni programeri ne ažuriraju."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Kad je USB pohrana zaštićena, aplikacije moraju tražiti dozvolu za čitanje podataka s vanjske pohrane.\n\nNeke aplikacije možda neće raditi dok ih razvojni programeri ne ažuriraju."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Zaštiti SD karticu"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikacije moraju tražiti dozvolu za čitanje SD kartice"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Zaštititi SD karticu?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Kad je SD kartica zaštićena, aplikacije moraju tražiti dozvolu za čitanje podataka s vanjske pohrane."\n\n"Neke aplikacije možda neće raditi dok ih razvojni programeri ne ažuriraju."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Kad je SD kartica zaštićena, aplikacije moraju tražiti dozvolu za čitanje podataka s vanjske pohrane.\n\nNeke aplikacije možda neće raditi dok ih razvojni programeri ne ažuriraju."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokalni terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Omogući aplikaciju terminala koja nudi pristup lokalnoj ovojnici"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Odaberi gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Odaberite widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Želite izraditi widget i dozvoliti pristup?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Postavke dostupnosti"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Usluge"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sustav"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Veliki tekst"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Prekid poziva tipkom za uključ."</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Izgovori zaporke"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Dodirnite i držite odgodu"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Poboljšavanje web-pristupačnosti"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Pokret povećavanja"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Ako je ova značajka uključena, možete povećati ili smanjiti prikaz ako triput dodirnete zaslon.\n\nNakon povećanja prikaza možete sljedeće:\n"<ul><li>"Pomicati: pomoću dva prsta ili više prstiju povlačite prikaz na zaslonu."</li>\n<li>"Podesiti razinu zumiranja: stisnite dva prsta ili više prstiju ili ih raširite."</li></ul>\n\n"Također možete privremeno povećati stavku ispod prsta ako je triput dodirnete i držite. U tom slučaju možete povlačiti prst kako biste istražili različite dijelove zaslona. Podignite prst kako biste se vratili na prijašnje stanje.\n\nNapomena: povećanje trostrukim dodirom moguće je svuda osim na tipkovnici i traci za navigaciju."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Prečac pristupačnosti"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Uključeno"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Isključeno"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kada je ova značajka uključena, možete brzo omogućiti značajke pristupačnosti u dva koraka:\n\n1. korak: pritisnite i držite gumb za uključivanje/isključivanje dok ne začujete zvuk ili osjetite vibraciju.\n\n2. korak: dodirnite i držite s dva prsta dok ne začujete zvučnu potvrdu.\n\nAko uređaj ima više korisnika, ovaj prečac na zaključanom zaslonu omogućuje pristupačnost dok se uređaj ne otključa."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Veliki tekst"</string>
+    <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 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_menu_item_settings" msgid="3344942964710773365">"Postavke"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Uključeno"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"Uključeno"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Isključeno"</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="print_settings" msgid="4742428530112487843">"Ispis"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Postavke ispisa"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Usluge"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Želite li upotrijebiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> može primati dokumente koje ispisujete. Takvi dokumenti mogu sadržavati osjetljive podatke."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nema instaliranih usluga"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Postavke"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Dodavanje pisača"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Uključeno"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Isključeno"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterija"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Što troši bateriju"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Podaci o iskorištenosti baterije nisu dostupni."</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Primljeni podaci"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Poslani mobilni podaci"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Primljeni mobilni podaci"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Poslani Wi‑Fi podaci"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Primljeni Wi‑Fi podaci"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Videozapis"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Vrijeme uključenosti"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Zaustavite ili deinstalirajte aplikaciju"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Ručno upravljajte GPS-om kako biste spriječili da ga aplikacija upotrebljava"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplikacija možda nudi postavke za smanjenje potrošnje baterije"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Baterija koju upotrebljava korisnik"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od isključivanja"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Kod posljednjeg isključivanja za <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Ukupno iskorištenje"</string>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Visina glasa"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Utječe na ton izgovorenog teksta"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Jezik"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Jezik nije odabran"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Postavlja jezik govora"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Poslušajte primjer"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Poslušajte primjer sinteze zvuka"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Svjetlina <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatski"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"potpuna"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"polovična"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"isključena"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Pohrana vjerodajnica"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instaliraj iz memorije"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Pri ponovnoj instalaciji aplikacije vratiti postavke i podatke za koje su stvorene sigurnosne kopije"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Izradi izvješće o bugu"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Time će se prikupiti informacije o trenutačnom stanju vašeg uređaja koje ćete nam poslati u e-poruci. Za pripremu izvješća o bugu potrebno je nešto vremena pa vas molimo za strpljenje."</string>
-    <string name="report" msgid="302437572240018342">"Prijavi"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Zaporka sigurnosne kopije"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Potpune sigurnosne kopije na stolnom računalu trenutačno nisu zaštićene"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Odaberite za promjenu ili uklanjanje zaporke u potpunim sigurnosnim kopijama na stolnom računalu"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nDodirnite "<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>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Bljeskanje cijele površine prozora pri ažuriranju"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Prikaži GPU ažur. prikaza"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Bljeskanje prikaza u prozorima pri crtanju GPU-om"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Prikaži ažuriranja hardverskih slojeva"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Neka hardverski slojevi bljeskaju zeleno kad se ažuriraju"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Ukl. pogr. GPU sl. iscrt."</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Prikaži upotrebu procesora"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Prekrivanje zaslona prikazuje trenutačnu upotrebu procesora"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Prisilno GPU renderiranje"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simuliraj sekund. zaslone"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikacije"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Uklanjanje aktivnosti"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Uništite svaku aktivnost čim je korisnik napusti"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Onemogući pozadinske podatke na mobilnim mrežama. Upotrijebit će se fiksne mreže ako su dostupne."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Za ograničenje poz. podat. za ovu apl. ograničite mob. podatke."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Ograničenje pozadinskih podataka?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Zbog te značajke aplikacija koja ovisi o pozadinskim podacima može prestati raditi kada su dostupne samo mobilne mreže."\n\n"U postavkama možete pronaći prikladnije kontrole prijenosa podataka."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Zbog te značajke aplikacija koja ovisi o pozadinskim podacima može prestati raditi kada su dostupne samo mobilne mreže.\n\nU postavkama možete pronaći prikladnije kontrole prijenosa podataka."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Ograničavanje pozadinskih podataka moguće je samo ako ste postavili ograničenje mobilnih podataka."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Uključiti auto. sinkronizaciju?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Sve promjene koje napravite na svojim računima na webu automatski će se kopirati na vaš tablet."\n\n"Neki računi također mogu automatski kopirati na web sve promjene koje napravite na tabletu. Tako funkcionira Google račun."\n\n"Da biste odabrali vrstu podataka koji će se za pojedini račun sinkronizirati, idite na Postavke &gt; Računi."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Sve promjene koje napravite na svojim računima na webu automatski će se kopirati na vaš telefon."\n\n"Neki računi također mogu automatski kopirati na web sve promjene koje napravite na telefonu. Tako funkcionira Google račun."\n\n"Da biste odabrali vrstu podataka koji će se za pojedini račun sinkronizirati, idite na Postavke &gt; Računi."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Sve promjene koje napravite na svojim računima na webu automatski će se kopirati na vaš tablet.\n\nNeki računi također mogu automatski kopirati na web sve promjene koje napravite na tabletu. Tako funkcionira Google račun.\n\nDa biste odabrali vrstu podataka koji će se za pojedini račun sinkronizirati, idite na Postavke &gt; Računi."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Sve promjene koje napravite na svojim računima na webu automatski će se kopirati na vaš telefon.\n\nNeki računi također mogu automatski kopirati na web sve promjene koje napravite na telefonu. Tako funkcionira Google račun.\n\nDa biste odabrali vrstu podataka koji će se za pojedini račun sinkronizirati, idite na Postavke &gt; Računi."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Isključiti auto. sinkronizaciju?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Time će se uštedjeti promet podataka i potrošnja baterije, ali svaki ćete račun morati ručno sinkronizirati kako biste dobili najnovije informacije. Nećete primati obavijesti o ažuriranjima."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum poništavanja ciklusa upotrebe"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Postavite upozorenje o upotrebi podataka"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Postavite ograničenje upotrebe podataka"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograničavanje upotrebe podataka"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Vaša podatkovna veza mobilnog uređaja bit će onemogućena kada dosegnete navedeno ograničenje.\n\nBuduć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\nBuduć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" 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\nOva 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\nOva 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Uklonjene aplikacije i korisnici"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"Primljeno: <xliff:g id="RECEIVED">%1$s</xliff:g>, poslano: <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>: upotrijebljeno otprilike <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>: 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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Dodavanje VPN profila"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Uredi profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Izbriši profil"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Uvijek uključena VPN mreža"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Odaberite VPN profil s kojim ćete uvijek biti povezani. Mrežni promet bit će dopušten samo kada ste povezani s tom VPN mrežom."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ništa"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Uvijek uključena VPN mreža zahtijeva IP adresu za poslužitelj i za DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Nema mrežne veze. Pokušajte ponovo kasnije."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Nedostaje certifikat. Uredite profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sustav"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Odustani"</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">"Dodatna ažuriranja sustava"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Korisnici i ograničenja"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Korisnici"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj korisnika"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Uređivanje pojedinosti"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Korisnički podaci"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Ime"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Ograničenja sadržaja"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Zahtijeva se PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Ocjena sadržaja:"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Aplikacije sustava"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Instalirane aplikacije"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Odbaci"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Ukloni korisnika"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Naporni klinac"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Onemogućeno"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Omogućeno"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Provođenje"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Korisnici"</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="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\nNakon što stvorite novog korisnika, ta osoba mora proći postupak postavljanja.\n\nBilo 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\nBilo 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_confirm_remove_message" msgid="5284111415714437285">"Jeste li sigurni da želite ukloniti korisnika i sve povezane podatke iz uređaja?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Promjena veličine fonta"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Ograničenja"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Uklanjanje ograničenja"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Promjena PIN-a"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Prikaži obavijesti"</string>
     <string name="help_label" msgid="1107174367904110532">"Pomoć"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Račun za sadržaj"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ID fotografije"</string>
     <string name="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="6160672982086584261">"Postavljanje ograničenja aplikacije"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Kontrolira aplikacija <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ta aplikacija nije podržana u ograničenim profilima"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ta aplikacija može pristupiti vašim računima"</string>
+    <string name="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 653f0b1..0971951 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,16 +218,127 @@
     <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="886742181977884584">"Média"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"médiagombok"</item>
+    <item msgid="4547883971364273343">"audiofókusz"</item>
+    <item msgid="2603878814882344450">"hangerő-szabályozó"</item>
+    <item msgid="7136963238377062018">"beszéd hangereje"</item>
+    <item msgid="4270236897655923007">"csengés hangereje"</item>
+    <item msgid="6325739889222559394">"média hangereje"</item>
+    <item msgid="5762123934816216821">"ébresztés hangereje"</item>
+    <item msgid="785049718065337473">"értesítés hangereje"</item>
+    <item msgid="6700305533746877052">"bluetooth hangereje"</item>
+    <item msgid="2029227495214047094">"ébren tartás"</item>
+    <item msgid="26109888160231211">"hely figyelése"</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>
+    <item msgid="5753789168376302997">"Médiagombok"</item>
+    <item msgid="3265262911688671938">"Audiofókusz"</item>
+    <item msgid="2098976479485046797">"Hangerő-szabályozó"</item>
+    <item msgid="5660213838861789350">"Beszéd hangereje"</item>
+    <item msgid="7983336752371254444">"Csengés hangereje"</item>
+    <item msgid="7878027809189330917">"Média hangereje"</item>
+    <item msgid="7260546305036218513">"Ébresztés hangereje"</item>
+    <item msgid="9103719301075748925">"Értesítés hangereje"</item>
+    <item msgid="7025966722295861512">"Bluetooth hangereje"</item>
+    <item msgid="4665183401128289653">"Ébren tartás"</item>
+    <item msgid="8584357129746649222">"Tartózkodási hely"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Rövid"</item>
     <item msgid="2560532955514699713">"Közepes"</item>
     <item msgid="2372711992605524591">"Hosszú"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (hibakeresési)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"A Dalvik használata"</item>
+    <item msgid="5131846588686178907">"Az ART használata"</item>
+    <item msgid="4530003713865319928">"Az ART hibakeresési verziójának használata"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Ellenőrzés soha"</item>
     <item msgid="6042769699089883931">"Csak DRM-tartalom ellenőrzése"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Animáció léptéke: 5x"</item>
     <item msgid="1069584980746680398">"Animáció léptéke: 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Egyik sem"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi és 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Semelyik"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Ki"</item>
+    <item msgid="7688197031296835369">"Tartalom-felülírási területek mutatása"</item>
+    <item msgid="8332661909019981149">"Tartalom-felülírási számláló mutatása"</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>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Időtúllépés"</item>
     <item msgid="7664124146786465092">"Sikertelen"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Kérdés"</item>
+    <item msgid="5077768429488260031">"Soha nem engedélyezem"</item>
+    <item msgid="1417929597727989746">"Engedélyezés mindig"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 6823779..c4b20f9 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Igen"</string>
     <string name="no" msgid="6731231425810196216">"Nem"</string>
     <string name="create" msgid="3578857613172647409">"Létrehozás"</string>
+    <string name="allow" msgid="3349662621170855910">"Engedélyezés"</string>
+    <string name="deny" msgid="6947806159746484865">"Elutasítás"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ismeretlen"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> lépésre van attól, hogy fejlesztő legyen."</item>
+    <item quantity="other" msgid="6722953419953594148">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> lépésre van attól, hogy fejlesztő legyen."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Ön mostantól már fejlesztő!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Nincs rá szükség, Ön már fejlesztő."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"VEZETÉK NÉLKÜLI és EGYÉB HÁLÓZATOK"</string>
     <string name="header_category_device" msgid="5781174212691167553">"ESZKÖZ"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"SZEMÉLYES"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Töltés"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(Hálózat)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Lemerülés"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(vezeték nélküli)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Nem tölt"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nem töltődik"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Tele"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Nincs bedugva"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"Hálózat"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"vezeték nélküli"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"Hálózat+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Ismeretlen"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Ismeretlen"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Ismeretlen hiba történt"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Közömbös"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Felderíthető"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Az összes közeli Bluetooth eszköz számára látható (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Az összes közeli Bluetooth eszköz számára látható"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nem látható a többi Bluetooth eszköz számára"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Csak párosított eszközök számára látható"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Az eszköz legyen felderíthető"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Láthatóság időkerete"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Állítsa be, milyen hosszan legyen felfedezhető az eszköz"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Hanghívás zárolása"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"A bluetooth tárcsázó használatának megakadályozása, ha a képernyő le van zárva"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth eszközök"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Beérkező fájlok megjelenítése"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth-eszközválasztó"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth engedélykérés"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Egy alkalmazás be akarja kapcsolni a Bluetooth funkciót. Engedélyezi?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"A táblagépen lévő egyik alkalmazás felfedezhetővé akarja tenni a táblagépet más eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig. Engedélyezi?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"A telefonon lévő egyik alkalmazás felfedezhetővé akarja tenni a telefont más eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig. Engedélyezi?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"A táblagépen lévő egyik alkalmazás \"mindig felfedezhető\" állapotúvá szeretné tenni táblagépét más Bluetooth eszközök számára. Engedélyezi?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"A telefonon lévő egyik alkalmazás \"mindig felfedezhető\" állapotúvá szeretné tenni telefonját más Bluetooth eszközök számára. Engedélyezi?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"A táblagépen lévő egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a táblagépet felfedezhetővé akarja tenni más eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig. Engedélyezi?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"A telefonon lévő egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a telefont felfedezhetővé akarja tenni más eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig. Engedélyezi?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"A táblagépen lévő egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a táblagépet felfedezhetővé akarja tenni más eszközök számára. Engedélyezi?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"A telefonon lévő egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a telefont felfedezhetővé akarja tenni más eszközök számára. Engedélyezi?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Egy alkalmazás be akarja kapcsolni a Bluetooth funkciót."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Egy alkalmazás láthatóvá akarja tenni a táblagépet más Bluetooth-eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Egy alkalmazás láthatóvá akarja tenni a telefont más Bluetooth-eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Az egyik alkalmazás láthatóvá akarja tenni a táblagépet más eszközök számára. Ezt később módosíthatja a Bluetooth beállításokban."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Az egyik alkalmazás láthatóvá akarja tenni a telefont más eszközök számára. Ezt később módosíthatja a Bluetooth beállításokban."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Az egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a táblagépet láthatóvá akarja tenni más eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Az egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a telefont láthatóvá akarja tenni más eszközök számára <xliff:g id="TIMEOUT">%1$d</xliff:g> másodpercig."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Az egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a táblagépet láthatóvá akarja tenni más eszközök számára. Ezt később módosíthatja a Bluetooth beállításokban."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Az egyik alkalmazás be akarja kapcsolni a Bluetooth funkciót, és a telefont láthatóvá akarja tenni más eszközök számára. Ezt később módosíthatja a Bluetooth beállításokban."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth bekapcsolása?"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth kikapcsolása…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatikus csatlakozás"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"A HTTP proxyt a böngésző használja, ám más alkalmazások nem használhatják."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Hely:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Környező CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Cellainformáció:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Adatkísérletek:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS szolgáltatás:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Barangolás:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Megszakadt az adatkapcsolat, mert elhagyta az otthoni hálózatot, és az adatbarangolás nincs bekapcsolva."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Bekapcsolás"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Ha engedélyezi az adatbarangolást, akkor jelentős barangolási költség merülhet fel!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Az adatbarangolás engedélyezése jelentős díjnövekedéssel járhat.\n\nEz a beállítás minden felhasználót érint ezen a táblagépen."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Az adatbarangolás engedélyezése jelentős díjnövekedéssel járhat.\n\nEz a beállítás minden felhasználót érint ezen a telefonon."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Engedélyezi az adatbarangolást?"</string>
     <string name="networks" msgid="6333316876545927039">"Szolgáltatóválasztás"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Válassza ki a hálózat üzemeltetőjét"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Tulajdonosi adatok"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"A táblagép titkosításának feloldásához kérjen minden bekapcsoláskor egy számokból álló PIN kódot vagy jelszót"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"A telefon titkosításának feloldásához kérjen minden bekapcsoláskor egy számokból álló PIN kódot vagy jelszót"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Titkosítva"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Titkosíthatja a fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha titkosítja táblagépét, akkor minden bekapcsolásakor be kell írnia egy numerikus PIN kódot vagy jelszót a titkosítás feloldásához: táblagépének titkosítását nem tudja visszavonni, kivéve, ha visszaállítja a gyári adatokat, és minden adatot töröl a gépről."\n\n"A titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kezdjen hozzá, és a titkosítás befejezéséig hagyja töltőn a táblagépet. Ha megszakítja a titkosítási folyamatot, akkor elveszíti néhány vagy az összes adatát."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Titkosíthatja a fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha titkosítja telefonját, akkor minden bekapcsolásakor be kell írnia egy numerikus PIN kódot vagy jelszót a titkosítás feloldásához: telefonjának titkosítását nem tudja visszavonni, kivéve, ha visszaállítja a gyári adatokat, és minden adatot töröl a gépről."\n\n"A titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kezdjen hozzá, és a titkosítás befejeződéséig hagyja töltőn a telefonját. Ha megszakítja a titkosítási folyamatot, akkor elveszíti néhány vagy az összes adatát."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Titkosíthatja a fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha titkosítja táblagépét, akkor minden bekapcsolásakor be kell írnia egy numerikus PIN kódot vagy jelszót a titkosítás feloldásához: táblagépének titkosítását nem tudja visszavonni, kivéve, ha visszaállítja a gyári adatokat, és minden adatot töröl a gépről.\n\nA titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kezdjen hozzá, és a titkosítás befejezéséig hagyja töltőn a táblagépet. Ha megszakítja a titkosítási folyamatot, akkor elveszíti néhány vagy az összes adatát."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Titkosíthatja a fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha titkosítja telefonját, akkor minden bekapcsolásakor be kell írnia egy numerikus PIN kódot vagy jelszót a titkosítás feloldásához: telefonjának titkosítását nem tudja visszavonni, kivéve, ha visszaállítja a gyári adatokat, és minden adatot töröl a gépről.\n\nA titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kezdjen hozzá, és a titkosítás befejeződéséig hagyja töltőn a telefonját. Ha megszakítja a titkosítási folyamatot, akkor elveszíti néhány vagy az összes adatát."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Táblagép titkosítása"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefon titkosítása"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Töltse fel az akkumulátort, és próbálja újra."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Próbálja újra <xliff:g id="DELAY">^1</xliff:g> másodperc múlva."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Írja be a jelszavát"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"A titkosítás sikertelen"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"A titkosítás megszakadt, és nem lehet befejezni. Ezért a táblagépen található adatokhoz nem lehet hozzáférni. "\n\n"Ahhoz, hogy újra használni tudja táblagépét, vissza kell állítani a gyári beállításokat. Amikor a visszaállítás után beállítja táblagépét, lehetősége lesz minden adat visszaállítására, amelyet a rendszer tárolt a Google Fiókjában."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"A titkosítás megszakadt, és nem lehet befejezni. Ezért a telefonon található adatokhoz nem lehet hozzáférni. "\n\n"Ahhoz, hogy újra használni tudja telefonját, vissza kell állítani a gyári beállításokat. Amikor a visszaállítás után beállítja telefonját, lehetősége lesz minden adat visszaállítására, amelyet a rendszer eltárolt a Google Fiókjában."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"A titkosítás megszakadt, és nem lehet befejezni. Ezért a táblagépen található adatokhoz nem lehet hozzáférni. \n\nAhhoz, hogy újra használni tudja táblagépét, vissza kell állítani a gyári beállításokat. Amikor a visszaállítás után beállítja táblagépét, lehetősége lesz minden adat visszaállítására, amelyet a rendszer tárolt a Google Fiókjában."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"A titkosítás megszakadt, és nem lehet befejezni. Ezért a telefonon található adatokhoz nem lehet hozzáférni. \n\nAhhoz, hogy újra használni tudja telefonját, vissza kell állítani a gyári beállításokat. Amikor a visszaállítás után beállítja telefonját, lehetősége lesz minden adat visszaállítására, amelyet a rendszer eltárolt a Google Fiókjában."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Beviteli mód váltása"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Képernyőzár választása"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Biztonsági zárolás"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"A feloldó PIN-kód módosítása"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Feloldási jelszó módosítása"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"A jelszónak legalább %d karakter hosszúnak kell lennie"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"A PIN-kódnak legalább %d karakter hosszúnak kell lennie"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"A PIN kódnak legalább %d számjegyűnek kell lennie."</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Ha kész, érintse meg a Folytatás gombot"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Folytatás"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"A jelszónak rövidebbnek kell lennie <xliff:g id="NUMBER">%d</xliff:g> karakternél."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Telefonhangszóróként"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Zenéhez és médiához"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Beállítások megjegyzése"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Párosított kijelzők"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Elérhető eszközök"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Csatlakozás"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Csatlakozva"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Elérhető"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Használatban"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Megjelenítési beállítások"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Megszakítja?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Ezzel befejezi a kapcsolatot a következővel:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Vezeték nélküli kijelzés beállításai"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Elfelejt"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Kész"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Név"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Be"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Ki"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Letiltva"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tegye lehetővé az adatcserét, ha a táblagép érintkezik egy másik eszközzel."</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Lehetővé teszi az adatok cseréjét, ha a telefon érintkezik egy másik készülékkel"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Ki"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nem érhető el, mert az NFC ki van kapcsolva"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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\nMindö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="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="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="8116564886303972764">"Írja be a Wi-Fi router azonosító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_in_progress" msgid="2944576520214787628">"A WPS már folyamatban van, és legfeljebb 2 percet vesz igénybe."</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"A vezeték nélküli router biztonsági beállítása (TKIP) nem támogatott."</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Azonsítási hiba. Kérjük, próbálja újra."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Egy másik WPS-munkamenetet észleltünk. Kérjük, próbálkozzon újra néhány perc múlva."</string>
     <string name="wifi_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>
@@ -564,6 +621,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\nEngedé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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Mentés"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nem sikerült menteni a hálózatot."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Mégse"</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_skip_anyway" msgid="6965361454438011190">"Mégis kihagyom"</string>
+    <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\nA 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\nA 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="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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Keresés..."</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Eszköz átnevezése"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Partnereszközök"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Megjegyzett csoportok"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"A kapcsolódás sikertelen."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Nem sikerült átnevezni az eszközt."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Megszakítja?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Ha bontja a kapcsolatot, akkor megszakad a kapcsolat a következőkkel: <xliff:g id="PEER_NAME">%1$s</xliff:g> és <xliff:g id="PEER_COUNT">%2$s</xliff:g> további eszköz."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Hordozható Wi-Fi hotspot"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Elfelejtse ezt a csoportot?"</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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Zenei hatások"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Csengetés hangereje"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Rezgés néma üzemmódban"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Alapértelmezett értesítés"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Alapértelmezett értesítési hang"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Villogó értesítő fény"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Csengőhang"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Értesítés"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Bejövő hívások hangerejének használata az értesítéseknél"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Válasszon értesítési csengőhangot"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Alapértelmezett értesítési hang"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Média"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Zenék és videók hangerejének beállítása"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Ébresztő"</string>
@@ -660,7 +732,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>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitás után"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Háttérkép"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Válasszon tapétát innen:"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Képernyővédő"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Alvó módban elindul, ha hálózati feszültségről üzemel"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Letiltva"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Kiválasztott modul"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Mikor aktiválódjon"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tétlenség után"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Soha"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Próbálja ki!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Dokkolt állapotban is induljon el"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Álmodozás"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Dokkolt vagy alvó állapotban, töltés közben"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Bármelyik"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Töltés közben"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Dokkolt állapotban"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Ki"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Az Álmodozás bekapcsolásával beállíthatja, hogy mit csináljon a telefon dokkolt vagy alvó állapotban."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Álmodozás ideje"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Indítás most"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Beállítások"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatikus fényerő"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Betűméret"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Betűméret"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM-kártya PIN-kódja"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Helytelen PIN kód"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"A PIN kódok nem egyeznek"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Nem lehet megváltoztatni a PIN kódot."\n"Lehet, hogy hibás a PIN kód."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Nem lehet megváltoztatni a PIN kódot.\nLehet, hogy hibás a PIN kód."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"A SIM-kártya PIN-kódja sikeresen módosításra került"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Nem lehet megváltoztatni a SIM-kártya zárolási állapotát."\n"Lehet, hogy hibás a PIN kód."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Nem lehet megváltoztatni a SIM-kártya zárolási állapotát.\nLehet, hogy hibás a PIN kód."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Mégse"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Táblagép állapota"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Alapsáv verziója"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel verziója"</string>
     <string name="build_number" msgid="3075795840572241758">"Build-szám"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux állapota"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nem érhető el"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Állapot"</string>
     <string name="device_status" msgid="607405385799807324">"Állapot"</string>
@@ -733,12 +807,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">"Mobilhálózat típusa"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Operátoradatok"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Mobilhálózat állapota"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Szolgáltatás állapota"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-tár"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kártya"</string>
     <string name="memory_available" msgid="5052397223077021181">"Elérhető"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Elérhető (csak olvasható)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Összes hely"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Számítás..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Alkalmazások (alkalmazásadatok és médiatartalom)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Képek, videók"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Hang (zene, csengőhangok, podcastok stb.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Egyéb."</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Gyorsítótárazott adatok"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Megosztott tárh. levál."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-kártya leválasztása"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"A belső USB-tár leválasztása"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD-kártya törlése"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Minden adat, például zenék és képek törlése a belső USB-tárról"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Törli az összes adatot (például a zenéket és fotókat) az SD-kártyáról"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Írásvédett)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Törli a gyorsítótárban tárolt adatokat?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Ez törli az alkalmazások gyorsítótárbeli adatait"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"aktív MTP vagy PTP funkcióval"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Leválasztja az USB-tárat?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"SD-kártya leválasztása?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Ha leválasztja az USB-tárat, akkor néhány használt alkalmazás leáll, és lehet, hogy addig nem lesz elérhető, amíg újra nem csatlakoztatja az USB-tárat."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Lehetővé teszi a fotók átvitelét a fényképezőgép szoftverével, valamint bármely fájl átvitelét olyan számítógépeken, amelyek nem támogatják az MTP-t"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Fájlátviteli eszközök telepítése"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Egyéb felhasználók"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Akkumulátor állapota"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akkumulátorszint"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN-ek"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Gyári adatok visszaállítása"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Törli az összes adatot a táblagépről"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Minden adat törlése a telefonról"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ez minden adatot töröl a táblagép "<b>"belső tárolójáról"</b>", többek között: "\n" "\n<li>"Google Fiókját"</li>\n<li>"A rendszer- és alkalmazásadatokat és beállításokat"</li>" "\n" "<li>"A letöltött alkalmazásokat"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Ez minden adatot töröl a telefon "<b>"belső tárolójáról"</b>", többek között: "\n" "\n<li>"Google Fiókját"</li>\n<li>"A rendszer- és alkalmazásadatokat és beállításokat"</li>" "\n" "<li>"A letöltött alkalmazásokat"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jelenleg a következő fiókokba van bejelentkezve:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ez minden adatot töröl a táblagép "<b>"belső tárolójáról"</b>", többek között: \n \n"<li>"Google Fiókját"</li>\n<li>"A rendszer- és alkalmazásadatokat és beállításokat"</li>" \n "<li>"A letöltött alkalmazásokat"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Ez minden adatot töröl a telefon "<b>"belső tárolójáról"</b>", többek között: \n \n"<li>"Google Fiókját"</li>\n<li>"A rendszer- és alkalmazásadatokat és beállításokat"</li>" \n "<li>"A letöltött alkalmazásokat"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jelenleg a következő fiókokba van bejelentkezve:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Zene"</li>\n<li>"Fotók"</li>\n<li>"Más felhasználói adatok"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"USB-tárat"</b>" is törölnie kell."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"SD-kártyát"</b>" is törölnie kell."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> megosztása meg lesz szüntetve."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Súgó"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilhálózatok"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Mobil-előfizetés kezelése"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Ismeretlen SIM kártya szolgáltató"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s – nincs ismert hozzáférés-kezelő webhely"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Helyezze be a SIM kártyát és indítsa újra"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Csatlakozzon az internethez"</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>
@@ -917,6 +1004,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Jogi információk, állapot, szoftververzió megtekintése"</string>
     <string name="legal_information" msgid="5769301644270604095">"Jogi információk"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Közreműködők"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Szabályozási információk"</string>
     <string name="copyright_title" msgid="865906688917260647">"Szerzői jog"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenc"</string>
     <string name="terms_title" msgid="7697580845616764642">"Általános Szerződési Feltételek"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"A feloldó PIN-kód módosítása"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Erősítse meg az elmentett mintát"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Próbálja újra:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Rajzoljon egy feloldási mintát"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Rajzoljon feloldómintát:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Nyomja meg a Menü gombot, ha segítségre van szüksége."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Emelje fel az ujját, ha kész."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Kapcsoljon össze legalább <xliff:g id="NUMBER">%d</xliff:g> pontot. Próbálkozzon újra:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Hogyan kell feloldási mintát rajzolni"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Túl sok helytelen próbálkozás!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Próbálja újra <xliff:g id="NUMBER">%d</xliff:g> másodperc múlva."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Mégse"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Tovább"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"A táblagép védelme"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"A telefon védelme"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Védje meg táblagépét a jogosulatlan használattól egy személyes képernyőfeloldási minta létrehozásával. Ujjával tetszőleges sorrendben kösse össze a pontokat a következő képernyőn. Legalább négy pontot össze kell kötnie. "\n\n"Készen áll? Érintse meg a Tovább gombot."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Védje meg telefonját a jogosulatlan használattól egy személyes képernyőfeloldási minta létrehozásával. Ujjával tetszőleges sorrendben kössön össze legalább négy pontot a következő képernyőn. "\n\n"Készen áll? Érintse meg a Tovább gombot."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Az alkalmazás már nincs telepítve a telefonján."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Alkalmazások kezelése"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Telepített alkalmazások kezelése és eltávolítása"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Alkalmazások"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Ismeretlen forrású alkalmazásokat is lehessen telepíteni"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"A táblagépre és a személyes adatokra sokkal nagyobb veszélyt jelentenek az ismeretlen forrásból származó alkalmazások támadásai. Ön kijelenti, hogy egyedül Ön felel a táblagépen bekövetkező minden olyan kárért vagy adatvesztésért, amely ezen alkalmazások használatából fakad."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"A telefonra és a személyes adatokra sokkal nagyobb veszélyt jelentenek az ismeretlen forrásból származó alkalmazások támadásai. Ön kijelenti, hogy egyedül Ön felel a telefonon bekövetkező minden olyan kárért vagy adatvesztésért, amely ezen alkalmazások használatából fakad."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Alkalmazások ellenőrzése"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Tiltás vagy figyelmeztetés az olyan alkalmazások telepítése előtt, amelyek károsak lehetnek"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Speciális beállítások"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"További beállítási lehetőségek engedélyezése"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Alkalmazásinformáció"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-adatok"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kártya"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Eltávolítás"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Eltávolítás minden felhasználónál"</string>
+    <string name="install_text" msgid="884360662922471113">"Telepítés"</string>
     <string name="disable_text" msgid="6544054052049395202">"Letiltás"</string>
     <string name="enable_text" msgid="9217362512327828987">"Engedélyezés"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Adatok törlése"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Tárolt folyamatok"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Alapbeállítások"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Visszaállítja a beállításokat?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ez visszaállítja az összes beállítást a következőknél:"\n\n" "<li>"Letiltott alkalmazások"</li>\n" "<li>"Letiltott alkalmazásokkal kapcsolatos értesítések"</li>\n" "<li>"Alapértelmezett alkalmazások az egyes műveletekhez"</li>\n" "<li>"Háttéradatokra vonatkozó korlátozások az alkalmazásoknál"</li>\n\n" Az alkalmazásokban található adatok nem fognak elveszni."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ez visszaállítja az összes beállítást a következőknél:\n\n "<li>"Letiltott alkalmazások"</li>\n" "<li>"Letiltott alkalmazásokkal kapcsolatos értesítések"</li>\n" "<li>"Alapértelmezett alkalmazások az egyes műveletekhez"</li>\n" "<li>"Háttéradatokra vonatkozó korlátozások az alkalmazásoknál"</li>\n\n" Az alkalmazásokban található adatok nem fognak elveszni."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Alapbeállítások"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Terület kezelése"</string>
     <string name="filter" msgid="2018011724373033887">"Szűrő"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Válasszon szűrési lehetőségeket"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Az SD-kártyán"</string>
     <string name="disabled" msgid="9206776641295849915">"Letiltva"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Nincs telepítve"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nincsenek alkalmazások."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Belső tárhely"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-tár"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> és <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Ez az alkalmazás díjat számíthat fel:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Emelt díjas SMS küldése"</string>
     <string name="computing_size" msgid="1599186977475211186">"Számítás..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"A csomag méretének kiszámítása sikertelen."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Nincsenek telepítve harmadik fél által készített alkalmazások."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Az új alkalmazások telepítése során előnyben részesített hely módosítása"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Beépített alkalmazás letiltása?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Ha letiltja a beépített alkalmazást, más alkalmazások hibásan működhetnek."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Szeretné törölni az adatokat és letiltani az alkalmazást?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Felhasználó: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Eltávolított felhasználó"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> folyamat és <xliff:g id="NUMSERVICES">%2$d</xliff:g> szolgáltatás"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> folyamat és <xliff:g id="NUMSERVICES">%2$d</xliff:g> szolgáltatás"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> folyamat és <xliff:g id="NUMSERVICES">%2$d</xliff:g>szolgáltatás"</string>
@@ -1128,8 +1226,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="show_password_summary" msgid="7345931695292850058"></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>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Váltáshoz nyomja meg a Control+szóköz billentyűkódot"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Alapértelmezett"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Billentyűzetkiosztások"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Felhasználói szótár"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Személyes szótár"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Személyes szótárak"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Személyes szótár"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Hozzáadás"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Hozzáadás a szótárhoz"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"A képernyő soha nem kapcsol ki töltés során"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI snoop napló engedélyezése"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Az összes Bluetooth HCI-csomag rögzítése egy fájlban"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Futtatási környezet kiválasztása"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Futtatási környezet kiválasztása"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Újraindítja, hogy a futtatási környezet módosuljon <xliff:g id="OLD">%1$s</xliff:g> beállításról <xliff:g id="NEW">%2$s</xliff:g> beállításra?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Helyutánzatok engedélyezése"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Helyutánzatok engedélyezése"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Az ADB/ADT útján telepített alkalmazások ellenőrzése kártékony viselkedésre."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USB-tár védetté tétele"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Alkalmazások kérjenek engedélyt az USB-n lévő adatok olvasására"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Védetté teszi az USB-tárat?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Ha az USB-háttértár védett, az alkalmazásoknak engedélyt kell kérniük a külső tárhelyen tárolt adatok olvasására."\n\n"Előfordulhat, hogy egyes alkalmazások nem működnek addig, amíg a fejlesztők nem frissítik azokat."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Ha az USB-háttértár védett, az alkalmazásoknak engedélyt kell kérniük a külső tárhelyen tárolt adatok olvasására.\n\nElőfordulhat, hogy egyes alkalmazások nem működnek addig, amíg a fejlesztők nem frissítik azokat."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SD-kártya védetté tétele"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Az alkalmazások kérjenek engedélyt az SD-kártya olvasására"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Védetté teszi az SD-kártyát?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Ha az SD-kártya védett, az alkalmazásoknak engedélyt kell kérniük a külső tárhelyen tárolt adatok olvasására."\n\n"Előfordulhat, hogy egyes alkalmazások nem működnek addig, amíg a fejlesztők nem frissítik azokat."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Ha az SD-kártya védett, az alkalmazásoknak engedélyt kell kérniük a külső tárhelyen tárolt adatok olvasására.\n\nElőfordulhat, hogy egyes alkalmazások nem működnek addig, amíg a fejlesztők nem frissítik azokat."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Helyi végpont"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Végalkalmazás engedélyezése a helyi rendszerhéj eléréséhez"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Modul kiválasztása"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Modul kiválasztása"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Létrehozza a modult, és engedélyezi a hozzáférést?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Kisegítő lehetőségek beállításai"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Szolgáltatások"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Rendszer"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Nagy szöveg"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"A bekapcsoló gomb megszakítja a hívást"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Jelszavak kimondása"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Érintés és tartási késleltetés"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Webelérhetőség fokozása"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Nagyítási kézmozdulatok"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Ha a funkció be van kapcsolva, úgy kicsinyíthet/nagyíthat, hogy háromszor rákoppint a képernyőre.\n\nNagyított állapotban:\n"<ul><li>"Pásztázhat: Két vagy több ujját húzza végig a képernyőn."</li>\n<li>"Módosíthatja a nagyítási szintet: Két ujját húzza össze vagy távolítsa el egymástól."</li></ul>\n\n"Ideiglenesen felnagyíthatja az ujja alatt lévő részt is, úgy hogy hármat koppint és lenyomva hagyja ujját. A nagyított nézetben az ujját húzva fedezheti fel a képernyő más részeit is. Az ujja felemelésével visszatérhet az előző állapotra.\n\nMegjegyzés: A háromszoros koppintással való nagyítás a billentyűzet és a navigációs sáv kivételével mindenhol működik."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Hozzáférési gyorskombináció"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Be"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Ki"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Ha a funkció engedélyezve van, gyorsan elérheti a kisegítő lehetőségeket két lépésben:\n\n1. lépés: tartsa lenyomva a bekapcsológombot a hangjelzésig vagy rezgésig.\n\n2. lépés: két ujját tartsa lenyomva a hangjelzéssel történő jóváhagyásig.\n\nHa az eszközt több felhasználó is használja, akkor e kombináció zárolási képernyőn való használatával ideiglenesen hozzáférhetővé válik az eszköz, amíg fel nem oldják azt."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Nagy szöveg"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Képernyőnagyítás"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Képernyőnagyítás automatikus frissítése"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Nagyítás frissítése az alkalmazások közti átmeneteknél"</string>
+    <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_menu_item_settings" msgid="3344942964710773365">"Beállítások"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Be"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"be"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Ki"</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="print_settings" msgid="4742428530112487843">"Nyomtatás"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Nyomtatási beállítások"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Szolgáltatások"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Használja a következő szolgáltatást: <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"A(z) <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> képes fogadni az Ön által nyomtatott dokumentumokat, amelyek bizalmas adatokat tartalmazhatnak."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nincs telepített szolgáltatás"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Beállítások"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Nyomtatók hozzáadása"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Be"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Ki"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Akkumulátor"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Mi használta az akkumulátort"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Nincs akkuhasználati adat"</string>
@@ -1268,14 +1393,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>
@@ -1283,21 +1408,23 @@
     <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>
-    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tétlen táblagép esetén"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Táblagép - tétlen"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon - tétlen"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU teljes"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-használat az előtérben"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ébren tartás"</string>
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Fogadott adatok"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Küldött mobiladat"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Fogadott mobiladat"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Küldött Wi‑Fi adat"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Fogadott Wi-Fi adat"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Hang"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Videó"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Bekapcsolva eltöltött idő"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Alkalmazás leállítása vagy eltávolítása"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"A GPS kézi irányítása annak megakadályozására, hogy az alkalmazások használják"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Az alkalmazás felkínálhat olyan beállításokat, amelyek csökkentik az energiafelhasználást"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"A felhasználó akkumulátorhasználata"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> az utolsó töltés óta"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Töltés nélkül eltöltött idő: <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Használat összesen"</string>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Hangmagasság"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"A beszélt szöveg hangszínét befolyásolja"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Nyelv"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nincs nyelv kiválasztva"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Beállítja a beszélt szöveg nyelvspecifikus hangját"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Példa meghallgatása"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Rövid demonstráció megtekintése a beszédszintézisről"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Fényerő: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatikus"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"teljes"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"fél"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"ki"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Hitelesítési adatok tárolója"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Telepítés tárhelyről"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Amikor újratelepít egy alkalmazást, a biztonsági mentésből állítsa helyre a beállításait és az adatokat"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Hibajelentés készítése"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Ezzel információt fog gyűjteni az eszköz jelenlegi állapotáról, amelyet a rendszer e-mailben fog elküldeni. Kérjük, legyen türelemmel, amíg a hibajelentés elkészül, és küldhető állapotba kerül."</string>
-    <string name="report" msgid="302437572240018342">"Jelentés"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Asztali mentés jelszava"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Az asztali teljes biztonsági mentések jelenleg nem védettek."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Érintse meg, ha módosítaná vagy eltávolítaná a jelszót az asztali teljes mentésekhez"</string>
@@ -1426,7 +1570,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>
@@ -1442,15 +1586,15 @@
     <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>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Lista frissítése"</string>
-    <string name="wifi_setup_skip" msgid="6661541841684895522">"Kihagyás"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Átugrás"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Tovább"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"Vissza"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"Hálózati információk"</string>
@@ -1467,9 +1611,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>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Naptár"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Címtár"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Üdvözli a Google Sync!"</font>" "\n"Az adatok Google-féle szinkronizálása lehetővé teszi, hogy bárhonnan hozzáférjen címtárához, találkozóihoz stb."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Üdvözli a Google Sync!"</font>" \nAz adatok Google-féle szinkronizálása lehetővé teszi, hogy bárhonnan hozzáférjen címtárához, találkozóihoz stb."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Alkalmazás-szinkronizálási beállítások"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Adatok és szinkronizálás"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Jelszó módosítása"</string>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"A teljes ablakfelület villogjon frissítéskor."</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU-nézetfriss. megjel."</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Ablakbeli nézetek villognak GPU-s rajznál."</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Hardverréteg-frissítések"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Frissítéskor a hardverrétegek zölden villognak"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"GPU tartalom-felülírási hibakeresés"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU-használat mutatása"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Képernyőfedvény a jelenlegi CPU-használattal"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU-megjelenítés"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Másodlagos kijelzők szimulálása"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Alkalmazások"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Törölje a tevékenységeket"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Tevékenységek törlése, amint elhagyják azokat"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Háttéradatok kikapcsolása mobilhálózaton. Nem mobil hálózatok használata."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Háttéradatok korlátozásához előbb állítson be mobiladatkorlátot."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Korlátozza a háttéradatokat?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Lehetséges, hogy e funkció miatt a háttéradatoktól függő alkalmazások nem fognak működni, ha csak mobilhálózatok állnak rendelkezésre."\n\n"Az alkalmazásban lévő beállítások között megfelelőbb adathasználati beállításokat találhat."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Lehetséges, hogy e funkció miatt a háttéradatoktól függő alkalmazások nem fognak működni, ha csak mobilhálózatok állnak rendelkezésre.\n\nAz alkalmazásban lévő beállítások között megfelelőbb adathasználati beállításokat találhat."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"A háttéradatok korlátozása csak akkor lehetséges, ha beállított mobil adatkorlátot."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Bekapcsolja a szinkronizálást?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Az interneten végrehajtott fiókmódosítások automatikusan megjelennek táblagépén is."\n\n"Egyes fiókok esetében ez fordítva is igaz. A Google Fiók az utóbbi szerint működik."\n\n"Annak kiválasztásához, hogy mi legyen szinkronizálva az egyes fiókokon belül, menjen a Beállítások &gt; Fiókok lehetőségre."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Az interneten végrehajtott fiókmódosítások automatikusan megjelennek telefonján is."\n\n"Egyes fiókok esetében ez fordítva is igaz. A Google Fiók az utóbbi szerint működik."\n\n"Annak kiválasztásához, hogy mi legyen szinkronizálva az egyes fiókokon belül, menjen a Beállítások &gt; Fiókok lehetőségre."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Az interneten végrehajtott fiókmódosítások automatikusan megjelennek táblagépén is.\n\nEgyes fiókok esetében ez fordítva is igaz. A Google Fiók az utóbbi szerint működik.\n\nAnnak kiválasztásához, hogy mi legyen szinkronizálva az egyes fiókokon belül, menjen a Beállítások &gt; Fiókok lehetőségre."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Az interneten végrehajtott fiókmódosítások automatikusan megjelennek telefonján is.\n\nEgyes fiókok esetében ez fordítva is igaz. A Google Fiók az utóbbi szerint működik.\n\nAnnak kiválasztásához, hogy mi legyen szinkronizálva az egyes fiókokon belül, menjen a Beállítások &gt; Fiókok lehetőségre."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Kikapcsolja a szinkronizálást?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Ez mérsékelni fogja az adat- és akkumulátorhasználatot, de minden egyes fiókot manuálisan kell majd szinkronizálnia a legfrissebb információk begyűjtéséhez. Továbbá nem fog értesítéseket kapni a frissítésekről."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Használati ciklus visszaállításának ideje"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Adathasználati figyelmeztetés beállítása"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Adathasználati korlát beállítása"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Adatforgalom korlátozása"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"A mobilhálózat adatkapcsolatát a rendszer letiltja a megadott korlát elérésekor.\n\nMivel 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\nMivel 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" 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\nEz 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\nEz 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Eltávolított alkalmazások és felhasználók"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> érkezett, <xliff:g id="SENT">%2$s</xliff:g> elküldve"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: kb. <xliff:g id="TOTAL">%1$s</xliff:g> felhasználva"</string>
     <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>
@@ -1648,7 +1800,7 @@
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec felhasználói tanúsítvány"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA tanúsítvány"</string>
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec-szervertanúsítvány"</string>
-    <string name="vpn_show_options" msgid="7182688955890457003">"speciális lehetőségek megjelenítése"</string>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Speciális beállítások megjelenítése"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS keresési domainek"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS szerverek (pl. 8.8.8.8)"</string>
     <string name="vpn_routes" msgid="3818655448226312232">"Átirányítási útvonalak (pl. 10.0.0.0/8)"</string>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"VPN-profil hozzáadása"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Profil szerkesztése"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Profil törlése"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Mindig bekapcsolt VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Válasszon ki egy VPN-profilt, amelyhez mindig csatlakozni szeretne. A hálózati forgalom csak akkor lesz engedélyezve, ha ehhez a VPN-hez csatlakozik."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Egyik sem"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"A mindig bekapcsolt VPN-hez a szerver és a DNS IP-címe is szükséges."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Nincs hálózati kapcsolat. Próbálja újra később."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Egy tanúsítvány hiányzik. Kérjük, módosítsa a profilt."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Rendszer"</string>
@@ -1687,24 +1843,86 @@
     <!-- no translation found for percentage (5866131581207788624) -->
     <skip />
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"További rendszerfrissítések"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Felhaszn. és korlátozások"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Felhasználók"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Felhasználó hozzáad."</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Részletek szerkesztése"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Felhasználói adatok"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Név"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Tartalmi korlátozások"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"PIN-kód kérése"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Tartalom besorolása"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Rendszeralkalmazások"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Telepített alkalmazások"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Elvetés"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Felhasználó törlése"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Bosszantó gyerek"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Letiltva"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Engedélyezve"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Kényszerítve"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Felhasználók"</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="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 \nMiután létrehoz egy új felhasználót, az adott személynek el kell végeznie egy telepítési folyamatot.\n\nMinden 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 \nMinden 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_confirm_remove_message" msgid="5284111415714437285">"Biztosan eltávolítja a felhasználót és az összes hozzá kapcsolódó adatot az eszközről?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Betűméret módosítása"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Korlátozások"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Korlátozások feloldása"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN kód módosítása"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Értesítések megjelenítése"</string>
     <string name="help_label" msgid="1107174367904110532">"Súgó"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Tartalom fiókja"</string>
+    <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="6160672982086584261">"Alkalmazáskorlátozások beállítása"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"A(z) <xliff:g id="APP">%1$s</xliff:g> irányítja"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Az alkalmazás nem támogatott korlátozott profilok esetében"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ez az alkalmazás hozzáfér az Ön fiókjaihoz"</string>
+    <string name="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 12f3cd9..b2a7df5 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,16 +218,127 @@
     <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="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"tombol media"</item>
+    <item msgid="4547883971364273343">"fokus audio"</item>
+    <item msgid="2603878814882344450">"volume master"</item>
+    <item msgid="7136963238377062018">"volume suara"</item>
+    <item msgid="4270236897655923007">"volume dering"</item>
+    <item msgid="6325739889222559394">"volume media"</item>
+    <item msgid="5762123934816216821">"volume alarm"</item>
+    <item msgid="785049718065337473">"volume pemberitahuan"</item>
+    <item msgid="6700305533746877052">"volume bluetooth"</item>
+    <item msgid="2029227495214047094">"tetap aktif"</item>
+    <item msgid="26109888160231211">"monitor lokasi"</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>
+    <item msgid="5753789168376302997">"Tombol media"</item>
+    <item msgid="3265262911688671938">"Fokus audio"</item>
+    <item msgid="2098976479485046797">"Volume utama"</item>
+    <item msgid="5660213838861789350">"Volume suara"</item>
+    <item msgid="7983336752371254444">"Volume dering"</item>
+    <item msgid="7878027809189330917">"Volume media"</item>
+    <item msgid="7260546305036218513">"Volume alarm"</item>
+    <item msgid="9103719301075748925">"Volume pemberitahuan"</item>
+    <item msgid="7025966722295861512">"Volume bluetooth"</item>
+    <item msgid="4665183401128289653">"Tetap aktif"</item>
+    <item msgid="8584357129746649222">"Lokasi"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Singkat"</item>
     <item msgid="2560532955514699713">"Sedang"</item>
     <item msgid="2372711992605524591">"Lama"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (debug)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Gunakan Dalvik"</item>
+    <item msgid="5131846588686178907">"Gunakan ART"</item>
+    <item msgid="4530003713865319928">"Gunakan bentukan debug ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Jangan periksa"</item>
     <item msgid="6042769699089883931">"Periksa hanya konten DRM"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Skala animasi 5x"</item>
     <item msgid="1069584980746680398">"Skala animasi 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Tidak ada"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi and 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Tidak ada"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <item msgid="5397807424362304288">"Systrace (Grafis)"</item>
+    <item msgid="1340692776955662664">"Panggil tumpukan di glGetError"</item>
+  </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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Nonaktif"</item>
+    <item msgid="7688197031296835369">"Tampilkan area overdraw"</item>
+    <item msgid="8332661909019981149">"Lihat penghitung overdraw"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Batas standar"</item>
     <item msgid="4071574792028999443">"Tanpa proses latar belakang"</item>
@@ -274,7 +426,12 @@
     <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">
+    <item msgid="7389829271787670252">"Tanya"</item>
+    <item msgid="5077768429488260031">"Jangan pernah izinkan"</item>
+    <item msgid="1417929597727989746">"Selalu izinkan"</item>
+  </string-array>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c1c2c2c..cd37a1e 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Ya"</string>
     <string name="no" msgid="6731231425810196216">"Tidak"</string>
     <string name="create" msgid="3578857613172647409">"Buat"</string>
+    <string name="allow" msgid="3349662621170855910">"Izinkan"</string>
+    <string name="deny" msgid="6947806159746484865">"Tolak"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Tidak diketahui"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Tinggal <xliff:g id="STEP_COUNT">%1$d</xliff:g> langkah untuk menjadi pengembang."</item>
+    <item quantity="other" msgid="6722953419953594148">"Tinggal <xliff:g id="STEP_COUNT">%1$d</xliff:g> langkah untuk menjadi pengembang."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Sekarang Anda adalah seorang pengembang!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Tidak perlu, Anda sudah menjadi pengembang."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"NIRKABEL &amp; JARINGAN"</string>
     <string name="header_category_device" msgid="5781174212691167553">"PERANGKAT"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PRIBADI"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Mengisi daya"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Pengosongan"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(nirkabel)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Tidak mengisi daya"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Tidak mengisi daya"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Penuh"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Dicabut"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"nirkabel"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Tidak diketahui"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Tidak diketahui"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Kesalahan tidak dikenal"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Dingin"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Dapat ditemukan"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Terlihat utk semua perangkat Bluetooth terdekat (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Terlihat untuk semua perangkat Bluetooth terdekat"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Tidak terlihat oleh perangkat Bluetooth lain"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Hanya terlihat oleh perangkat yang disandingkan"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Buat perangkat dapat ditemukan"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Batas waktu keterlihatan"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Setel berapa lama perangkat dapat ditemukan"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Kunci pemanggilan suara"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Mencegah penggunaan aplikasi telepon Bluetooth ketika layar terkunci"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Perangkat bluetooth"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Tampilkan file yang diterima"</string>
     <string name="device_picker" msgid="8398232791303186677">"Pemilih perangkat bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Permintaan izin bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Sebuah apl ingin menghidupkan Bluetooth. Izinkan?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Sebuah apl pada tablet Anda ingin membuat tablet dapat ditemukan oleh perangkat Bluetooth lainnya selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik. Izinkan?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Sebuah apl pada ponsel Anda ingin membuat ponsel dapat ditemukan oleh perangkat Bluetooth yang lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik. Izinkan?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Sebuah apl pada tablet Anda ingin membuat tablet \"selalu ditemukan\" oleh perangkat Bluetooth lainnya. Izinkan?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Sebuah apl pada ponsel ingin membuat ponsel Anda \"selalu ditemukan\" oleh perangkat Bluetooth lainnya. Izinkan?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Sebuah apl pada tablet Anda ingin mengaktifkan Bluetooth dan membuatnya dapat ditemukan oleh perangkat lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik. Izinkan?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Sebuah apl pada ponsel Anda ingin mengaktifkan Bluetooth dan membuat ponsel dapat ditemukan oleh perangkat lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik. Izinkan?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Sebuah apl pada tablet Anda ingin mengaktifkan Bluetooth dan membuatnya dapat ditemukan oleh perangkat lain. Izinkan?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Sebuah apl pada ponsel Anda ingin mengaktifkan Bluetooth dan membuatnya dapat ditemukan oleh perangkat lain. Izinkan?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Sebuah aplikasi ingin mengaktifkan Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Sebuah aplikasi ingin menampilkan tablet Anda pada perangkat Bluetooth lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Sebuah aplikasi ingin menampilkan ponsel Anda pada perangkat Bluetooth lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Sebuah aplikasi ingin menampilkan ponsel Anda di perangkat Bluetooth lain. Anda dapat mengubah ini nanti di setelan Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Sebuah aplikasi ingin menampilkan ponsel Anda di perangkat Bluetooth lain. Anda dapat mengubah ini nanti di setelan Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Sebuah aplikasi ingin mengaktifkan Bluetooth dan menampilkan tablet Anda di perangkat lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Sebuah aplikasi ingin mengaktifkan Bluetooth dan menampilkan ponsel Anda di perangkat lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> detik."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Sebuah aplikasi ingin mengaktifkan Bluetooth dan menampilkan tablet Anda di perangkat lain. Anda dapat mengubah ini nanti di setelan Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Sebuah aplikasi ingin mengaktifkan Bluetooth dan menampilkan ponsel Anda di perangkat lain. Anda dapat mengubah ini nanti di setelan Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Menyalakan Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Mematikan Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Sambung-otomatis"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP digunakan oleh browser, namun tidak boleh digunakan oleh apl lain."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasi:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID bersebelahan:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Upaya data:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Layanan GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Anda telah kehilangan konektivitas data karena Anda meninggalkan jaringan asal dalam keadaan roaming data dimatikan."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Hidupkan"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Saat Anda mengizinkan roaming data, Anda dapat dikenai tagihan roaming yang tinggi!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Jika Anda mengizinkan roaming data, Anda mungkin dikenai tagihan roaming!\n\nSetelan ini memengaruhi semua pengguna di tablet ini."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Jika Anda mengizinkan roaming data, Anda mungkin dikenai tagihan roaming!\n\nSetelan ini memengaruhi semua pengguna di ponsel ini."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Izinkan roaming data?"</string>
     <string name="networks" msgid="6333316876545927039">"Pilihan operator"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Pilih operator jaringan"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info pemilik"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Memerlukan PIN atau sandi angka untuk mengurai enkripsi tablet tiap kali Anda menyalakannya"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Memerlukan PIN atau sandi angka untuk mengurai enkripsi ponsel tiap kali Anda menyalakannya"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Dienkripsi"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Anda dapat mengenkripsi akun, setelan, apl yang diunduh dan datanya, media, serta file lainnya. Setelah mengenkripsi tablet, Anda perlu memasukkan PIN numerik atau sandi untuk mendekripsinya setiap kali Anda menyalakannya. Anda tidak dapat membatalkan enkripsi tablet kecuali dengan mengembalikannya ke setelan pabrik yang akan menghapus seluruh data Anda."\n\n"Enkripsi memakan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan terus menghubungkan tablet dengan sumber daya hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data Anda."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Anda dapat mengenkripsi akun, setelan, apl yang diunduh dan datanya, media, serta file lainnya. Setelah mengenkripsi ponsel, Anda perlu memasukkan PIN numerik atau sandi untuk mendekripsinya setiap kali Anda menghidupkannya. Anda tidak dapat membatalkan enkripsi ponsel kecuali dengan mengembalikan ke setelan pabrik dan akan menghapus seluruh data Anda."\n\n"Enkripsi memakan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan terus menghubungkan ponsel dengan sumber daya hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data Anda."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Anda dapat mengenkripsi akun, setelan, apl yang diunduh dan datanya, media, serta file lainnya. Setelah mengenkripsi tablet, Anda perlu memasukkan PIN numerik atau sandi untuk mendekripsinya setiap kali Anda menyalakannya. Anda tidak dapat membatalkan enkripsi tablet kecuali dengan mengembalikannya ke setelan pabrik yang akan menghapus seluruh data Anda.\n\nEnkripsi memakan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan terus menghubungkan tablet dengan sumber daya hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data Anda."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Anda dapat mengenkripsi akun, setelan, apl yang diunduh dan datanya, media, serta file lainnya. Setelah mengenkripsi ponsel, Anda perlu memasukkan PIN numerik atau sandi untuk mendekripsinya setiap kali Anda menghidupkannya. Anda tidak dapat membatalkan enkripsi ponsel kecuali dengan mengembalikan ke setelan pabrik dan akan menghapus seluruh data Anda.\n\nEnkripsi memakan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan terus menghubungkan ponsel dengan sumber daya hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data Anda."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Enkripsi tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Enkripsi ponsel"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Isi daya baterai Anda dan coba lagi."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Coba lagi dalam <xliff:g id="DELAY">^1</xliff:g> detik."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Ketikkan sandi Anda"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripsi gagal"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data pada tablet Anda tidak dapat diakses lagi. "\n\n" Untuk terus menggunakan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data di ponsel Anda tidak dapat diakses lagi. "\n\n" Untuk terus menggunakan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan ponsel setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data pada tablet Anda tidak dapat diakses lagi. \n\n Untuk terus menggunakan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data di ponsel Anda tidak dapat diakses lagi. \n\n Untuk terus menggunakan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan ponsel setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Beralih metode masukan"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pilih kunci layar"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pilih gembok cadangan"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Ubah PIN pembuka kunci"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ubah sandi pembuka kunci"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Sandi minimal %d karakter"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN minimal terdiri dari %d karakter"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN paling tidak harus sepanjang %d digit"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Sentuh Lanjutkan setelah selesai"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Lanjutkan"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Sandi harus kurang dari <xliff:g id="NUMBER">%d</xliff:g> karakter."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sebagai pengeras suara telepon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Untuk musik dan media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ingat setelan"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Layar yang disandingkan"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Perangkat yang tersedia"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Menyambung"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Tersambung"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Tersedia"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Sedang digunakan"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Setelan layar"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Putuskan sambungan?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Ini akan mengakhiri sambungan Anda dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Opsi layar nirkabel"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Lupakan"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Selesai"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Nama"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Nyala"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Mati"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Dinonaktifkan"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Memungkinkan pertukaran data saat tablet bersentuhan dengan perangkat lain"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Memungkinkan pertukaran data saat ponsel bersentuhan dengan perangkat lain"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Mati"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Tidak tersedia karena NFC dimatikan"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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\nCukup 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="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="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="8116564886303972764">"Masukkan pin <xliff:g id="NUMBER">%1$s</xliff:g> pada router Wi-Fi Anda. Penyiapan perlu hingga dua menit sampai 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_in_progress" msgid="2944576520214787628">"WPS sedang berlangsung dan perlu hingga dua menit sampai selesai."</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Pengaturan keamanan router nirkabel (TKIP) tidak didukung"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Pengesahan gagal. Harap coba lagi."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Terdeteksi sesi WPS lainnya. Coba lagi setelah beberapa menit."</string>
     <string name="wifi_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>
@@ -564,6 +621,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\nIzinkan 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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Simpan"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Gagal menyimpan jaringan"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Batal"</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_skip_anyway" msgid="6965361454438011190">"Lewati saja"</string>
+    <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\nPenyiapan 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\nPenyiapan ponsel mungkin memerlukan aktivitas jaringan yang signifikan."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Menelusuri…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Ganti nama perangkat"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Perangkat P2P"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Grup yang diingat"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Tidak dapat menyambung."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Gagal mengubah nama perangkat."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Putuskan sambungan?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Jika diputuskan, sambungan Anda dengan <xliff:g id="PEER_NAME">%1$s</xliff:g> dan <xliff:g id="PEER_COUNT">%2$s</xliff:g> perangkat lain akan berakhir."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portabel"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Lupakan grup ini?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Hotspot Wi-Fi portabel"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Efek musik"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume dering"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Getar saat senyap"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Pemberitahuan default"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Suara pemberitahuan default"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Kedipkan lampu pemberitahuan"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Nada dering"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Pemberitahuan"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Gunakan volume panggilan masuk untuk pemberitahuan"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Pilih nada dering pemberitahuan"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Suara pemberitahuan default"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Media"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Setel volume untuk musik dan video"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
@@ -660,7 +732,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>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Setelah tidak aktif selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pilih wallpaper dari"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Permen Layar"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Akan dimulai saat memasuki mode tidur jika terhubung ke daya listrik"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Nonaktif"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Permen terpilih"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Waktu pengaktifan"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Setelah menganggur selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Tidak akan"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Cobalah!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Juga dimulai ketika dipasangkan pada dok"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Lamunan"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Saat di dok atau tidur dan mengisi baterai"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Salah satu"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Saat mengisi daya"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Selagi di dok"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Mati"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Untuk mengontrol apa yang terjadi saat ponsel di dok dan/atau sedang tidur, nyalakan Lamunan."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Waktu melamun"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Mulai sekarang"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Setelan"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan otomatis"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Ukuran font"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Ukuran font"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN salah"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN tidak cocok"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Tidak dapat mengubah PIN."\n"PIN mungkin salah."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Tidak dapat mengubah PIN.\nPIN mungkin salah."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN SIM berhasil diubah"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Tidak bisa mengubah status kunci kartu SIM."\n"PIN Mungkin salah."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Tidak bisa mengubah status kunci kartu SIM.\nPIN Mungkin salah."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Oke"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Batal"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status tablet"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versi pita basis"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versi kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Nomor bentukan"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"status SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Tidak tersedia."</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -733,12 +807,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">"Jenis jaringan seluler"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Info operator"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Kondisi jaringan seluler"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Status layanan"</string>
     <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>
@@ -748,14 +823,16 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Penyimpanan USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Kartu SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"Tersedia"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Tersedia (hanya baca)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Total ruang"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Menghitung..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikasi (konten media &amp; data aplikasi)"</string>
+    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikasi (data &amp; konten media)"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Unduhan"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Gambar, video"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (musik, nada dering, podcast, dll.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Serbaneka"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Data dalam cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Lepas penyimpanan bersama"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Lepaskan kartu SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Lepas penyimpanan USB internal"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Hapus kartu SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Hapus semua data di penyimpanan USB internal, seperti musik dan foto"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Hapus semua data di kartu SD, seperti musik dan foto"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Hanya-baca)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Hapus data dalam cache?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Ini akan menghapus data cache untuk semua apl."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Fungsi MTP atau PTP aktif"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Lepas penyimpanan USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Lepaskan kartu SD?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Jika Anda melepas penyimpanan USB, beberapa apl yang Anda gunakan akan berhenti dan mungkin tidak tersedia hingga Anda memasang kembali penyimpanan USB."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Memungkinkan Anda mentransfer foto menggunakan perangkat lunak kamera, dan mentransfer file apa pun di komputer yang tidak mendukung MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Pasang alat transfer file"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Pengguna lainnya"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Status baterai"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Tingkat baterai"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Kembalikan ke setelan pabrik"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Hapus semua data di tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Hapus semua data pada ponsel"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" tablet Anda, termasuk:"\n\n<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl unduhan"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" ponsel Anda, termasuk:"\n\n<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl unduhan"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Saat ini Anda telah masuk ke akun berikut ini:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" tablet Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl unduhan"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" ponsel Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl unduhan"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Saat ini Anda telah masuk ke akun berikut ini:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna lainnya"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Untuk menghapus gambar, musik, dan data pengguna lainnya, "<b>"penyimpanan USB"</b>" perlu dihapus."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Untuk menghapus musik, gambar, dan data pengguna lainnya, "<b>"kartu SD"</b>" perlu dihapus."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas dari penambatan."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Bantuan"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Jaringan seluler"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Kelola paket data seluler"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operator SIM tidak dikenal"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s tak punya situs web penyediaan yang dikenal"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Masukkan kartu SIM dan mulai ulang"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Sambungkan ke internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Lokasiku"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Wi-Fi &amp; lokasi jaringan"</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>
@@ -910,13 +997,14 @@
     <string name="use_location_title" msgid="5206937465504979977">"Lokasi &amp; penelusuran Google"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Izinkan Google menggunakan lokasi Anda untuk meningkatkan hasil penelusuran dan layanan lainnya"</string>
     <string name="location_access_title" msgid="7064108942964081243">"Akses ke lokasi saya"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Mengizinkan aplikasi yang telah meminta izin Anda untuk menggunakan informasi lokasi"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Aplikasi yang telah meminta izin boleh memakai informasi lokasi"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Sumber lokasi"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Tentang tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Tentang ponsel"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Lihat info legal, status, versi perangkat lunak"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informasi hukum"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Kontributor"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Informasi pengaturan"</string>
     <string name="copyright_title" msgid="865906688917260647">"Hak cipta"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensi"</string>
     <string name="terms_title" msgid="7697580845616764642">"Persyaratan dan ketentuan"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Ubah PIN pembuka kunci"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Konfirmasi pola tersimpan"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Coba lagi:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Buat pola pembuka kunci"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Gambar pola pembuka kunci"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tekan Menu untuk bantuan."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Angkat jari ketika selesai."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Sambungkan paling tidak <xliff:g id="NUMBER">%d</xliff:g> titik. Coba lagi:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cara membuat pola pembuka kunci"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Terlalu banyak upaya yang salah!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Coba lagi dalam <xliff:g id="NUMBER">%d</xliff:g> detik."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Batal"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Berikutnya"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Mengamankan tablet Anda"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Mengamankan ponsel Anda"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Lindungi tablet Anda dari penggunaan yang tidak sah dengan membuat pola pembuka kunci layar pribadi. Geser jari Anda untuk menghubungkan titik-titik secara acak di layar berikutnya. Anda perlu menghubungkan setidaknya empat titik. "\n\n"Siap memulai? Sentuh Berikutnya."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Lindungi ponsel Anda dari penggunaan yang tidak sah dengan membuat pola pembuka kunci layar pribadi. Geser jari Anda untuk menghubungkan setidaknya empat titik dengan sembarang urutan pada layar berikutnya. "\n\n"Siap memulai? Sentuh Berikutnya."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Aplikasi tidak dipasang pada ponsel Anda."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Kelola apl"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Mengelola dan menghapus apl terpasang"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Apl"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Izinkan pemasangan aplikasi dari sumber yang tidak diketahui"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tablet dan data pribadi Anda lebih rentan terhadap serangan apl dari sumber yang tidak dikenal. Anda setuju untuk bertanggung jawab penuh atas segala kerusakan pada tablet atau kehilangan data yang mungkin diakibatkan oleh penggunaan apl ini."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Ponsel dan data pribadi Anda lebih rentan terhadap serangan apl dari sumber yang tidak dikenal. Anda setuju untuk bertanggung jawab penuh atas segala kerusakan pada ponsel atau kehilangan data yang mungkin diakibatkan oleh penggunaan apl ini."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Verifikasi aplikasi"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Jangan izinkan atau peringatkan sebelum pemasangan aplikasi yang dapat menyebabkan kerusakan"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Setelan lanjutan"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktifkan opsi setelan yang lain"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Info apl"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Data penyimpanan USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Kartu SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Copot pemasangan"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Copot pemasangan untuk semua pengguna"</string>
+    <string name="install_text" msgid="884360662922471113">"Pasang"</string>
     <string name="disable_text" msgid="6544054052049395202">"Nonaktifkan"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktifkan"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Hapus data"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Tampilkn proses pd tmbolok"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Setel ulang pref aplikasi"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Setel ulang pref aplikasi?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Tindakan ini akan menyetel ulang semua preferensi untuk:"\n\n" "<li>"Aplikasi yang dinonaktifkan"</li>\n" "<li>"Pemberitahuan aplikasi yang dinonaktifkan"</li>\n" "<li>"Aplikasi default untuk tindakan"</li>\n" "<li>"Batas data latar belakang untuk aplikasi"</li>\n\n" Anda tidak akan kehilangan data aplikasi apa pun."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Tindakan ini akan menyetel ulang semua preferensi untuk:\n\n "<li>"Aplikasi yang dinonaktifkan"</li>\n" "<li>"Pemberitahuan aplikasi yang dinonaktifkan"</li>\n" "<li>"Aplikasi default untuk tindakan"</li>\n" "<li>"Batas data latar belakang untuk aplikasi"</li>\n\n" Anda tidak akan kehilangan data aplikasi apa pun."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Setel ulang aplikasi"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Kelola ruang"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Pada kartu SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Dinonaktifkan"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Tidak terpasang"</string>
     <string name="no_applications" msgid="7336588977497084921">"Tidak ada apl."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Penyimpanan internal"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Penyimpanan USB"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> dan <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Aplikasi ini mungkin tidak gratis:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Kirim SMS premium"</string>
     <string name="computing_size" msgid="1599186977475211186">"Menghitung..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Tidak dapat menghitung ukuran paket."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Anda tidak memiliki apl pihak ketiga yang terpasang."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Ubah lokasi pemasangan yang diinginkan untuk apl baru."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Menonaktifkan apl yang tertanam?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Jika Anda menonaktifkan apl yang tertanam, apl lain mungkin akan mengalami kesalahan fungsi."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Hapus data dan nonaktifkan aplikasi?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Pengguna: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Pengguna yang dihapus"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses dan <xliff:g id="NUMSERVICES">%2$d</xliff:g>layanan"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses dan <xliff:g id="NUMSERVICES">%2$d</xliff:g> layanan"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses dan <xliff:g id="NUMSERVICES">%2$d</xliff:g> layanan"</string>
@@ -1128,9 +1226,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="show_password_summary" msgid="7345931695292850058"></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>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Untuk beralih, tekan Control-Spasi"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Default"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tata letak keyboard"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kamus pengguna"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Kamus pribadi"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Kamus pribadi"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Kamus pribadi"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Tambahkan"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Tambahkan ke kamus"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Layar tidak akan redup selama mengisi daya"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktifkan log pengintaian HCI Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tangkap semua paket HCI bluetooth di dalam file"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Pilih waktu operasi"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Pilih waktu operasi"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Nyalakan ulang untuk mengubah waktu operasi dari <xliff:g id="OLD">%1$s</xliff:g> ke <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Mengizinkan lokasi palsu"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Mengizinkan lokasi palsu"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Periksa perilaku membahayakan dalam aplikasi yang terpasang melalui ADB/ADT."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Lindungi penyimpanan USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplikasi harus meminta izin untuk membaca penyimpanan USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Lindungi penyimpanan USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Jika penyimpanan USB dilindungi, aplikasi harus meminta izin untuk membaca data dari penyimpanan eksternal."\n\n"Beberapa aplikasi mungkin tidak berfungsi sebelum diperbarui oleh pengembangnya."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Jika penyimpanan USB dilindungi, aplikasi harus meminta izin untuk membaca data dari penyimpanan eksternal.\n\nBeberapa aplikasi mungkin tidak berfungsi sebelum diperbarui oleh pengembangnya."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Lindungi kartu SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikasi harus meminta izin untuk membaca kartu SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Lindungi kartu SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Jika kartu SD dilindungi, aplikasi harus meminta izin untuk membaca data dari penyimpanan eksternal."\n\n"Beberapa aplikasi mungkin tidak berfungsi sebelum diperbarui oleh pengembangnya."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Jika kartu SD dilindungi, aplikasi harus meminta izin untuk membaca data dari penyimpanan eksternal.\n\nBeberapa aplikasi mungkin tidak berfungsi sebelum diperbarui oleh pengembangnya."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal lokal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktifkan aplikasi terminal yang menawarkan akses kerangka lokal"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Pilih gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Pilih widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Buat widget dan izinkan akses?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Setelan aksesibilitas"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Layanan"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Teks besar"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Tombol daya mengakhiri panggilan"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Ucapkan sandi"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Tundaan sentuh &amp; tahan"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Meningkatkan aksesibilitas web"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Isyarat pembesaran"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Saat fitur ini diaktifkan, Anda dapat memperbesar dan memperkecil dengan mengetuk layar tiga kali.\n\nSaat memperbesar, Anda dapat:\n"<ul><li>"Menggeser: Seret dua jari atau lebih melintasi layar."</li>\n<li>"Menyesuaikan tingkat pembesaran/pengecilan: Cubit dua jari atau lebih bersamaan atau rentangkan jari Anda."</li></ul>\n\n"Anda juga dapat memperbesar yang ada di bawah jari Anda secara sementara dengan mengetuk tiga kali lalu tahan. Dalam keadaan yang diperbesar ini, Anda dapat menyeret jari untuk menjelajah bagian layar yang berbeda. Angkat jari Anda untuk mengembalikan ke keadaan sebelumnya.\n\nCatatan: Ketukan tiga kali untuk pembesaran bekerja di mana pun kecuali pada keyboard dan bilah navigasi."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Pintasan aksesibilitas"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Aktif"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Mati"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Jika fitur ini diaktifkan, Anda dapat mengaktifkan fitur aksesibilitas dengan cepat dalam dua langkah:\n\nLangkah 1: Tekan terus tombol daya sampai terdengar suara atau terasa getaran.\n\nLangkah 2: Sentuh dan tahan dua jari sampai terdengar konfirmasi audio.\n\nJika perangkat memiliki beberapa pengguna, pintasan pada layar kunci ini dapat digunakan untuk mengaktifkan aksesibilitas sementara sampai perangkat terbuka kuncinya."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Teks besar"</string>
+    <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"</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_menu_item_settings" msgid="3344942964710773365">"Setelan"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Nyala"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Mati"</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="accessibility_feature_state_on" msgid="2864292320042673806">"Aktif"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Nonaktif"</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="print_settings" msgid="4742428530112487843">"Pencetakan"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Setelan pencetakan"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Layanan"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> dapat menerima dokumen yang Anda cetak. Dokumen seperti itu dapat berisi data sensitif."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Tidak ada layanan terpasang"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Setelan"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Tambahkan printer"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Aktif"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Nonaktif"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterai"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Apa yang menggunakan daya baterai"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Data penggunaan baterai tidak tersedia."</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Data diterima"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Data seluler terkirim"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Data seluler diterima"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Data Wi‑Fi terkirim"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Data Wi-Fi diterima"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Waktu hidup"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Hentikan atau copot pemasangan apl"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Mengontrol GPS secara manual untuk mencegah apl menggunakannya"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Apl tersebut mungkin menawarkan setelan untuk mengurangi penggunaan baterai"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Baterai yang digunakan oleh pengguna"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sejak dicabut"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ketika terakhir dicabut untuk <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total penggunaan"</string>
@@ -1344,23 +1472,25 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Setelan default di bawah menggantikan setelan apl"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Setelan default"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Mesin default"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Atur mesin sintesa suara untuk digunakan pada teks lisan"</string>
+    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Atur mesin sintesis suara untuk digunakan pada teks lisan"</string>
     <string name="tts_default_rate_title" msgid="6030550998379310088">"Laju bicara"</string>
     <string name="tts_default_rate_summary" msgid="4061815292287182801">"Kecepatan teks diucapkan"</string>
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tinggi nada"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Mempengaruhi nada teks yang disampaikan"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Bahasa"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Bahasa tidak dipilih"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Menyetel suara spesifik bahasa untuk teks lisan"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Dengarkan contoh"</string>
-    <string name="tts_play_example_summary" msgid="8029071615047894486">"Putar demonstrasi singkat dari sintesa suara"</string>
+    <string name="tts_play_example_summary" msgid="8029071615047894486">"Putar demonstrasi singkat dari sintesis suara"</string>
     <string name="tts_install_data_title" msgid="4264378440508149986">"Pasang data suara"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Pasang data suara yang dibutuhkan untuk sintesa suara"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Suara yang diperlukan untuk sintesa suara sudah terpasang dengan baik"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"Pasang data suara yang dibutuhkan untuk sintesis suara"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Suara yang diperlukan untuk sintesis suara sudah terpasang dengan baik"</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Setelan Anda telah berubah. Ini adalah contoh bunyinya."</string>
     <string name="tts_engine_error" msgid="3305141107104670703">"Mesin yang Anda pilih tidak dapat dijalankan."</string>
     <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 sintesa 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_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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Kecerahan <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"otomatis"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"penuh"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"setengah"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"nonaktif"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Penyimpanan kredensial"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Pasang dari penyimpanan"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Memulihkan cadangan setelan dan data ketika memasang ulang apl"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Ambil laporan bug"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Ini akan mengumpulkan informasi tentang status perangkat Anda saat ini, untuk dikirimkan sebagai pesan e-mail. Perlu waktu untuk memulai laporan bug sampai siap dikirim; mohon kesabarannya."</string>
-    <string name="report" msgid="302437572240018342">"Laporan"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Sandi cadangan desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Saat ini cadangan desktop penuh tidak dilindungi"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Sentuh guna mengubah atau menghapus sandi untuk cadangan lengkap desktop"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nSentuh "<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>
@@ -1484,7 +1628,7 @@
     <string name="background_data_dialog_message" msgid="6981661606680941633">"Menonaktifkan data latar belakang memperpanjang masa pakai baterai dan mengurangi penggunaan data. Beberapa aplikasi mungkin masih menggunakan sambungan data latar belakang."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"Sinkronisasi otomatis data apl"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sinkronisasi AKTIF"</string>
-    <string name="sync_disabled" msgid="8511659877596511991">"Sinkronisasi NONAKTIF:"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"Sinkronisasi MATI:"</string>
     <string name="sync_error" msgid="5060969083117872149">"Kesalahan sinkronisasi"</string>
     <string name="last_synced" msgid="4242919465367022234">"Terakhir disinkronkan <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"Sedang menyinkronkan..."</string>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalender"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kontak"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Selamat datang di Google sync!"</font>" "\n"Pendekatan Google untuk menyinkronkan data guna memungkinkan akses ke kontak, janji temu, dan lain-lain dari mana saja."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Selamat datang di Google sync!"</font>" \nPendekatan Google untuk menyinkronkan data guna memungkinkan akses ke kontak, janji temu, dan lain-lain dari mana saja."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Setelan sinkronisasi apl"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data &amp; sinkronisasi"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Ubah sandi"</string>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Sorot seluruh permukaan jendela saat diperbarui"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Tampilkan pembaruan tampilan GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Tampilan cepat dlm jendela saat digambar dgn GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Tunjukkan pembaruan lapisan hardware"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Lapisan hardware berkedip hijau saat memperbarui"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Debug overdraw oleh GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Tampilkan penggunaan CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Hamparan layar menampilkan penggunaan CPU saat ini"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Paksa perenderan GPU"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Menyimulasikan tampilan sekunder"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apl"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Jangan simpan kegiatan"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Hancurkan tiap kgiatan setelah ditinggal pengguna"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Matikan data latar di jaringan seluler. Jika ada, pakai lainnya."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Untuk membatasi data latar belakang pada apl ini, setel batas data seluler terlebih dulu."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Batasi data latar belakang?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Fitur ini dapat menghentikan aplikasi yang bergantung pada data latar saat hanya ada jaringan seluler."\n\n"Anda dapat menemukan kontrol penggunaan data yang lebih sesuai dalam setelan yang tersedia dalam aplikasi."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Fitur ini dapat menghentikan aplikasi yang bergantung pada data latar saat hanya ada jaringan seluler.\n\nAnda dapat menemukan kontrol penggunaan data yang lebih sesuai dalam setelan yang tersedia dalam aplikasi."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Pembatasan data latar belakang hanya dimungkinkan bila Anda telah menyetel batas data seluler."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Aktifkan sinkronisasi data otomatis?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Semua perubahan yang dilakukan pada akun Anda di web akan disalin ke tablet Anda secara otomatis."\n\n"Beberapa akun juga dapat menyalin semua perubahan yang dilakukan di tablet ke web secara otomatis. Beginilah cara kerja Akun Google."\n\n"Untuk memilih jenis informasi yang akan disinkronkan dalam setiap akun, buka Setelan &gt; Akun."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Semua perubahan yang dilakukan pada akun Anda di web akan disalin ke ponsel Anda secara otomatis."\n\n"Beberapa akun juga dapat menyalin semua perubahan yang dilakukan di ponsel ke web secara otomatis. Beginilah cara kerja Akun Google."\n\n"Untuk memilih jenis informasi yang akan disinkronkan dalam setiap akun, buka Setelan &gt; Akun."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Semua perubahan yang dilakukan pada akun Anda di web akan disalin ke tablet Anda secara otomatis.\n\nBeberapa akun juga dapat menyalin semua perubahan yang dilakukan di tablet ke web secara otomatis. Beginilah cara kerja Akun Google.\n\nUntuk memilih jenis informasi yang akan disinkronkan dalam setiap akun, buka Setelan &gt; Akun."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Semua perubahan yang dilakukan pada akun Anda di web akan disalin ke ponsel Anda secara otomatis.\n\nBeberapa akun juga dapat menyalin semua perubahan yang dilakukan di ponsel ke web secara otomatis. Beginilah cara kerja Akun Google.\n\nUntuk memilih jenis informasi yang akan disinkronkan dalam setiap akun, buka Setelan &gt; Akun."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Nonaktifkan sinkronisasi data otomatis?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Hal ini akan menghemat penggunaan baterai dan data, tapi Anda perlu menyinkronkan setiap akun secara manual untuk mengumpulkan informasi terkini. Anda juga tidak akan menerima pemberitahuan ketika ada pembaruan."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tanggal penyetelan ulang daur penggunaan"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Setel peringatan penggunaan data"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Setel batas penggunaan data"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Membatasi penggunaan data"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Sambungan data seluler Anda akan dinonaktifkan ketika mencapai batas yang ditentukan.\n\nKarena 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\nKarena 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" 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\nSetelan 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\nSetelan 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Aplikasi dan pengguna yang dihapus"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> diterima, <xliff:g id="SENT">%2$s</xliff:g> dikirim"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: sekitar <xliff:g id="TOTAL">%1$s</xliff:g> yang digunakan."</string>
     <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>
@@ -1650,8 +1802,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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Menambahkan profil VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Edit profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Hapus profil"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN selalu aktif"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Pilih profil VPN untuk tetap tersambung. Lalu lintas jaringan hanya akan diperbolehkan jika tersambung ke VPN ini."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Tidak ada"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPN selalu aktif membutuhkan alamat IP baik untuk server serta DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Tidak ada sambungan jaringan. Coba lagi nanti."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Sertifikat hilang. Silakan edit profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistem"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Batal"</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">"Pembaruan sistem tambahan"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Batasan &amp; pengguna"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Pengguna"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Tambahkan pengguna"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Edit detail"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Informasi pengguna"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Nama"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Batasan konten"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Perlu PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Nilai konten"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Aplikasi sistem"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Aplikasi terpasang"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Buang"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Hapus pengguna"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Pesky kid"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Nonaktif"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Tidak Wajib"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Wajib"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Pengguna"</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="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\nSetelah Anda membuat pengguna baru, orang tersebut harus melakukan proses penyiapan.\n\nSetiap 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\nSetiap 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_confirm_remove_message" msgid="5284111415714437285">"Yakin ingin menghapus pengguna dan semua data yang terkait dari perangkat?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Ubah ukuran font"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Batasan"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Hapus batasan"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Ubah PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Tampilkan pemberitahuan"</string>
     <string name="help_label" msgid="1107174367904110532">"Bantuan"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Akun untuk konten"</string>
+    <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="6160672982086584261">"Setel batasan aplikasi"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Dikontrol oleh <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Aplikasi ini tidak didukung dalam profil yang dibatasi"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Aplikasi ini dapat mengakses akun Anda"</string>
+    <string name="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 e66963f..f1d1469 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,15 +218,126 @@
     <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="886742181977884584">"Contenuti multimediali"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"pulsanti contenuti multimediali"</item>
+    <item msgid="4547883971364273343">"focus audio"</item>
+    <item msgid="2603878814882344450">"volume principale"</item>
+    <item msgid="7136963238377062018">"volume voce"</item>
+    <item msgid="4270236897655923007">"volume suoneria"</item>
+    <item msgid="6325739889222559394">"volume contenuti multimediali"</item>
+    <item msgid="5762123934816216821">"volume allarme"</item>
+    <item msgid="785049718065337473">"volume notifiche"</item>
+    <item msgid="6700305533746877052">"volume bluetooth"</item>
+    <item msgid="2029227495214047094">"mantieni attivo"</item>
+    <item msgid="26109888160231211">"monitora posizione"</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>
+    <item msgid="5753789168376302997">"Pulsanti contenuti multimediali"</item>
+    <item msgid="3265262911688671938">"Focus audio"</item>
+    <item msgid="2098976479485046797">"Volume principale"</item>
+    <item msgid="5660213838861789350">"Volume voce"</item>
+    <item msgid="7983336752371254444">"Volume suoneria"</item>
+    <item msgid="7878027809189330917">"Volume contenuti multimediali"</item>
+    <item msgid="7260546305036218513">"Volume allarme"</item>
+    <item msgid="9103719301075748925">"Volume notifiche"</item>
+    <item msgid="7025966722295861512">"Volume Bluetooth"</item>
+    <item msgid="4665183401128289653">"Mantieni attivo"</item>
+    <item msgid="8584357129746649222">"Posizione"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Breve"</item>
-    <item msgid="2560532955514699713">"Media"</item>
-    <item msgid="2372711992605524591">"Lunga"</item>
+    <item msgid="2560532955514699713">"Medio"</item>
+    <item msgid="2372711992605524591">"Lungo"</item>
+  </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (debug)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Usa Dalvik"</item>
+    <item msgid="5131846588686178907">"Usa ART"</item>
+    <item msgid="4530003713865319928">"Usa la build di debug ART"</item>
   </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Non verificare mai"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Scala animazione 5x"</item>
     <item msgid="1069584980746680398">"Scala animazione 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Nessuno"</item>
+    <item msgid="688482401508173818">"720 x 480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280 x 720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280 x 720 tvdpi e 1920 x 1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Nessuna"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Off"</item>
+    <item msgid="7688197031296835369">"Mostra aree overdraw"</item>
+    <item msgid="8332661909019981149">"Mostra contatore overdraw"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite standard"</item>
     <item msgid="4071574792028999443">"Nessun processo in background"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Timeout"</item>
     <item msgid="7664124146786465092">"Operazione non riuscita"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Chiedi"</item>
+    <item msgid="5077768429488260031">"Non consentire mai"</item>
+    <item msgid="1417929597727989746">"Consenti sempre"</item>
+  </string-array>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 39aaa35..42bad7d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Sì"</string>
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="create" msgid="3578857613172647409">"Crea"</string>
+    <string name="allow" msgid="3349662621170855910">"Consenti"</string>
+    <string name="deny" msgid="6947806159746484865">"Rifiuta"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Sconosciuto"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Ora ti manca <xliff:g id="STEP_COUNT">%1$d</xliff:g> passaggio per diventare uno sviluppatore."</item>
+    <item quantity="other" msgid="6722953419953594148">"Ora ti mancano <xliff:g id="STEP_COUNT">%1$d</xliff:g> passaggi per diventare uno sviluppatore."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Ora sei uno sviluppatore."</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Non è necessario, sei già uno sviluppatore."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS E RETI"</string>
     <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIVO"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PERSONALE"</string>
@@ -40,7 +48,7 @@
     <string name="radioInfo_service_out" msgid="5238736759641916278">"Fuori servizio"</string>
     <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Solo chiamate di emergenza"</string>
     <string name="radioInfo_service_off" msgid="1434084741785525415">"Segnale radio disattivato"</string>
-    <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Roaming..."</string>
+    <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Roaming"</string>
     <string name="radioInfo_roaming_not" msgid="2851853244069662307">"Non roaming"</string>
     <string name="radioInfo_phone_idle" msgid="7489244938838742820">"Inattivo"</string>
     <string name="radioInfo_phone_ringing" msgid="4883724645684297895">"Chiamata in corso"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"In carica"</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_discharging" msgid="6222697503392774475">"In uso"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(wireless)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Non in carica"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Non in carica"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Carica"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Non collegato"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"wireless"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"CA+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Sconosciuto"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Sconosciuto"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Errore sconosciuto"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Minimo"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Rilevabile"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visibile a tutti dispositivi Bluetooth vicini (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visibile a tutti dispositivi Bluetooth vicini"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Non visibile ad altri dispositivi Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Visibile solo ai dispositivi accoppiati"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Rendi rilevabile il dispositivo"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timeout visibilità"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Imposta la durata della rilevabilità del dispositivo"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Blocca composizione vocale"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedisci l\'uso del compositore Bluetooth quando lo schermo è bloccato"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivi Bluetooth"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostra file ricevuti"</string>
     <string name="device_picker" msgid="8398232791303186677">"Selettore dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Richiesta autorizzazione Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Un\'applicazione vuole attivare il Bluetooth. Consentire?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Un\'applicazione sul tablet vuole rendere il tablet rilevabile da altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Consentire?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Un\'applicazione sul telefono vuole rendere il telefono rilevabile da altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Consentire?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Un\'applicazione sul tablet vuole rendere il tablet \"sempre rilevabile\" da altri dispositivi Bluetooth. Consentire?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Un\'applicazione sul telefono vuole rendere il telefono \"sempre rilevabile\" da altri dispositivi Bluetooth. Consentire?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Un\'applicazione sul tablet vuole attivare il Bluetooth e rendere il tablet rilevabile da altri dispositivi per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Consentire?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Un\'applicazione sul telefono vuole attivare il Bluetooth e rendere il telefono rilevabile da altri dispositivi per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi. Consentire?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Un\'applicazione sul tablet vuole attivare il  Bluetooth e rendere il tablet rilevabile da altri dispositivi. Consentire?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Un\'applicazione sul telefono vuole attivare il Bluetooth e rendere il telefono rilevabile da altri dispositivi. Consentire?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Un\'app chiede di attivare il Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Un\'app chiede di rendere il tablet visualizzabile da altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Un\'app chiede di rendere il telefono visualizzabile da altri dispositivi Bluetooth per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Un\'app chiede di rendere il tablet visualizzabile da altri dispositivi Bluetooth. Puoi modificare questa impostazione in seguito nelle impostazioni Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Un\'app chiede di rendere il telefono visualizzabile da altri dispositivi Bluetooth. Puoi modificare questa impostazione in seguito nelle impostazioni Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Un\'app chiede di attivare il Bluetooth e di rendere il tablet visualizzabile da altri dispositivi per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Un\'app chiede di attivare il Bluetooth e di rendere il telefono visualizzabile da altri dispositivi per <xliff:g id="TIMEOUT">%1$d</xliff:g> secondi."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Un\'app chiede di attivare il Bluetooth e di rendere il tablet visualizzabile da altri dispositivi. Puoi modificare questa impostazione in seguito nelle impostazioni Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Un\'app chiede di attivare il Bluetooth e di rendere il telefono visualizzabile da altri dispositivi. Puoi modificare questa impostazione in seguito nelle impostazioni Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Attivazione Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Disattivazione Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Connessione automatica"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Il proxy HTTP viene utilizzato dal browser ma potrebbe non essere utilizzato da altre applicazioni."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Posizione:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID adiacente:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentativi dati:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Servizio GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -241,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>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Connettività dati persa: hai lasciato la rete del tuo operatore con il roaming dati disattivato."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Attiva"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Se consenti il roaming dei dati i costi potrebbero essere elevati."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Quando consenti il roaming dei dati, potrebbero essere addebitati costi significativi per il roaming.\n\nQuesta impostazione influisce su tutti gli utenti di questo tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Quando consenti il roaming dei dati, potrebbero essere addebitati costi significativi per il roaming.\n\nQuesta impostazione influisce su tutti gli utenti di questo telefono."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Consentire il roaming dei dati?"</string>
     <string name="networks" msgid="6333316876545927039">"Selezione operatore"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Scegli un operatore di rete"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info proprietario"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Richiedi un PIN numerico o una password per decrittografare il tablet a ogni accensione"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Richiedi un PIN numerico o una password per decrittografare il telefono a ogni accensione"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Crittografato"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puoi crittografare i tuoi account, le impostazioni, le applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il tablet, devi digitare un PIN numerico o una password per decrittografarlo ogni volta che lo accendi. Non puoi decrittografare il tablet se non eseguendo un ripristino dati di fabbrica, cancellando tutti i tuoi dati."\n\n"La crittografia potrebbe richiedere più di un\'ora. Devi iniziare con una batteria carica e tenere il tablet collegato fino al completamento della crittografia. Se interrompi la procedura, perderai alcuni o tutti i tuoi dati."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puoi crittografare i tuoi account, le impostazioni, le applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il telefono, devi digitare un PIN numerico o una password per decrittografarlo ogni volta che lo accendi. Non puoi decrittografare il telefono se non eseguendo un ripristino dati di fabbrica, cancellando tutti i tuoi dati."\n\n"La crittografia potrebbe richiedere più di un\'ora. Devi iniziare con una batteria carica e tenere il telefono collegato fino al completamento della crittografia. Se interrompi la procedura, perderai alcuni o tutti i tuoi dati."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puoi crittografare i tuoi account, le impostazioni, le applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il tablet, devi digitare un PIN numerico o una password per decrittografarlo ogni volta che lo accendi. Non puoi decrittografare il tablet se non eseguendo un ripristino dati di fabbrica, cancellando tutti i tuoi dati.\n\nLa crittografia potrebbe richiedere più di un\'ora. Devi iniziare con una batteria carica e tenere il tablet collegato fino al completamento della crittografia. Se interrompi la procedura, perderai alcuni o tutti i tuoi dati."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puoi crittografare i tuoi account, le impostazioni, le applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il telefono, devi digitare un PIN numerico o una password per decrittografarlo ogni volta che lo accendi. Non puoi decrittografare il telefono se non eseguendo un ripristino dati di fabbrica, cancellando tutti i tuoi dati.\n\nLa crittografia potrebbe richiedere più di un\'ora. Devi iniziare con una batteria carica e tenere il telefono collegato fino al completamento della crittografia. Se interrompi la procedura, perderai alcuni o tutti i tuoi dati."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Esegui crittografia tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Esegui crittografia telefono"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carica la batteria e riprova."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Riprova tra <xliff:g id="DELAY">^1</xliff:g> secondi."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Digita la password"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Crittografia non riuscita"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul tablet non sono più accessibili. "\n\n"Per riprendere a utilizzare il tablet devi effettuare un ripristino dei dati di fabbrica. Quando configuri il tablet dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul telefono non sono più accessibili. "\n\n"Per riprendere a utilizzare il telefono devi effettuare il ripristino dei dati di fabbrica. Quando configuri il telefono dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul tablet non sono più accessibili. \n\nPer riprendere a utilizzare il tablet devi effettuare un ripristino dei dati di fabbrica. Quando configuri il tablet dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul telefono non sono più accessibili. \n\nPer riprendere a utilizzare il telefono devi effettuare il ripristino dei dati di fabbrica. Quando configuri il telefono dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Cambia metodo di immissione"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Scegli blocco schermo"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Scegli blocco di backup"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambia PIN di sblocco"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambia password di sblocco"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"La password deve essere lunga almeno %d caratteri"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Il PIN deve essere lungo almeno %d caratteri"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Il PIN deve essere formato da almeno %d cifre"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Al termine, tocca Continua"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continua"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"La password deve contenere meno di <xliff:g id="NUMBER">%d</xliff:g> caratteri."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Come vivavoce"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per musica e audio media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ricorda impostazioni"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Schermi accoppiati"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dispositivi disponibili"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Collegamento in corso"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Connesso"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponibile"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"In uso"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Impostazioni di visualizzazione"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Disconnettere?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Questa operazione terminerà la connessione con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Opzioni di visualizzazione wireless"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Elimina"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Fine"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Attiva"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Non attiva"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Disattivata"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Consenti lo scambio di dati quando il tablet tocca un altro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Consenti lo scambio di dati quando il telefono tocca un altro dispositivo"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Non attivo"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Non disponibile perché la tecnologia NFC non è attiva"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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="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="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="8116564886303972764">"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_in_progress" msgid="2944576520214787628">"La configurazione WPS è già in corso e il completamento può richiedere fino a due minuti"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"L\'impostazione di sicurezza del router wireless (TKIP) non è supportata"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Errore di autenticazione. Riprova."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"È stata rilevata un\'altra sessione WPS. Riprova tra qualche minuto."</string>
     <string name="wifi_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>
@@ -564,6 +621,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\nConsetirlo 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>
@@ -571,8 +631,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_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_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\nLa 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\nLa configurazione del telefono può richiedere notevole attività di rete."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Ricerca…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Rinomina dispositivo"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Dispositivi peer"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Gruppi memorizzati"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Impossibile connettersi."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Impossibile rinominare il dispositivo."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Disconnettere?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Se ti disconnetti verrà terminata la connessione con <xliff:g id="PEER_NAME">%1$s</xliff:g> e altri <xliff:g id="PEER_COUNT">%2$s</xliff:g> dispositivi."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portatile"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Eliminare questo gruppo?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Hotspot Wi‑Fi portatile"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Effetti musicali"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume suoneria"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibra in modalità silenziosa"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Notifica predefinita"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Suono di notifica predefinito"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Luce di notifica pulsante"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Suoneria"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notifica"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Usa volume chiamate in entrata per le notifiche"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Scegli suoneria notifica"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Suono di notifica predefinito"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Applicazioni multimediali"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Imposta il volume di musica e video"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Allarme"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Sfondo"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Scegli sfondo da"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Schermo Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Attiva al momento della sospensione se collegato alla corrente"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Disattivato"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Candy selezionato"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Quando attivarlo"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Mai"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Prova!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Attiva anche quando inserito nel dock"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Quando inserito nel dock o in stand-by e ricarica"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Entrambi i casi"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la ricarica"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quando inserito nel dock"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Disattivato"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Per stabilire che cosa accade quando il telefono è inserito nel dock e/o in stand-by, attiva Daydream."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quando attivare Daydream"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Inizia subito"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Impostazioni"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminosità automatica"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Dimensioni carattere"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Dimensioni carattere"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN della SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN errato"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"I PIN non corrispondono"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Impossibile cambiare il PIN."\n"Il PIN potrebbe essere errato."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Impossibile cambiare il PIN.\nIl PIN potrebbe essere errato."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN della SIM modificato"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Impossibile modificare lo stato di blocco della scheda SIM."\n"Il PIN potrebbe essere errato."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Impossibile modificare lo stato di blocco della scheda SIM.\nIl PIN potrebbe essere errato."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annulla"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stato tablet"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versione banda di base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versione kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Numero build"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Stato di SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Non disponibile"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stato"</string>
     <string name="device_status" msgid="607405385799807324">"Stato"</string>
@@ -733,12 +807,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">"Tipo di rete cellulare"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Info operatore"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Stato rete cellulare"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Stato servizio"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"Intensità segnale"</string>
-    <string name="status_roaming" msgid="2638800467430913403">"Roaming.."</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>
@@ -748,14 +823,16 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Archivio USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Scheda SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"Disponibile"</string>
+    <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>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (musica, suonerie, podcast e così via)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Vari"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Dati memorizzati nella cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Smonta archivio condiviso"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Smonta scheda SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Smonta archivio USB interno"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Cancella scheda SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Cancella i dati nell\'archivio USB interno, come musica e foto"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Cancella tutti i dati sulla scheda SD, come musica e foto"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Sola lettura)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Cancellare i dati memorizzati nella cache?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Ciò cancella tutti i dati delle app nella cache."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"La funzione MTP o PTP è attiva"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Smontare l\'archivio USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Smontare la scheda SD?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Se smonti l\'archivio USB, alcune applicazioni in uso verranno interrotte e potrebbero risultare non disponibili finché non rimonterai l\'archivio USB."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Fotocamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Consente di trasferire foto utilizzando il software della fotocamera e di trasferire i file su computer che non supportano MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installa strumenti trasferimento file"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Altri utenti"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stato batteria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Livello batteria"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Ripristino dati di fabbrica"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Cancella tutti i dati sul tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Cancella tutti i dati sul telefono"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Questa operazione cancellerà tutti i dati memorizzati nell\'"<b>"archivio interno"</b>" del tablet, compresi:"\n\n<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle applicazioni"</li>\n<li>"Applicazioni scaricate"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Questa operazione cancellerà tutti i dati memorizzati nell\'"<b>"archivio interno"</b>" del telefono, compresi:"\n\n<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle applicazioni"</li>\n<li>"Applicazioni scaricate"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Al momento sei collegato ai seguenti account:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Questa operazione cancellerà tutti i dati memorizzati nell\'"<b>"archivio interno"</b>" del tablet, compresi:\n\n"<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle applicazioni"</li>\n<li>"Applicazioni scaricate"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Questa operazione cancellerà tutti i dati memorizzati nell\'"<b>"archivio interno"</b>" del telefono, compresi:\n\n"<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle applicazioni"</li>\n<li>"Applicazioni scaricate"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Al momento sei collegato ai seguenti account:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musica"</li>\n<li>"Foto"</li>\n<li>"Altri dati utente"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Per cancellare musica, foto e altri dati dell\'utente, è necessario cancellare i dati dell\'"<b>"archivio USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Per cancellare musica, foto e altri dati dell\'utente, è necessario cancellare i dati della "<b>"scheda SD"</b>"."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Sarà annullato il tethering per <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Guida"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Reti mobili"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Gestione piano dati mobili"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operatore SIM sconosciuto"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Nessun sito web di provisioning per %1$s"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Inserisci la scheda SIM e riavvia"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Connettiti a Internet"</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>
@@ -911,12 +998,13 @@
     <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>
     <string name="legal_information" msgid="5769301644270604095">"Informazioni legali"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Collaboratori"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Informazioni normative"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenza"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termini e condizioni"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Cambia PIN di sblocco"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Conferma sequenza salvata"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Riprova:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Inserisci una sequenza di sblocco"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Inserisci una sequenza di sblocco:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Premi Menu per visualizzare la guida."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Allontana il dito al termine."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Collega almeno <xliff:g id="NUMBER">%d</xliff:g> punti. Riprova:"</string>
@@ -960,27 +1048,24 @@
     <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>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Troppi tentativi errati."</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Riprova fra <xliff:g id="NUMBER">%d</xliff:g> secondi."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Annulla"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Avanti"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Protezione del tablet"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Protezione del telefono"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Proteggi il tuo tablet dall\'uso non autorizzato creando una sequenza di sblocco dello schermo personale. Fai scorrere il dito per collegare i pallini in qualsiasi ordine nella schermata successiva. Devi collegare almeno quattro pallini. "\n\n"Sei pronto per iniziare? Tocca \"Avanti\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Proteggi il tuo telefono dall\'uso non autorizzato creando una sequenza di sblocco dello schermo personale. Fai scorrere il dito per collegare almeno quattro pallini in qualsiasi ordine nella schermata successiva. "\n\n"Sei pronto per iniziare? Tocca \"Avanti\"."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Applicazione non installata sul telefono."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestisci applicazioni"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestisci e rimuovi applicazioni installate"</string>
-    <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 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>
     <string name="application_info_label" msgid="5736524913065714880">"Informazioni applicazione"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dati in archivio USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Scheda SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Disinstalla"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Disinstalla per tutti gli utenti"</string>
+    <string name="install_text" msgid="884360662922471113">"Installa"</string>
     <string name="disable_text" msgid="6544054052049395202">"Disattiva"</string>
     <string name="enable_text" msgid="9217362512327828987">"Attiva"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Cancella dati"</string>
@@ -1019,17 +1106,19 @@
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Scheda SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Disattivato"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Non installata"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nessuna applicazione."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Archivio interno"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Archivio USB"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> e <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Questa applicazione potrebbe addebitarti dei costi:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Invio di SMS premium"</string>
     <string name="computing_size" msgid="1599186977475211186">"Elaborazione..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Impossibile calcolare le dimensioni del pacchetto."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Nessuna applicazione di terze parti installata."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Cambia il percorso preferito per l\'installazione di nuove applicazioni"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Disattivare app integrata?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Se disattivi un\'applicazione integrata, le altre applicazioni potrebbero funzionare in modo anomalo."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Eliminare i dati e disattivare l\'applicazione?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Utente: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Utente rimosso"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processo e <xliff:g id="NUMSERVICES">%2$d</xliff:g> servizio"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processo e <xliff:g id="NUMSERVICES">%2$d</xliff:g> servizi"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processi e <xliff:g id="NUMSERVICES">%2$d</xliff:g> servizio"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Impostazioni tastiera fisica"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Premi due volte la barra spaziatrice per inserire \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Password visibili"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Questo metodo di immissione potrebbe riuscire a raccogliere tutto il testo digitato, compresi i dati personali come password e numeri di carte di credito. Deriva dall\'applicazione <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Utilizzare questo metodo di immissione?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Questa funzione di controllo ortografico potrebbe riuscire a raccogliere tutto il testo digitato, compresi i dati personali come password e numeri di carte di credito. Deriva dall\'applicazione <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Utilizzare questa funzione di controllo ortografico?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Impostazioni"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Cambia premendo Ctrl-Barra spaziatr."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predefinita"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Layout tastiera"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dizionario utente"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dizionario personale"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Dizionari personali"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Dizionario personale"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Aggiungi"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Aggiungi al dizionario"</string>
@@ -1157,6 +1252,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>
@@ -1176,7 +1273,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Lo schermo non va mai in stand-by se sotto carica"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Attiva log di esame HCI Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Acquisisci tutti i pacchetti HCI Bluetooth in un file"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Seleziona runtime"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Seleziona runtime"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Riavviare per modificare runtime da <xliff:g id="OLD">%1$s</xliff:g> a <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Posizioni fittizie"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Consenti posizioni fittizie"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Controlla che le applicazioni installate tramite ADB/ADT non abbiano un comportamento dannoso."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Proteggi archivio USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Le app devono richiedere l\'autorizzazione per leggere l\'archivio USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Proteggere l\'archivio USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Quando l\'archivio USB è protetto, le applicazioni devono richiedere l\'autorizzazione per leggere i dati dalla memoria esterna."\n\n"Alcune applicazioni potrebbero non funzionare fino all\'aggiornamento da parte dei relativi sviluppatori."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Quando l\'archivio USB è protetto, le applicazioni devono richiedere l\'autorizzazione per leggere i dati dalla memoria esterna.\n\nAlcune applicazioni potrebbero non funzionare fino all\'aggiornamento da parte dei relativi sviluppatori."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Proteggi scheda SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Le app devono richiedere l\'autorizzazione per leggere la scheda SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Proteggere la scheda SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Quando la scheda SD è protetta, le applicazioni devono richiedere l\'autorizzazione per leggere i dati dalla memoria esterna."\n\n"Alcune applicazioni potrebbero non funzionare fino all\'aggiornamento da parte dei relativi sviluppatori."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Quando la scheda SD è protetta, le applicazioni devono richiedere l\'autorizzazione per leggere i dati dalla memoria esterna.\n\nAlcune applicazioni potrebbero non funzionare fino all\'aggiornamento da parte dei relativi sviluppatori."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminale locale"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Abilita l\'app Terminale che offre l\'accesso alla shell locale"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Scegli gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Scegli widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Creare il widget e consentire l\'accesso?"</string>
@@ -1234,29 +1345,43 @@
     <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_toggle_large_text_title" msgid="6618674985313017711">"Testo grande"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Chiudi chiamata con pulsante ON/OFF"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Pronuncia le password"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Ritardo tocco e pressione"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Migliora l\'accessibilità web"</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\nDopo 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\nNota. 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\nPassaggio 1. Premi e tieni premuto il tasto di accensione fino all\'emissione di un suono o una vibrazione.\n\nPassaggio 2. Tocca con due dita e tieni premuto finché senti un suono di conferma.\n\nSe 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 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_menu_item_settings" msgid="3344942964710773365">"Impostazioni"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Attivo"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Disattivato"</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="accessibility_feature_state_on" msgid="2864292320042673806">"Attiva"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Non attiva"</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="print_settings" msgid="4742428530112487843">"Stampa"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Impostazioni di stampa"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Servizi"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utilizzare <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> può ricevere i documenti stampati. Tali documenti potrebbero contenere dati riservati."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nessun servizio installato"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Impostazioni"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Aggiungi stampanti"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Attiva"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Non attiva"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Consumo batteria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Dati uso batteria non disp."</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Dati ricevuti"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Dati mobili inviati"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Dati mobili ricevuti"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Dati Wi-Fi inviati"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Dati Wi-Fi ricevuti"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tempo in attività"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Interrompi o disinstalla l\'applicazione"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Controlla manualmente il GPS per impedire all\'applicazione di utilizzarlo"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"L\'applicazione potrebbe offrire impostazioni per ridurre l\'utilizzo della batteria"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Batteria utilizzata dall\'utente"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> dallo scollegamento"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Durante ultimo scollegamento per <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Totali utilizzo"</string>
@@ -1331,7 +1459,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>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tono"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Interessa il tono del testo parlato"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Lingua"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Lingua non selezionata"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Imposta la voce specifica della lingua per il testo parlato"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Ascolta un esempio"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Riproduci una breve dimostrazione della sintesi vocale"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Luminosità: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"auto"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"massima"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"media"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"non attiva"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Archivio credenziali"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installa da archivio"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"In caso di reinstallazione di un\'applicazione, ripristina impostazioni e dati di backup"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Apri segnalazione bug"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Raccoglierà informazioni sullo stato corrente del dispositivo che verranno inviate sotto forma di messaggio email. Passerà un po\' di tempo prima che la segnalazione di bug aperta sia pronta per essere inviata; ti preghiamo di avere pazienza."</string>
-    <string name="report" msgid="302437572240018342">"Segnala"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Password di backup desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"I backup desktop completi non sono attualmente protetti."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tocca per modificare o rimuovere la password per i backup desktop completi"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nTocca "<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>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Calendario"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Contatti"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Benvenuto in Google Sync."</font>" "\n"L\'approccio di Google alla sincronizzazione di dati per consentirti l\'accesso ai tuoi contatti, appuntamenti e altro ancora, ovunque tu sia."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Benvenuto in Google Sync."</font>" \nL\'approccio di Google alla sincronizzazione di dati per consentirti l\'accesso ai tuoi contatti, appuntamenti e altro ancora, ovunque tu sia."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Impostazioni sincronizzazione applicazioni"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dati e sincronizzazione"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Cambia password"</string>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Flash delle superfici delle finestre all\'aggiornamento"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Aggiornamenti visualizz. GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash delle visualizzazioni dentro le finestre se disegnate con GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Aggiornam. livelli hardware"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Lampeggia verde se aggiornam. livelli hardware"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Debug overdraw GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostra utilizzo CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Overlay schermo che mostra l\'uso corrente della CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forza rendering GPU"</string>
     <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="debug_applications_category" msgid="4206913653849771549">"Applicazioni"</string>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simula display secondari"</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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Disattiva dati in background su reti mobili. Reti non mobili usate se disponibili."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Per limitare i dati in background, imposta un limite dati mobili."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Limitare i dati in background?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Questa funzione può causare l\'interruzione del funzionamento di un\'applicazione che dipende dai dati in background quando sono disponibili solo le reti mobili."\n\n"Puoi trovare controlli di utilizzo dei dati più appropriati nelle impostazioni disponibili all\'interno dell\'applicazione."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Questa funzione può causare l\'interruzione del funzionamento di un\'applicazione che dipende dai dati in background quando sono disponibili solo le reti mobili.\n\nPuoi trovare controlli di utilizzo dei dati più appropriati nelle impostazioni disponibili all\'interno dell\'applicazione."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"La limitazione dei dati in background è possibile solo se hai impostato un limite per i dati mobili."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Attivare sincr. autom. dati?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Tutte le modifiche che apporti ai tuoi account sul Web verranno automaticamente copiate sul tablet."\n\n"Alcuni account potrebbero inoltre copiare automaticamente sul Web tutte le modifiche che apporti sul tablet. Gli account Google funzionano in questo modo."\n\n"Per scegliere quali tipi di informazioni sincronizzare all\'interno di ogni account, vai a Impostazioni &gt; Account."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Tutte le modifiche che apporti ai tuoi account sul Web verranno automaticamente copiate sul telefono."\n\n"Alcuni account potrebbero inoltre copiare automaticamente sul Web tutte le modifiche che apporti sul telefono. Gli account Google funzionano in questo modo."\n\n"Per scegliere quali tipi di informazioni sincronizzare all\'interno di ogni account, vai a Impostazioni &gt; Account."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Tutte le modifiche che apporti ai tuoi account sul Web verranno automaticamente copiate sul tablet.\n\nAlcuni account potrebbero inoltre copiare automaticamente sul Web tutte le modifiche che apporti sul tablet. Gli account Google funzionano in questo modo.\n\nPer scegliere quali tipi di informazioni sincronizzare all\'interno di ogni account, vai a Impostazioni &gt; Account."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Tutte le modifiche che apporti ai tuoi account sul Web verranno automaticamente copiate sul telefono.\n\nAlcuni account potrebbero inoltre copiare automaticamente sul Web tutte le modifiche che apporti sul telefono. Gli account Google funzionano in questo modo.\n\nPer scegliere quali tipi di informazioni sincronizzare all\'interno di ogni account, vai a Impostazioni &gt; Account."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Disattivare sincr. autom. dati?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"In questo modo limiterai l\'utilizzo di dati e della batteria, ma dovrai sincronizzare ciascun account manualmente per raccogliere le informazioni recenti. Inoltre non riceverai notifiche quando si verificano gli aggiornamenti."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data reimpostazione ciclo utilizzo"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Imposta avviso sull\'utilizzo dei dati"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Imposta limite di utilizzo dati"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitazione utilizzo dati"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"La tua connessione dati mobili verrà disattivata al raggiungimento del limite specificato.\n\nDato 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\nDato 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" 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\nQuesta 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\nQuesta 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"App e utenti rimossi"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> ricevuti, <xliff:g id="SENT">%2$s</xliff:g> inviati"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: utilizzati circa <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>: 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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Aggiungi profilo VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Modifica profilo"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Elimina profilo"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN sempre attiva"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Seleziona un profilo VPN a cui rimanere sempre connesso. Il traffico di rete sarà consentito solo quando sei connesso a questa VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Nessuna"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"La VPN sempre attiva richiede un indirizzo IP per server e DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Nessuna connessione di rete disponibile. Riprova più tardi."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Manca un certificato. Modifica il profilo."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annulla"</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">"Aggiornamenti di sistema aggiuntivi"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Utenti e limitazioni"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Utenti"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Aggiungi utente"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Modifica dettagli"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Informazioni utente"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Nome"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Limitazioni contenuti"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"PIN obbligatorio"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Valutazione contenuti"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Applicazioni di sistema"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Applicazioni installate"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Elimina"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Rimuovi utente"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Bambino molesto"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Disattivato"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissivo"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Applicazione"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Utenti"</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="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\nDopo la creazione di un nuovo utente, la persona in questione deve svolgere una procedura di configurazione.\n\nQualsiasi 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\nQualsiasi 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_confirm_remove_message" msgid="5284111415714437285">"Vuoi rimuovere l\'utente e tutti i dati associati dal dispositivo?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Cambia le dimensioni del carattere"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Limitazioni"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Rimuovi limitazioni"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Cambia PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostra notifiche"</string>
     <string name="help_label" msgid="1107174367904110532">"Guida"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Account per i contenuti"</string>
+    <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="6160672982086584261">"Imposta restrizioni applicazioni"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controllate da <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Questa app non è supportata nei profili con limitazioni"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Questa app può accedere ai tuoi account"</string>
+    <string name="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 e236cc8..11e95a2 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,16 +218,127 @@
     <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="886742181977884584">"מדיה"</item>
+    <item msgid="7924928667052300589">"מכשיר"</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>
+    <item msgid="5124443975763747838">"לחצני מדיה"</item>
+    <item msgid="4547883971364273343">"מיקוד אודיו"</item>
+    <item msgid="2603878814882344450">"שליטה ראשית בעוצמת קול"</item>
+    <item msgid="7136963238377062018">"עוצמת קול של דיבור"</item>
+    <item msgid="4270236897655923007">"עוצמת קול של צלצול"</item>
+    <item msgid="6325739889222559394">"עוצמת קול של מדיה"</item>
+    <item msgid="5762123934816216821">"עוצמת קול של התרעה"</item>
+    <item msgid="785049718065337473">"עוצמת קול של התראה"</item>
+    <item msgid="6700305533746877052">"עוצמת קול של Bluetooth"</item>
+    <item msgid="2029227495214047094">"שמור במצב פעיל"</item>
+    <item msgid="26109888160231211">"עקוב אחר מיקום"</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>
+    <item msgid="5753789168376302997">"לחצני מדיה"</item>
+    <item msgid="3265262911688671938">"מיקוד אודיו"</item>
+    <item msgid="2098976479485046797">"שליטה ראשית בעוצמת קול"</item>
+    <item msgid="5660213838861789350">"עוצמת קול של דיבור"</item>
+    <item msgid="7983336752371254444">"עוצמת קול של צלצול"</item>
+    <item msgid="7878027809189330917">"עוצמת קול של מדיה"</item>
+    <item msgid="7260546305036218513">"עוצמת קול של התראה"</item>
+    <item msgid="9103719301075748925">"עוצמת קול של התראות"</item>
+    <item msgid="7025966722295861512">"עוצמת קול של Bluetooth"</item>
+    <item msgid="4665183401128289653">"שמור במצב פעיל"</item>
+    <item msgid="8584357129746649222">"מיקום"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"קצר"</item>
     <item msgid="2560532955514699713">"בינוני"</item>
     <item msgid="2372711992605524591">"ארוך"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (ניקוי באגים)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"השתמש ב-Dalvik"</item>
+    <item msgid="5131846588686178907">"השתמש ב-ART"</item>
+    <item msgid="4530003713865319928">"השתמש ב-Build ניקוי הבאגים של ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"אל תבדוק לעולם"</item>
     <item msgid="6042769699089883931">"בדוק אם יש תוכן DRM בלבד"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"קנה מידה להנפשה 5x"</item>
     <item msgid="1069584980746680398">"קנה מידה להנפשה 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"אין"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi ו-1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"ללא"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"כבוי"</item>
+    <item msgid="7688197031296835369">"הצגת אזורים עם חריגה"</item>
+    <item msgid="8332661909019981149">"הצגת מונה חריגות"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"הגבלת תקן"</item>
     <item msgid="4071574792028999443">"אין תהליכים ברקע"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"זמן קצוב לתפוגה"</item>
     <item msgid="7664124146786465092">"נכשל"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"שאל"</item>
+    <item msgid="5077768429488260031">"לעולם אל תאפשר"</item>
+    <item msgid="1417929597727989746">"אפשר תמיד"</item>
+  </string-array>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2656a9c..6f1f8b2 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"כן"</string>
     <string name="no" msgid="6731231425810196216">"לא"</string>
     <string name="create" msgid="3578857613172647409">"צור"</string>
+    <string name="allow" msgid="3349662621170855910">"אפשר"</string>
+    <string name="deny" msgid="6947806159746484865">"דחה"</string>
     <string name="device_info_default" msgid="7847265875578739287">"לא ידוע"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"אתה כעת במרחק של צעד <xliff:g id="STEP_COUNT">%1$d</xliff:g> מלהיות מפתח."</item>
+    <item quantity="other" msgid="6722953419953594148">"אתה כעת במרחק של <xliff:g id="STEP_COUNT">%1$d</xliff:g> צעדים מלהיות מפתח."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"אתה כעת מפתח!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"אין צורך, אתה כבר מפתח."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"אלחוטי ורשתות"</string>
     <string name="header_category_device" msgid="5781174212691167553">"מכשיר"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"אישי"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"טוען"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"פורקת"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(אלחוטי)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"לא בטעינה"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"לא טוען"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"מלא"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"מנותקת"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"אלחוטי"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"לא ידוע"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"לא ידוע"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"שגיאה לא מוכרת"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"קר"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"גלוי"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"גלוי לכל מכשירי Bluetooth הסמוכים (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"גלוי לכל מכשירי Bluetooth הסמוכים"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"לא גלוי עבור מכשירי Bluetooth אחרים"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"גלוי רק למכשירים מותאמים"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"הפוך את המכשיר לגלוי"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"זמן קצוב לחשיפה"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"הגדר במשך כמה זמן המכשיר יהיה גלוי"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"נעל חיוג קולי"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"מנע את השימוש בחייגן Bluetooth כאשר המסך נעול"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"מכשירי Bluetooth"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"הצג קבצים שהתקבלו"</string>
     <string name="device_picker" msgid="8398232791303186677">"בוחר מכשיר Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"בקשה להרשאת Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"יישום מסוים רוצה להפעיל את Bluetooth. לאפשר?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"יישום מסוים בטבלט שלך רוצה להפוך את הטבלט לגלוי בפני מכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות. לאפשר?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"יישום מסוים בטלפון שלך רוצה להפוך את הטלפון לגלוי בפני מכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות. לאפשר?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"יישום מסוים בטבלט שלך רוצה להפוך את הטבלט ל\'גלוי תמיד\' בפני מכשירי Bluetooth אחרים. לאפשר?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"יישום מסוים בטלפון שלך רוצה להפוך את הטלפון ל\'גלוי תמיד\' למכשירי Bluetooth אחרים. לאפשר?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"יישום מסוים בטבלט שלך רוצה להפעיל את Bluetooth ולהפוך את הטבלט לגלוי בפני מכשירים אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות. לאפשר?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"יישום מסוים בטלפון שלך רוצה להפעיל את Bluetooth ולהפוך את הטלפון לגלוי בפני מכשירים אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות. לאפשר?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"יישום מסוים בטבלט שלך רוצה להפעיל את Bluetooth ולהפוך את הטבלט לגלוי בפני מכשירים אחרים. לאפשר?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"יישום מסוים בטלפון שלך רוצה להפעיל את Bluetooth ולהפוך את הטלפון לגלוי בפני מכשירים אחרים. לאפשר?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"יישום מסוים רוצה להפעיל את ה-Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"יישום מסוים רוצה להפוך את הטאבלט שלך לגלוי בפני מכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"יישום מסוים רוצה להפוך את הטלפון שלך לגלוי בפני מכשירי Bluetooth אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"יישום מסוים רוצה להפוך את הטאבלט שלך לגלוי בפני מכשירי Bluetooth אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"יישום מסוים רוצה להפוך את הטלפון שלך לגלוי בפני מכשירי Bluetooth אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"יישום מסוים רוצה להפעיל את ה-Bluetooth ולהפוך את הטאבלט שלך לגלוי בפני מכשירים אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"יישום מסוים רוצה להפעיל את ה-Bluetooth ולהפוך את הטלפון שלך לגלוי בפני מכשירים אחרים למשך <xliff:g id="TIMEOUT">%1$d</xliff:g> שניות."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"יישום מסוים רוצה להפעיל את ה-Bluetooth ולהפוך את הטאבלט שלך לגלוי בפני מכשירים אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"יישום מסוים רוצה להפעיל את ה-Bluetooth ולהפוך את הטלפון שלך לגלוי בפני מכשירים אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"מפעיל Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth נכבה…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"חיבור אוטומטי"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"שרת ה-Proxy של HTTP נמצא בשימוש הדפדפן, אך יישומים אחרים לא יכולים להשתמש בו."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"מיקום:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID שכן:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"נתונים:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"ניסיונות נתונים:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"שירות GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"נדידה:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"איבדת את קישוריות הנתונים כיוון שעזבת את הרשת הביתית בזמן שנדידת הנתונים היתה כבויה."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"הפעל"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"כשאתה מאפשר נדידה, ייתכן שתחויב בעלויות נדידה גבוהות!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"כשאתה מאפשר נדידה, הדבר עשוי להיות כרוך בעלויות נדידה גבוהות!\n\nהגדרה זו משפיעה על כל המשתמשים בטאבלט הזה."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"כשאתה מאפשר נדידה, הדבר עשוי להיות כרוך בעלויות נדידה גבוהות!\n\nהגדרה זו משפיעה על כל המשתמשים בטלפון הזה."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"האם לאפשר נדידה?"</string>
     <string name="networks" msgid="6333316876545927039">"בחירת מפעיל"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"בחר מפעיל רשת"</string>
@@ -297,6 +307,10 @@
     <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>
@@ -308,8 +322,8 @@
     <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">"אתה יכול להצפין חשבונות, הגדרות, יישומים שהורדת ונתונים שלהם, מדיה וקבצים אחרים. לאחר שתצפין את הטבלט שלך, בכל פעם שתפעיל אותו תצטרך להקליד קוד PIN מספרי או סיסמה כדי לפענח את הנתונים. לא תוכל לבטל את הצפנת הטבלט שלך, אלא אם תבצע איפוס לנתוני יצרן. פעולה זו תמחק את כל הנתונים."\n\n"ההצפנה אורכת שעה לפחות. עליך לבצע הפעלה עם סוללה טעונה ולהשאיר את הטבלט מחובר עד לסיום ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד את כל הנתונים או חלק מהם."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"אתה יכול להצפין חשבונות, הגדרות, יישומים שהורדת ונתונים שלהם, מדיה וקבצים אחרים. לאחר שתצפין את הטלפון שלך, בכל פעם שתפעיל אותו תצטרך להקליד קוד PIN מספרי או סיסמה כדי לפענח את הנתונים. לא תוכל לבטל את הצפנת הטלפון שלך, אלא אם תבצע איפוס לנתוני יצרן. פעולה זו תמחק את כל הנתונים."\n\n"ההצפנה אורכת שעה לפחות. עליך לבצע הפעלה עם סוללה טעונה ולהשאיר את הטלפון מחובר עד לסיום ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד את כל הנתונים או חלק מהם."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"אתה יכול להצפין חשבונות, הגדרות, יישומים שהורדת ונתונים שלהם, מדיה וקבצים אחרים. לאחר שתצפין את הטבלט שלך, בכל פעם שתפעיל אותו תצטרך להקליד קוד PIN מספרי או סיסמה כדי לפענח את הנתונים. לא תוכל לבטל את הצפנת הטבלט שלך, אלא אם תבצע איפוס לנתוני יצרן. פעולה זו תמחק את כל הנתונים.\n\nההצפנה אורכת שעה לפחות. עליך לבצע הפעלה עם סוללה טעונה ולהשאיר את הטבלט מחובר עד לסיום ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד את כל הנתונים או חלק מהם."</string>
+    <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>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"נסה שוב בעוד <xliff:g id="DELAY">^1</xliff:g> שניות."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"הקלד את הסיסמה שלך"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ההצפנה נכשלה"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"ההצפנה הופסקה ואין אפשרות להשלים אותה. בשל כך, לא ניתן עוד לגשת לנתונים בטבלט שלך. "\n\n"כדי לחזור ולהשתמש בטבלט, עליך לבצע איפוס נתוני יצרן. כאשר תגדיר את הטבלט לאחר האיפוס, תוכל לשחזר נתונים שגובו בחשבון Google שלך."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"ההצפנה הופסקה ואין אפשרות להשלים אותה. כתוצאה מכך, לא ניתן עוד לגשת לנתונים בטלפון שלך. "\n\n"כדי לחזור ולהשתמש בטלפון, עליך לבצע איפוס להגדרות היצרן. כאשר תגדיר את הטלפון לאחר האיפוס, תהיה לך הזדמנות לשחזר נתונים שגובו בחשבון Google שלך."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"ההצפנה הופסקה ואין אפשרות להשלים אותה. בשל כך, לא ניתן עוד לגשת לנתונים בטבלט שלך. \n\nכדי לחזור ולהשתמש בטבלט, עליך לבצע איפוס נתוני יצרן. כאשר תגדיר את הטבלט לאחר האיפוס, תוכל לשחזר נתונים שגובו בחשבון Google שלך."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"ההצפנה הופסקה ואין אפשרות להשלים אותה. כתוצאה מכך, לא ניתן עוד לגשת לנתונים בטלפון שלך. \n\nכדי לחזור ולהשתמש בטלפון, עליך לבצע איפוס להגדרות היצרן. כאשר תגדיר את הטלפון לאחר האיפוס, תהיה לך הזדמנות לשחזר נתונים שגובו בחשבון Google שלך."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"החלפת שיטת קלט"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"בחירת נעילת מסך"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"בחר נעילת גיבוי"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"שנה PIN של ביטול נעילה"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"שנה סיסמת ביטול נעילה"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"אורך הסיסמה חייב להיות %d תווים לפחות"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"ה-PIN חייב להכיל %d תווים לפחות"</string>
+    <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>
@@ -406,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>
@@ -480,6 +503,28 @@
     <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_empty_list_wifi_display_off" msgid="1225626898926363100">"כדי לראות מכשירים, הפעל את הצג האלחוטי."</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_paired_devices" msgid="7395326840730024303">"צגים מותאמים"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"מכשירים זמינים"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"מתחבר"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"מחובר"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"זמין"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"בשימוש"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"הגדרות תצוגה"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"להתנתק?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"פעולה זו תסיים את החיבור עם:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"אפשרויות צג אלחוטי"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"שכח"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"סיום"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"שם"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"מופעל"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"כבוי"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"מושבת"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"אפשר חילופי מידע כאשר הטאבלט נוגע במכשיר אחר"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"אפשר החלפת נתונים כאשר הטלפון נוגע במכשיר אחר"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"כבוי"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"לא זמין משום שה-NFC כבוי"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"כאשר תכונה זו מופעלת, תוכל לשדר תוכן יישומים למכשיר אחר התומך ב-NFC על ידי החזקת המכשירים קרובים אחד לשני. לדוגמה, תוכל לשדר דפי דפדפן, סרטוני YouTube, אנשי קשר  ועוד."\n\n"פשוט קרב את המכשירים זה לזה (בדרך כלל גב אל גב) ולאחר מכן גע במסך שלך. היישום יקבע מה ישודר."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"כאשר תכונה זו מופעלת, תוכל לשדר תוכן יישומים למכשיר אחר התומך ב-NFC על ידי החזקת המכשירים קרובים אחד לשני. לדוגמה, תוכל לשדר דפי דפדפן, סרטוני YouTube, אנשי קשר  ועוד.\n\nפשוט קרב את המכשירים זה לזה (בדרך כלל גב אל גב) ולאחר מכן גע במסך שלך. היישום יקבע מה ישודר."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"גילוי שירותי רשת"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"אפשר ליישומים במכשירים אחרים לגלות יישומים במכשיר זה"</string>
-    <string name="wifi_quick_toggle_title" msgid="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="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="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="8116564886303972764">"הזן את מספר 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_in_progress" msgid="2944576520214787628">"WPS כבר מתבצע, והפעולה יכולה להימשך עד שתי דקות"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"מחובר לרשת Wi-Fi ‏<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="3372311348221357944">"התקנת WPS כבר מתבצעת, והשלמת הפעולה עשויה להימשך עד שתי דקות"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS נכשל. נסה שוב בעוד מספר דקות."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"הגדרת האבטחה של הנתב האלחוטי (WEP) אינה נתמכת"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"הגדרת האבטחה של הנתב האלחוטי (TKIP) אינה נתמכת"</string>
     <string name="wifi_wps_failed_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>
@@ -564,6 +621,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>
@@ -571,8 +631,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_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi מתקדם"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"תדר Wi-Fi"</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="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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"מחפש…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"שנה את שם המכשיר"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"מכשירי עמית"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"קבוצות שמורות בזיכרון"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"לא ניתן להתחבר."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"ניסיון שינוי השם של המכשיר נכשל."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"להתנתק?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"אם תתנתק, החיבור שלך עם <xliff:g id="PEER_NAME">%1$s</xliff:g> ועם <xliff:g id="PEER_COUNT">%2$s</xliff:g> מכשירים נוספים יסתיים."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"האם לבטל את ההזמנה?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"האם אתה רוצה לבטל את ההזמנה ליצירת קשר עם <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"נקודה חמה ניידת של Wi-Fi"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"לשכוח קבוצה זו?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"נקודה חמה ניידת של Wi-Fi"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"אפקטים מוסיקליים"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"עוצמת קול של צלצול"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"רטט במצב שקט"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"הודעת ברירת מחדל"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"צליל ברירת מחדל להתראה"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"תאורת התראה של אות"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"צלצול"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"התראה"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"השתמש בעוצמת הקול של שיחות נכנסות להתראות"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"בחר רינגטון להתראה"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"צליל ברירת מחדל להתראה"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"מדיה"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"קבע עוצמת קול למוסיקה ולסרטוני וידאו"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"התראה"</string>
@@ -671,15 +743,16 @@
     <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="3848608373818910549">"Screen Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"יופעל בעת כניסה למצב שינה אם מחובר לחשמל"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"מושבת"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"מבחר Candy"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"מתי להפעיל"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"לאחר <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ללא פעילות"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"אף פעם"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"נסה בעצמך!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"הפעל גם כשמחובר למעגן"</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">"כדי לשלוט במה שקורה כאשר הטלפון בעגינה ו/או במצב שינה, הפעל את חלום בהקיץ."</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>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN של SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN שגוי"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"קודי ה-PIN אינם תואמים"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"לא ניתן לשנות את קוד ה-PIN‏."\n"כנראה שקוד ה-PIN שגוי."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"לא ניתן לשנות את קוד ה-PIN‏.\nכנראה שקוד ה-PIN שגוי."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"ה-PIN של ה-SIM השתנה בהצלחה"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"לא ניתן לשנות את מצב הנעילה של כרטיס ה-SIM‏."\n"כנראה שקוד ה-PIN שגוי."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"לא ניתן לשנות את מצב הנעילה של כרטיס ה-SIM‏.\nכנראה שקוד ה-PIN שגוי."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"אישור"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ביטול"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"סטטוס טאבלט"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"גרסת פס בסיס"</string>
     <string name="kernel_version" msgid="9192574954196167602">"גרסת ליבה"</string>
     <string name="build_number" msgid="3075795840572241758">"מספר Build"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"סטטוס SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"לא זמין"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"סטטוס"</string>
     <string name="device_status" msgid="607405385799807324">"סטטוס"</string>
@@ -733,12 +807,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">"סוג רשת לנייד"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"נתוני ספק"</string>
     <string name="status_data_state" msgid="5503181397066522950">"מצב רשת לנייד"</string>
     <string name="status_service_state" msgid="2323931627519429503">"מצב שירות"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"עוצמת אות"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"אחסון USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"כרטיס SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"זמין"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"זמין (לקריאה בלבד)"</string>
     <string name="memory_size" msgid="6629067715017232195">"שטח כולל"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"מחשב…"</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"יישומים (נתוני יישום ותוכן מדיה)"</string>
@@ -756,6 +832,7 @@
     <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_cache_usage" msgid="6704293333141177910">"נתונים בקובץ שמור"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"בטל טעינה של אחסון משותף"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"בטל טעינה של כרטיס SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"בטל טעינה של אמצעי אחסון פנימי מסוג USB"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"מחק כרטיס SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"מוחק את כל הנתונים שבאמצעי האחסון הפנימי מסוג USB, כגון מוסיקה ותמונות."</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"מוחק את כל הנתונים שבכרטיס SD, כגון מוסיקה ותמונות."</string>
-    <string name="read_only" msgid="6702420168629076340">" (לקריאה בלבד)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"האם לנקות נתונים בקובץ שמור?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"פעולה זו תנקה נתונים בקובץ שמור, לכל היישומים."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"פונקציית MTP או PTP פעילה"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"לבטל את טעינת אחסון ה-USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"לבטל את הטעינה של כרטיס ה-SD?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"אם תבטל את טעינת אחסון ה-USB, יישומים מסוימים שבהם אתה משתמש יופסקו וייתכן שלא יהיו זמינים עד שתטען מחדש את אחסון ה-USB."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"מצלמה (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"מאפשר להעביר תמונות באמצעות תוכנת המצלמה, ולהעביר קבצים במחשבים שאינם תומכים ב-MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"התקן כלים להעברת קבצים"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"משתמשים אחרים"</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>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"איפוס נתוני יצרן"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"מוחק את כל הנתונים בטבלט"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"מחק את כל הנתונים בטלפון"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטבלט שלך, כולל:"\n\n<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והיישומים שלך"</li>\n<li>"היישומים שהורדת"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטלפון שלך, כולל:"\n\n<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והיישומים שלך"</li>\n<li>"היישומים שהורדת"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"אתה מחובר כעת לחשבונות הבאים:"\n</string>
+    <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>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"כדי למחוק פריטי מוסיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"כרטיס ה-SD"</b>"."</string>
@@ -897,10 +979,15 @@
     <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="manage_mobile_plan_title" msgid="7588182101738043593">"נהל תוכנית לנייד"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"ספק SIM לא מוכר"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"ל-%1$s אין אתר מוכר לניהול תצורה"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"הכנס כרטיס SIM ואתחל"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"התחבר לאינטרנט"</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>
@@ -917,6 +1004,7 @@
     <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="copyright_title" msgid="865906688917260647">"זכויות יוצרים"</string>
     <string name="license_title" msgid="1990487604356037871">"רישיון"</string>
     <string name="terms_title" msgid="7697580845616764642">"תנאים והגבלות"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"שנה PIN לביטול נעילה"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"אשר קו שנשמר"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"נסה שוב:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"שרטט קו ביטול נעילה"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"שרטט דוגמת ביטול נעילה:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"לחץ על \'תפריט\' לקבלת עזרה."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"שחרר את האצבע כשתסיים."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"חבר <xliff:g id="NUMBER">%d</xliff:g> נקודות לפחות. נסה שוב:"</string>
@@ -966,21 +1054,18 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"כיצד לשרטט קו ביטול נעילה"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"ניסיונות כושלים רבים מדי!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"נסה שוב בעוד <xliff:g id="NUMBER">%d</xliff:g> שניות."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"ביטול"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"הבא"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"אבטחת הטבלט"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"אבטחת הטלפון"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"הגן על הטבלט שלך מפני שימוש לא מורשה על ידי יצירת קו ביטול נעילה אישי למסך. הסט את האצבע כדי לחבר את הנקודות בכל סדר שתבחר במסך הבא. עליך לחבר לפחות ארבע נקודות. "\n\n"מוכן להתחיל? גע ב\'הבא\'."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"הגן על הטלפון שלך מפני שימוש לא מורשה על ידי יצירת קו ביטול נעילה אישי במסך. השתמש באצבע כדי לחבר לפחות ארבע נקודות בכל סדר שהוא במסך הבא."\n\n"מוכן להתחיל? גע באפשרות \'הבא\'."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"היישום אינו מותקן בטלפון."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"נהל יישומים"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"נהל והסר יישומים מותקנים"</string>
-    <string name="applications_settings" msgid="1721442176406964682">"Google Apps"</string>
+    <string name="applications_settings" msgid="1721442176406964682">"Apps"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"ניהול יישומים, הגדרת קיצורי דרך להפעלה מהירה"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"הגדרות יישום"</string>
     <string name="install_applications" msgid="4872012136210802181">"מקורות לא ידועים"</string>
     <string name="install_unknown_applications" msgid="176855644862942064">"אפשר התקנת יישומים ממקורות לא ידועים"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"הטבלט והנתונים האישיים שלך חשופים יותר בפני התקפות על ידי יישומים ממקורות לא ידועים. אתה מסכים לכך שאתה האחראי הבלעדי לכל נזק שייגרם לטבלט שלך או לאובדן נתונים שעלולים להיגרם בעקבות שימוש ביישומים אלה."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"הטלפון והנתונים האישיים שלך חשופים יותר בפני התקפות של יישומים ממקורות לא ידועים. אתה מסכים לכך שאתה האחראי הבלעדי לכל נזק שנגרם לטלפון או לאובדן של נתונים שעשויים להיגרם כתוצאה משימוש ביישומים אלה."</string>
+    <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="application_info_label" msgid="5736524913065714880">"פרטי יישום"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"נתוני אחסון USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"כרטיס SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"הסר התקנה"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"הסר התקנה עבור כל המשתמשים"</string>
+    <string name="install_text" msgid="884360662922471113">"התקן"</string>
     <string name="disable_text" msgid="6544054052049395202">"השבת"</string>
     <string name="enable_text" msgid="9217362512327828987">"הפעל"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"נקה נתונים"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"הצג תהליכים המאוחסנים בקובץ שמור"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"אפס העדפות יישום"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"האם לאפס העדפות יישום?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"פעולה זו תאפס את כל ההעדפות עבור:"\n\n" "<li>"יישומים מושבתים"</li>\n" "<li>"התראות יישום מושבת"</li>\n" "<li>"יישומי ברירת מחדל לפעולות"</li>\n" "<li>"הגבלות נתוני רקע ליישומים"</li>\n\n" לא תאבד נתוני יישומים."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"פעולה זו תאפס את כל ההעדפות עבור:\n\n "<li>"יישומים מושבתים"</li>\n" "<li>"התראות יישום מושבת"</li>\n" "<li>"יישומי ברירת מחדל לפעולות"</li>\n" "<li>"הגבלות נתוני רקע ליישומים"</li>\n\n" לא תאבד נתוני יישומים."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"אפס יישומים"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"נהל שטח אחסון"</string>
     <string name="filter" msgid="2018011724373033887">"סינון"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"בחר אפשרויות סינון"</string>
     <string name="filter_apps_all" msgid="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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"בכרטיס SD"</string>
     <string name="disabled" msgid="9206776641295849915">"מושבת"</string>
+    <string name="not_installed" msgid="1475144352069281880">"לא מותקן"</string>
     <string name="no_applications" msgid="7336588977497084921">"אין יישומים."</string>
     <string name="internal_storage" msgid="1584700623164275282">"אחסון פנימי"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"אחסון USB"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> ו-<xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"יישום זה עשוי לחייב אותך בכסף:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"האם לשלוח SMS פרימיום?"</string>
     <string name="computing_size" msgid="1599186977475211186">"מחשב..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"לא ניתן לחשב את גודל החבילה."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"לא מותקנים במכשיר שלך יישומים של צד שלישי."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"שנה את מיקום ההתקנה המועדף עבור יישומים חדשים."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"להשבית יישום מובנה?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"אם תשבית יישום מובנה, יישומים אחרים עשויים שלא לפעול כהלכה."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"האם למחוק נתונים ולהשבית את היישום?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"משתמש: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"משתמש שהוסר"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"תהליך <xliff:g id="NUMPROCESS">%1$d</xliff:g> ושירות <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"תהליך <xliff:g id="NUMPROCESS">%1$d</xliff:g> ו-‏<xliff:g id="NUMSERVICES">%2$d</xliff:g> שירותים"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> תהליכים ושירות <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"הגדרות מקלדת פיזית"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"לחץ על מקש הרווח פעמיים כדי להוסיף \'.\'"</string>
     <string name="show_password" msgid="3001113966880559611">"הפוך את הסיסמאות לגלויות"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></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>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"כדי להחליף פריסה, הקש Control-מקש רווח"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"ברירת מחדל"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"פריסות מקלדת"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"מילון משתמש"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"מילון אישי"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"מילונים אישיים"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"מילון אישי"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"הוסף"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"הוסף למילון"</string>
@@ -1157,6 +1252,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>
@@ -1176,7 +1273,7 @@
     <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"קיצור הדרך של <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> ‏(<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) יוסר."</string>
     <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"אישור"</string>
     <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"ביטול"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Google Apps"</string>
+    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Apps"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"קיצורי דרך"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"קלט טקסט"</string>
     <string name="input_method" msgid="5434026103176856164">"שיטת קלט"</string>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"המסך לעולם לא יהיה במצב שינה במהלך טעינה"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"הפעלת Snoop Log של Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"אחד את כל חבילות Bluetooth HCI בקובץ"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"בחירת זמן ריצה"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"בחירת זמן ריצה"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"האם לאתחל על מנת לשנות את זמן הריצה מ-<xliff:g id="OLD">%1$s</xliff:g> ל-<xliff:g id="NEW">%2$s</xliff:g>?"</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>
+    <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>
-    <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_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="enable_terminal_title" msgid="95572094356054120">"מסוף מקומי"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"הפעל יישום מסוף המציע גישה מקומית למעטפת"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"בחר גאדג\'ט"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"בחר Widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"האם ליצור Widget‏ ולאפשר גישה?"</string>
@@ -1234,29 +1345,43 @@
     <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_toggle_large_text_title" msgid="6618674985313017711">"טקסט גדול"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"לחצן ההפעלה מסיים שיחה"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"אמירת סיסמאות"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"עיכוב של \'גע והחזק\'"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"שיפור נגישות האינטרנט"</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>
+    <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_toggle_speak_password_preference_title" msgid="5986628515113204844">"אמירת סיסמאות"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"עיכוב של נגיעה והחזקה"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"הגדרות"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"מופעל"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"כבוי"</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="accessibility_feature_state_on" msgid="2864292320042673806">"פועל"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"כבוי"</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="print_settings" msgid="4742428530112487843">"הדפסה"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"הגדרות הדפסה"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"שירותים"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"האם להשתמש ב-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> יכול לקבל מסמכים שאתה מדפיס. מסמכים כאלה עשויים להכיל נתונים רגישים."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"אין שירותים מותקנים"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"הגדרות"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"הוסף מדפסות"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"פועל"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"כבוי"</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>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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_data_send" msgid="3875198715268918671">"נתונים לנייד נשלחו"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"נתונים לנייד התקבלו"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"נתוני Wi‑Fi נשלחו"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"נתוני Wi‑Fi התקבלו"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"אודיו"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Google וידאו"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"משך פעולה עד כה"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <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="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>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"גובה צליל"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"משפיע על הטון של הטקסט הנאמר"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"שפה"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"לא נבחרה שפה"</string>
     <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>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"בהירות <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"אוטומטי"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"מלא"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"חצי"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"כבוי"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"אחסון אישורים"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"התקן מאמצעי אחסון"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <string name="backup_section_title" msgid="7952232291452882740">"גיבוי ושחזור"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"נתונים אישיים"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"גבה את הנתונים שלי"</string>
-    <string name="backup_data_summary" msgid="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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"לאחר התקנה מחדש של יישום, שחזר את ההגדרות והנתונים המגובים"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"מלא דיווח על באג"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"פעולה זו תאסוף מידע על מצב המכשיר הנוכחי שלך על מנת לשלוח לנו הודעת דוא\"ל. היא תימשך זמן קצר מרגע פתיחת דיווח הבאג ועד שיהיה ניתן לבצע שליחה. התאזר בסבלנות."</string>
-    <string name="report" msgid="302437572240018342">"דווח"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"סיסמת גיבוי מקומי"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"גיבויים מלאים בשולחן העבודה אינם מוגנים כעת"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"גע כדי לשנות או להסיר את הסיסמה עבור גיבויים מלאים בשולחן העבודה"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"יומן Google"</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">"נתונים וסינכרון"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"שנה סיסמה"</string>
@@ -1536,7 +1680,8 @@
     <string name="wait_for_debugger" msgid="1202370874528893091">"המתן למנקה באגים"</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_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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"הבזק את כל שטחי החלון כשהם מתעדכנים"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"הצג עדכוני תצוגה של GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"הבזק תצוגות בתוך חלונות בעת ציור באמצעות ה-GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"הצג עדכוני שכבות חומרה"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"הצג הבהוב ירוק לשכבות חומרה כשהן מתעדכנות"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"חריגה בניקוי באגים ב-GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"הצג את השימוש ב-CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"שכבת על של מסך שמציגה את השימוש הנוכחי ב-CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"אלץ עיבוד ב-GPU"</string>
-    <string name="force_hw_ui_summary" msgid="5535991166074861515">"אכוף שימוש ב-GPU לציור דו-מימדי"</string>
+    <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>
-    <string name="debug_applications_category" msgid="4206913653849771549">"Google Apps"</string>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"צור הדמיית תצוגות משניות"</string>
+    <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"אל תשמור פעילויות"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"השמד כל פעילות ברגע שהמשתמש עוזב אותה"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <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" msgid="1466689968707308512">"תכונה זו עלולה לגרום ליישום התלוי בנתוני רקע להפסיק לפעול כאשר רק רשתות לנייד זמינות."\n\n"ניתן למצוא אמצעים מתאימים יותר לבקרת השימוש בנתונים דרך ההגדרות הזמינות ביישום."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"תכונה זו עלולה לגרום ליישום התלוי בנתוני רקע להפסיק לפעול כאשר רק רשתות לנייד זמינות.\n\nניתן למצוא אמצעים מתאימים יותר לבקרת השימוש בנתונים דרך ההגדרות הזמינות ביישום."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="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>
@@ -1620,22 +1769,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" 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_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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"הוספת פרופיל VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"ערוך פרופיל"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"מחק פרופיל"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN מופעל תמיד"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"בחר פרופיל VPN שתישאר מחובר אליו תמיד. תנועת רשת תהיה מותרת רק כאשר תהיה מחובר ל-VPN זה."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"ללא"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPN מופעל תמיד מחייב כתובת IP לשרת ול-DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"אין חיבור לרשת. נסה שוב מאוחר יותר."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"חסר אישור. ערוך את הפרופיל."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"מערכת"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ביטול"</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">"עדכוני מערכת נוספים"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"משתמשים והגבלות"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"משתמשים"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"הוסף משתמש"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"ערוך פרטים"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"פרטי משתמש"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"שם"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"הגבלות תוכן"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"דרוש הזנת מספר PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"דירוג תוכן"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"יישומי מערכת"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"יישומים מותקנים"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"מחק"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"הסר משתמש"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"ילד מציק"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"מושבת"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"מתירני"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"אכיפה"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"משתמשים"</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="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_confirm_remove_message" msgid="5284111415714437285">"האם אתה בטוח שאתה רוצה להסיר את המשתמש ואת כל הנתונים המשויכים מהמכשיר?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"שנה גודל גופן"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"הגבלות"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"הסר הגבלות"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"שנה PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"הצג התראות"</string>
     <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="user_restrictions_title" msgid="7745810037152772035">"הגבלות על אפליקציות ותוכן"</string>
+    <string name="user_rename" msgid="8523499513614655279">"שנה שם"</string>
+    <string name="app_restrictions_custom_label" msgid="6160672982086584261">"הגדר הגבלות אפליקציה"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"בשליטת <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"יישום זה אינו נתמך בפרופילים מוגבלים"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"היישום הזה יכול לגשת לחשבונות שלך"</string>
+    <string name="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 578d4a7..f2b40b2 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,16 +218,127 @@
     <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="886742181977884584">"メディア"</item>
+    <item msgid="7924928667052300589">"端末"</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>
+    <item msgid="5124443975763747838">"メディアボタン"</item>
+    <item msgid="4547883971364273343">"音声フォーカス"</item>
+    <item msgid="2603878814882344450">"主音量"</item>
+    <item msgid="7136963238377062018">"音声の音量"</item>
+    <item msgid="4270236897655923007">"着信音の音量"</item>
+    <item msgid="6325739889222559394">"メディアの音量"</item>
+    <item msgid="5762123934816216821">"アラームの音量"</item>
+    <item msgid="785049718065337473">"通知音量"</item>
+    <item msgid="6700305533746877052">"Bluetoothの音量"</item>
+    <item msgid="2029227495214047094">"スリープモードにしない"</item>
+    <item msgid="26109888160231211">"場所を監視"</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>
+    <item msgid="5753789168376302997">"メディアボタン"</item>
+    <item msgid="3265262911688671938">"音声フォーカス"</item>
+    <item msgid="2098976479485046797">"主音量"</item>
+    <item msgid="5660213838861789350">"音声の音量"</item>
+    <item msgid="7983336752371254444">"着信音の音量"</item>
+    <item msgid="7878027809189330917">"メディアの音量"</item>
+    <item msgid="7260546305036218513">"アラームの音量"</item>
+    <item msgid="9103719301075748925">"通知の音量"</item>
+    <item msgid="7025966722295861512">"Bluetoothの音量"</item>
+    <item msgid="4665183401128289653">"スリープモードにしない"</item>
+    <item msgid="8584357129746649222">"場所"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短め"</item>
     <item msgid="2560532955514699713">"中"</item>
     <item msgid="2372711992605524591">"長め"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART(デバッグ)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Dalvikを使用"</item>
+    <item msgid="5131846588686178907">"ARTを使用"</item>
+    <item msgid="4530003713865319928">"ARTデバッグビルドを使用"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"チェックしない"</item>
     <item msgid="6042769699089883931">"DRMコンテンツのみをチェック"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"アニメーションスケール5x"</item>
     <item msgid="1069584980746680398">"アニメーションスケール10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"なし"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpiと1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"なし"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"OFF"</item>
+    <item msgid="7688197031296835369">"オーバードロー領域の表示"</item>
+    <item msgid="8332661909019981149">"オーバードローカウンタの表示"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"標準の上限"</item>
     <item msgid="4071574792028999443">"バックグラウンドプロセスを使用しない"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"タイムアウト"</item>
     <item msgid="7664124146786465092">"失敗しました"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"確認する"</item>
+    <item msgid="5077768429488260031">"許可しない"</item>
+    <item msgid="1417929597727989746">"常に許可する"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 4484304..8b55f93 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"はい"</string>
     <string name="no" msgid="6731231425810196216">"いいえ"</string>
     <string name="create" msgid="3578857613172647409">"作成"</string>
+    <string name="allow" msgid="3349662621170855910">"許可"</string>
+    <string name="deny" msgid="6947806159746484865">"許可しない"</string>
     <string name="device_info_default" msgid="7847265875578739287">"不明"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"デベロッパーになるまであと<xliff:g id="STEP_COUNT">%1$d</xliff:g>ステップです。"</item>
+    <item quantity="other" msgid="6722953419953594148">"デベロッパーになるまであと<xliff:g id="STEP_COUNT">%1$d</xliff:g>ステップです。"</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"これでデベロッパーになりました!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"必要ありません。既にデベロッパーです。"</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"無線とネットワーク"</string>
     <string name="header_category_device" msgid="5781174212691167553">"端末"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"ユーザー設定"</string>
@@ -84,7 +92,8 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"充電中"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"放電中"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(無線)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"充電していません"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"充電していません"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for battery_info_status_full (2824614753861462808) -->
@@ -92,6 +101,7 @@
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"電池使用時間:"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"無線"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"不明"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"不明"</string>
@@ -102,14 +112,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"不明なエラー"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"低温"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"検出可能"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"周辺のすべてのBluetoothデバイスに表示(<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"周辺のすべてのBluetoothデバイスに表示"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"他のBluetoothデバイスには非表示"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"ペア設定したデバイスにのみ表示"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"この端末の検出を許可する"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"表示のタイムアウト"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"端末の検出可能時間を設定する"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ボイスダイヤルをロック"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"画面がロックされているときはBluetoothボイスダイヤルを使用しない"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth端末"</string>
@@ -143,15 +150,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"受信済みファイルを表示"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetoothデバイスの選択"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth許可リクエスト"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"アプリがBluetoothをONにしようとしています。許可しますか?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のBluetoothデバイスからこのタブレットを検出可能にしようとしています。許可しますか?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のBluetoothデバイスからこの携帯端末を検出可能にしようとしています。許可しますか?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"アプリが、このタブレットを他のBluetoothデバイスから「常に検出可能」にしようとしています。許可しますか?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"アプリが、この端末を他のBluetoothデバイスから「常に検出可能」にしようとしています。許可しますか?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間BluetoothをONにして他のデバイスからこのタブレットを検出可能にしようとしています。許可しますか?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間BluetoothをONにして他のデバイスからこの携帯端末を検出可能にしようとしています。許可しますか?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"アプリが、BluetoothをONにして他のデバイスからこのタブレットを検出可能にしようとしています。許可しますか?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"アプリが、BluetoothをONにして他のデバイスからこの携帯端末を検出可能にしようとしています。許可しますか?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"アプリがBluetoothをONにしようとしています。"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のBluetoothデバイスにこのタブレットを表示しようとしています。"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間他のBluetoothデバイスにこの携帯端末を表示しようとしています。"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"アプリが他のBluetoothデバイスにこのタブレットを表示しようとしています。これは後からBluetoothの設定で変更できます。"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"アプリが他のBluetoothデバイスにこの携帯端末を表示しようとしています。これは後からBluetoothの設定で変更できます。"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間BluetoothをONにして他のデバイスにこのタブレットを表示しようとしています。"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"アプリが、<xliff:g id="TIMEOUT">%1$d</xliff:g>秒間BluetoothをONにして他のデバイスにこの携帯端末を表示しようとしています。"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"アプリがBluetoothをONにして他のデバイスにこのタブレットを表示しようとしています。これは後からBluetoothの設定で変更できます。"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"アプリがBluetoothをONにして他のデバイスにこの携帯端末を表示しようとしています。これは後からBluetoothの設定で変更できます。"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"BluetoothをONにしています..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"BluetoothをOFFにしています..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"自動接続"</string>
@@ -192,6 +199,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTPプロキシはブラウザで使用されていますが、他のアプリでは使用できません。"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"ロケーション:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"近くのCID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"セル情報:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"データの試行:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRSサービス:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"ローミング:"</string>
@@ -262,13 +270,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"データローミングをOFFにしたままホームネットワークの外に出たためデータ接続が切断されました。"</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"ONにする"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"データローミングを許可すると高額な通信料が発生することがあります。"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"データローミングを許可すると高額な通信料が発生することがあります。\n\nこの設定はこのタブレット上のすべてのユーザーに影響します。"</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"データローミングを許可すると高額な通信料が発生することがあります。\n\nこの設定はこの端末上のすべてのユーザーに影響します。"</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"データ ローミングを許可しますか?"</string>
     <string name="networks" msgid="6333316876545927039">"通信事業者の選択"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"通信事業者を選択する"</string>
@@ -278,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>
@@ -299,6 +309,10 @@
     <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>
@@ -310,8 +324,8 @@
     <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">"アカウント、設定、ダウンロードしたアプリとそのデータ、メディアなどのファイルを暗号化できます。タブレットを一度暗号化すると、電源を入れるたびに数値のPINまたはパスワードを入力して復号化する必要があります。暗号化を解除するためには、タブレットを出荷時設定にリセットしてすべてのデータを消去しなければなりません。"\n\n"暗号化には1時間以上かかります。開始する前に完全に充電し、暗号化が完了するまで電源を接続しておく必要があります。暗号化処理を中断すると、一部またはすべてのデータが失われます。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"アカウント、設定、ダウンロードしたアプリとそのデータ、メディアなどのファイルを暗号化できます。端末を一度暗号化すると、電源を入れるたびに数値のPINまたはパスワードを入力して復号化する必要があります。暗号化を解除するためには、端末を出荷時設定にリセットしてすべてのデータを消去しなければなりません。"\n\n"暗号化には1時間以上かかります。開始する前に完全に充電し、暗号化が完了するまで電源を接続しておく必要があります。暗号化処理を中断すると、一部またはすべてのデータが失われます。"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"アカウント、設定、ダウンロードしたアプリとそのデータ、メディアなどのファイルを暗号化できます。タブレットを一度暗号化すると、電源を入れるたびに数値のPINまたはパスワードを入力して復号化する必要があります。暗号化を解除するためには、タブレットを出荷時設定にリセットしてすべてのデータを消去しなければなりません。\n\n暗号化には1時間以上かかります。開始する前に完全に充電し、暗号化が完了するまで電源を接続しておく必要があります。暗号化処理を中断すると、一部またはすべてのデータが失われます。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"アカウント、設定、ダウンロードしたアプリとそのデータ、メディアなどのファイルを暗号化できます。端末を一度暗号化すると、電源を入れるたびに数値のPINまたはパスワードを入力して復号化する必要があります。暗号化を解除するためには、端末を出荷時設定にリセットしてすべてのデータを消去しなければなりません。\n\n暗号化には1時間以上かかります。開始する前に完全に充電し、暗号化が完了するまで電源を接続しておく必要があります。暗号化処理を中断すると、一部またはすべてのデータが失われます。"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"タブレットを暗号化"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"携帯端末を暗号化"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"充電してからもう一度お試しください。"</string>
@@ -327,8 +341,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g>秒後にやり直してください。"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"パスワードを入力してください"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"暗号化できませんでした"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"暗号化処理が中断されて完了できなかったためタブレット上のデータにアクセスできなくなりました。"\n\n"タブレットの使用を再開するには出荷時設定にリセットする必要があります。リセット後、タブレットのセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"暗号化処理が中断されて完了できなかったため端末上のデータにアクセスできなくなりました。"\n\n"端末の使用を再開するには出荷時設定にリセットする必要があります。リセット後、端末のセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"暗号化処理が中断されて完了できなかったためタブレット上のデータにアクセスできなくなりました。\n\nタブレットの使用を再開するには出荷時設定にリセットする必要があります。リセット後、タブレットのセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"暗号化処理が中断されて完了できなかったため端末上のデータにアクセスできなくなりました。\n\n端末の使用を再開するには出荷時設定にリセットする必要があります。リセット後、端末のセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"入力方法の切り替え"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"画面ロックを選択"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"バックアップのロックの選択"</string>
@@ -364,7 +378,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ロック解除PINの変更"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ロック解除パスワードの変更"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"パスワードを%d文字以上で入力してください"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PINを%d文字以上で入力してください"</string>
+    <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>
@@ -408,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>
@@ -482,6 +505,28 @@
     <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_empty_list_wifi_display_off" msgid="1225626898926363100">"デバイスを表示するにはワイヤレスディスプレイをONにしてください。"</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>
+    <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>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"接続済み"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"使用可能"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"使用中"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"ディスプレイの設定"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"切断しますか?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"この操作を行うと、次のデバイスとの接続が切断されます:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"ワイヤレスディスプレイのオプション"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"切断"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"完了"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"名前"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"ON"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"OFF"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"無効"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"タブレットが他のデバイスと接触したときのデータ交換を許可する"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"端末が他のデバイスと接触したときのデータ交換を許可する"</string>
@@ -490,56 +535,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"OFF"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFCがOFFのため使用できません"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Androidビーム"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"この機能をONにすると、別のNFC対応の端末を近づけて持ち、アプリのコンテンツをビームすることができます。たとえば、ブラウザのページ、YouTubeの動画、連絡帳の連絡先などをビームできます。"\n\n"2 つの端末を近づけて(通常は背面を向かい合わせにして)、画面をタップします。何をビームするかはアプリが判断します。"</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"この機能をONにすると、別のNFC対応の端末を近づけて持ち、アプリのコンテンツをビームすることができます。たとえば、ブラウザのページ、YouTubeの動画、連絡帳の連絡先などをビームできます。\n\n2 つの端末を近づけて(通常は背面を向かい合わせにして)、画面をタップします。何をビームするかはアプリが判断します。"</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="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="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="8116564886303972764">"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_in_progress" msgid="2944576520214787628">"WPSを設定中です。完了まで最大2分程度かかることがあります。"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"無線ルーターのセキュリティ設定(TKIP)はサポートされていません"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"認証に失敗しました。もう一度お試しください。"</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"別のWPSセッションが検出されました。数分後にもう一度お試しください。"</string>
     <string name="wifi_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>
@@ -566,6 +623,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>
@@ -573,8 +633,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_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi詳細設定"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi周波数帯域"</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="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>
@@ -590,13 +658,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"検索しています…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"デバイス名を変更"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"ピアデバイス"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"接続履歴のあるグループ"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"接続できませんでした。"</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"端末の名前を変更できませんでした。"</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"切断しますか?"</string>
@@ -604,11 +673,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"切断すると、<xliff:g id="PEER_NAME">%1$s</xliff:g>と他の<xliff:g id="PEER_COUNT">%2$s</xliff:g>個のデバイスの接続が停止します。"</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"招待状のキャンセル"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>との接続への招待をキャンセルしますか?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"ポータブルWi-Fiアクセスポイント"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"このグループとの接続を切断しますか?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ポータブルWi-Fiアクセスポイント"</string>
+    <string name="wifi_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>
@@ -618,12 +690,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"サウンド効果"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"着信音量"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"マナーモード時のバイブレーション"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"デフォルトの通知音"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"デフォルトの通知音"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"光を点滅させて通知"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"着信音"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"通知"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"通知音にも着信音量を適用"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"通知音を選択"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"デフォルトの通知音"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"メディア"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"音楽や動画の再生音量"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"アラーム"</string>
@@ -673,15 +745,16 @@
     <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="3848608373818910549">"スクリーンセーバー"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"電源接続時、スリープで開始"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"無効"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"選択したスクリーンセーバー"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"開始のタイミング"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"アイドル状態が<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>続いた後"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"設定しない"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"プレビュー"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"ホルダーに置いたときも開始する"</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">"OFF"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"携帯端末のホルダー装着時やスリープ時の動作を管理するにはスクリーンセーバーをONにします。"</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>
@@ -703,9 +776,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PINが正しくありません"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PINが一致しません"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"PINを変更できません。"\n"PINが正しくない可能性があります。"</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"PINを変更できません。\nPINが正しくない可能性があります。"</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PINが変更されました"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"SIMカードのロック状態を変更できません。"\n"PINが正しくない可能性があります。"</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"SIMカードのロック状態を変更できません。\nPINが正しくない可能性があります。"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"キャンセル"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"タブレットの状態"</string>
@@ -718,6 +791,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"ベースバンドバージョン"</string>
     <string name="kernel_version" msgid="9192574954196167602">"カーネルバージョン"</string>
     <string name="build_number" msgid="3075795840572241758">"ビルド番号"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinuxのステータス"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"該当なし"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"端末の状態"</string>
     <string name="device_status" msgid="607405385799807324">"端末の状態"</string>
@@ -735,12 +809,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">"モバイルネットワークの種類"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"携帯通信会社の情報"</string>
     <string name="status_data_state" msgid="5503181397066522950">"モバイルネットワークの状態"</string>
     <string name="status_service_state" msgid="2323931627519429503">"サービスの状態"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"電波強度"</string>
     <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>
@@ -750,14 +825,16 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USBストレージ"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SDカード"</string>
     <string name="memory_available" msgid="5052397223077021181">"空き容量"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"空き容量(読み取り専用)"</string>
     <string name="memory_size" msgid="6629067715017232195">"合計容量"</string>
     <string name="memory_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>
     <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>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SDカードのマウント解除"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"内部USBストレージのマウント解除"</string>
@@ -772,7 +849,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"SDカード内データを消去"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"内部USBストレージ内の全データ(音楽、写真など)の消去"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"SDカード内の全データ(音楽、写真など)の消去"</string>
-    <string name="read_only" msgid="6702420168629076340">" (読み取り専用)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"キャッシュデータを消去しますか?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"すべてのアプリのキャッシュデータが消去されます。"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTPまたはPTP機能が有効です"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"USBストレージマウント解除"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"SDカードのマウントを解除しますか?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"USBストレージのマウントを解除すると、使用中のアプリの一部が停止し、USBストレージを再マウントするまで使用できなくなる場合があります。"</string>
@@ -795,6 +874,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"カメラ(PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"カメラソフトやMTP非対応パソコンからファイルを転送できるようにします"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"ファイル転送ツールをインストール"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"その他のユーザー"</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>
@@ -824,6 +904,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>
@@ -839,9 +921,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"データの初期化"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"タブレット内のすべてのデータを消去する"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"携帯端末内のすべてのデータを消去する"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"この操作を行うと、タブレットの以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます:"\n\n<li>"Googleアカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"この操作を行うと、携帯端末の以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます:"\n\n<li>"Googleアカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"以下のアカウントにログインしています:"\n</string>
+    <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>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"音楽、画像、その他のユーザーデータを消去するには、"<b>"SDカード"</b>"を消去する必要があります。"</string>
@@ -899,10 +981,15 @@
     <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="manage_mobile_plan_title" msgid="7588182101738043593">"モバイルプランの管理"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"不明なSIM事業者"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$sには既知のプロビジョニングウェブサイトがありません"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIMカードを挿入して再起動してください"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"インターネットに接続してください"</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>
@@ -919,6 +1006,7 @@
     <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="copyright_title" msgid="865906688917260647">"著作権"</string>
     <string name="license_title" msgid="1990487604356037871">"ライセンス"</string>
     <string name="terms_title" msgid="7697580845616764642">"利用規約"</string>
@@ -946,7 +1034,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"ロック解除PINを変更"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"現在のパターンを入力"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"もう一度お試しください:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"ロック解除パターンを入力"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"ロック解除パターンを入力"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"MENUキーでヘルプ表示"</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"描き終わりの点で指を離します。"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"少なくとも<xliff:g id="NUMBER">%d</xliff:g>つの点を結んでください。"</string>
@@ -968,12 +1056,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"ロック解除パターンの描き方"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"誤った回数が多すぎます。"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g>秒後にやり直してください。"</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"キャンセル"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"次へ"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"タブレットの保護"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"携帯端末の保護"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"秘密の画面ロック解除パターンを作成してタブレットを不正使用から守ります。次の画面で指を使って、4つ以上の点を好きな順序で結んでください。"\n\n"準備ができたら[次へ]をタップしてください。"</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"秘密の画面ロック解除パターンを作成して端末を不正使用から守ります。次の画面で指を使って点を好きな順序で結んでください。4つ以上の点を結ぶ必要があります。"\n\n"準備ができたら[次へ]をタップしてください。"</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"アプリは端末にインストールされていません。"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"アプリを管理"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"インストール済みアプリを管理、削除する"</string>
     <string name="applications_settings" msgid="1721442176406964682">"アプリ"</string>
@@ -983,6 +1066,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"提供元不明のアプリのインストールを許可する"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"提供元不明のアプリからタブレットや個人データが攻撃を受ける可能性が高くなります。このようなアプリの使用により生じる可能性があるタブレットへの損害やデータの損失について、ユーザーご自身が単独で責任を負うことに同意するものとします。"</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"提供元不明のアプリから携帯端末や個人データが攻撃を受ける可能性が高くなります。このようなアプリの使用により生じる可能性がある携帯端末への損害やデータの損失について、ユーザーご自身が単独で責任を負うことに同意するものとします。"</string>
+    <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="application_info_label" msgid="5736524913065714880">"アプリ情報"</string>
@@ -1003,6 +1088,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USBストレージデータ"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SDカード"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"アンインストール"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"すべてのユーザーからアンインストール"</string>
+    <string name="install_text" msgid="884360662922471113">"インストール"</string>
     <string name="disable_text" msgid="6544054052049395202">"無効にする"</string>
     <string name="enable_text" msgid="9217362512327828987">"有効にする"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"データを消去"</string>
@@ -1021,17 +1108,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"キャッシュしたプロセスを表示"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"アプリの設定をリセット"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"設定をリセットしますか?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"この操作により、次の設定がすべてリセットされます:"\n\n" "<li>"無効化されているアプリ"</li>\n" "<li>"無効化されているアプリの通知"</li>\n" "<li>"特定の操作で使用するデフォルトのアプリ"</li>\n" "<li>"アプリのバックグラウンドデータの制限"</li>\n\n" アプリのデータが失われることはありません。"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"この操作により、次の設定がすべてリセットされます:\n\n "<li>"無効化されているアプリ"</li>\n" "<li>"無効化されているアプリの通知"</li>\n" "<li>"特定の操作で使用するデフォルトのアプリ"</li>\n" "<li>"アプリのバックグラウンドデータの制限"</li>\n\n" アプリのデータが失われることはありません。"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"アプリをリセット"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"容量を管理"</string>
     <string name="filter" msgid="2018011724373033887">"フィルタ"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"フィルタオプションの選択"</string>
     <string name="filter_apps_all" msgid="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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SDカード上"</string>
     <string name="disabled" msgid="9206776641295849915">"無効"</string>
+    <string name="not_installed" msgid="1475144352069281880">"未インストール"</string>
     <string name="no_applications" msgid="7336588977497084921">"アプリはありません。"</string>
     <string name="internal_storage" msgid="1584700623164275282">"内部ストレージ"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USBストレージ"</string>
@@ -1056,6 +1145,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g>、および<xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>、<xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>、<xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"このアプリでは料金が請求される場合があります:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"プレミアムSMSを送信"</string>
     <string name="computing_size" msgid="1599186977475211186">"計算中..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"パッケージのサイズを計算できませんでした。"</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"サードパーティ製のアプリはインストールされていません。"</string>
@@ -1079,8 +1170,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"新しいアプリの優先インストール先を変更する"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"内蔵アプリを無効にしますか?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"内蔵アプリを無効にすると、他のアプリが正常に動作しなくなることがあります。"</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"データを削除し、アプリを無効にしますか?"</string>
+    <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>
@@ -1096,6 +1192,8 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"ユーザー: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"削除済みのユーザー"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>個のプロセスと<xliff:g id="NUMSERVICES">%2$d</xliff:g>個のサービス"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>個のプロセスと<xliff:g id="NUMSERVICES">%2$d</xliff:g>個のサービス"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>個のプロセスと<xliff:g id="NUMSERVICES">%2$d</xliff:g>個のサービス"</string>
@@ -1130,7 +1228,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"キーボードの設定"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"英語: Spaceキー2回でピリオド(.)を挿入"</string>
     <string name="show_password" msgid="3001113966880559611">"パスワードを表示する"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></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>
@@ -1146,9 +1243,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"切り替えるにはCtrl+スペースを押します"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"デフォルト"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"キーボードレイアウト"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"単語リスト"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"ユーザー辞書"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"ユーザー辞書"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"ユーザー辞書"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"追加"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"辞書に追加"</string>
@@ -1159,6 +1254,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>
@@ -1199,24 +1296,38 @@
     <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="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCIスヌープログを有効にする"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Bluetooth HCIパケットをすべてファイルにキャプチャする"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"ランタイムを選択"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"ランタイムを選択"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"再起動して、ランタイムを<xliff:g id="OLD">%1$s</xliff:g>から<xliff:g id="NEW">%2$s</xliff:g>に変更しますか?"</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>
+    <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>
-    <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_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="enable_terminal_title" msgid="95572094356054120">"ローカルターミナル"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"ローカルシェルアクセスを提供するターミナルアプリを有効にします"</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>
@@ -1236,29 +1347,43 @@
     <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_toggle_large_text_title" msgid="6618674985313017711">"大きい文字サイズ"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"電源ボタンで通話を終了"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"パスワードの音声出力"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"押し続ける時間"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"ウェブアクセシビリティの拡張"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"拡大操作"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"この機能をオンにすると、画面をトリプルタップして画面を拡大/縮小できます。\n\n拡大した画面で次のことを実行できます:\n"<ul><li>"パン: 2本以上の指で画面上をドラッグします。"</li>\n<li>"拡大レベルの調整: 2本以上の指でピンチイン/ピンチアウトします。"</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">"ON"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"OFF"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"この機能を有効にすると、次の2つのステップでユーザー補助機能をすぐに有効にできます:\n\nステップ1: 音が鳴るか振動するまで電源ボタンを押し続けます。\n\nステップ2: 確認音が鳴るまで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_toggle_speak_password_preference_title" msgid="5986628515113204844">"パスワードの音声出力"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"押し続ける時間"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"設定"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"ON"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"ON"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"OFF"</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="print_settings" msgid="4742428530112487843">"印刷"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"印刷設定"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"サービス"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g>を利用しますか?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>は印刷したドキュメントを受け取ることができます。このようなドキュメントは機密データが含まれている可能性があります。"</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"インストールされているサービスはありません"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"設定"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"プリンタを追加"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"ON"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"OFF"</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>
@@ -1270,22 +1395,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>
@@ -1295,20 +1420,22 @@
     <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_data_send" msgid="3875198715268918671">"送信したモバイルデータ"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"受信したモバイルデータ"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"送信したWi‑Fiデータ"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"受信したWi‑Fiデータ"</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>
@@ -1317,8 +1444,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>
@@ -1326,6 +1453,7 @@
     <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="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>
@@ -1352,6 +1480,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"音の高さ"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"テキスト読み上げの音程を変更する"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"言語"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"言語が選択されていません"</string>
     <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>
@@ -1363,6 +1492,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>
@@ -1380,8 +1510,26 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"画面の明るさ<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"自動"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for gadget_brightness_state_full (6814570109772137631) -->
+    <skip />
+    <!-- String.format failed for translation -->
+    <!-- no translation found for gadget_brightness_state_half (3696671957608774204) -->
+    <skip />
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"OFF"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"認証情報ストレージ"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ストレージからのインストール"</string>
@@ -1392,6 +1540,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>
@@ -1413,14 +1564,11 @@
     <string name="backup_section_title" msgid="7952232291452882740">"バックアップと復元"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"個人データ"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"データのバックアップ"</string>
-    <string name="backup_data_summary" msgid="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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"アプリを再インストールする際に、バックアップした設定とデータを復元する"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"バグレポートを取得"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"現在の端末の状態に関する情報が収集され、その内容がメールで送信されます。バグレポートが開始してから送信可能な状態となるまでには多少の時間がかかりますのでご了承ください。"</string>
-    <string name="report" msgid="302437572240018342">"レポート"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"PCバックアップパスワード"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"デスクトップのフルバックアップは現在保護されていません"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"デスクトップのフルバックアップ用のパスワードを変更または削除する場合にタップします"</string>
@@ -1428,7 +1576,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>
@@ -1444,10 +1592,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>
@@ -1469,9 +1617,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>
@@ -1484,12 +1632,12 @@
     <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>
     <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="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>
@@ -1539,6 +1687,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>
@@ -1550,36 +1699,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"更新時にウィンドウの表示面全体を点滅させる"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU表示の更新を表示"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPUでの描画時にウィンドウ内の表示を点滅させる"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"ハードウェア層情報を表示"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"ハードウェア層が更新されると緑を表示"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"GPUオーバードローをデバッグ"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU使用状況を表示"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"現在のCPU使用状況をオーバーレイ表示する"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPUレンダリングを使用"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"2次画面シミュレート"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"アプリ"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"アクティビティを保持しない"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"ユーザーが離れたアクティビティを直ちに破棄する"</string>
     <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="data_usage_summary_title" msgid="3804110657238092929">"データ使用"</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>
@@ -1593,8 +1746,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>
@@ -1609,11 +1762,11 @@
     <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" msgid="1466689968707308512">"この機能をONにすると、モバイルネットワークしか使用できない場合にバックグラウンドデータに依存するアプリが停止する可能性があります。"\n\n"データ使用をより適切に管理できるオプションがアプリの設定画面にないかどうかを確認してください。"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"この機能をONにすると、モバイルネットワークしか使用できない場合にバックグラウンドデータに依存するアプリが停止する可能性があります。\n\nデータ使用をより適切に管理できるオプションがアプリの設定画面にないかどうかを確認してください。"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"バックグラウンドデータを制限できるのは、モバイルデータの上限が設定済みの場合のみです。"</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"データ自動同期をONにしますか?"</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\nGoogleアカウントなど、アカウントによっては、タブレットで変更を加えた場合も自動的にウェブに反映されます。\n\n各アカウント内で同期する情報の種類は[設定]&gt;[アカウント]で選択できます。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"ウェブでアカウントに変更を加えると自動的に携帯端末に反映されます。\n\nGoogleアカウントなど、アカウントによっては、携帯端末で変更を加えた場合も自動的にウェブに反映されます。\n\n各アカウント内で同期する情報の種類は[設定]&gt;[アカウント]で選択できます。"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"データ自動同期をOFFにしますか?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"無効にすると、データと電池の使用を節約できますが、最新情報を取得するには手動で各アカウントを同期する必要があります。また、更新があったときに通知されません。"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"使用サイクルのリセット日"</string>
@@ -1622,22 +1775,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" 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_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>
@@ -1669,6 +1825,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"VPNプロフィールの追加"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"プロフィールを編集"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"プロフィールを削除"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"常時接続VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"常時接続するVPNプロファイルを選択します。このVPNに接続しているときのみネットワークにアクセスできます。"</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"なし"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPNへの常時接続にはサーバーとDNSの両方のIPアドレスが必要です。"</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"ネットワークに接続できません。しばらくしてからもう一度お試しください。"</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"証明書がありません。プロフィールを編集してください。"</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"システム"</string>
@@ -1687,24 +1847,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"キャンセル"</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">"その他のシステムアップデート"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"ユーザーと制限"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"ユーザー"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"ユーザーを追加"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"詳細情報の編集"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"ユーザー情報"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"名前"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"コンテンツ制限"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"PINが必要"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"コンテンツレーティング"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"システムアプリ"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"インストール済みアプリ"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"破棄"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"ユーザーを削除"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Pesky kid"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Disabled"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"ユーザー"</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="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_confirm_remove_message" msgid="5284111415714437285">"ユーザーとすべての関連データを端末から削除してもよろしいですか?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"フォントサイズの変更"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"制限"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"制限を削除"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"PINを変更"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"通知を表示"</string>
     <string name="help_label" msgid="1107174367904110532">"ヘルプ"</string>
-    <string name="cell_broadcast_settings" msgid="8415582011920085222">"エリアメール"</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_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="6160672982086584261">"アプリの制限を設定"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g>が制御"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"このアプリは制限付きプロフィールではサポートされていません"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"このアプリはアカウントにアクセスする場合があります"</string>
+    <string name="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 571d522..862e628 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,16 +218,127 @@
     <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="886742181977884584">"미디어"</item>
+    <item msgid="7924928667052300589">"기기"</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>
+    <item msgid="5124443975763747838">"미디어 버튼"</item>
+    <item msgid="4547883971364273343">"오디오 포커스"</item>
+    <item msgid="2603878814882344450">"마스터 볼륨"</item>
+    <item msgid="7136963238377062018">"음성 볼륨"</item>
+    <item msgid="4270236897655923007">"벨소리 볼륨"</item>
+    <item msgid="6325739889222559394">"미디어 볼륨"</item>
+    <item msgid="5762123934816216821">"알람 볼륨"</item>
+    <item msgid="785049718065337473">"알림 볼륨"</item>
+    <item msgid="6700305533746877052">"블루투스 볼륨"</item>
+    <item msgid="2029227495214047094">"켜진 상태로 유지"</item>
+    <item msgid="26109888160231211">"위치 모니터링"</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>
+    <item msgid="5753789168376302997">"미디어 버튼"</item>
+    <item msgid="3265262911688671938">"오디오 포커스"</item>
+    <item msgid="2098976479485046797">"마스터 볼륨"</item>
+    <item msgid="5660213838861789350">"음성 볼륨"</item>
+    <item msgid="7983336752371254444">"벨소리 볼륨"</item>
+    <item msgid="7878027809189330917">"미디어 볼륨"</item>
+    <item msgid="7260546305036218513">"알람 볼륨"</item>
+    <item msgid="9103719301075748925">"알림 볼륨"</item>
+    <item msgid="7025966722295861512">"블루투스 볼륨"</item>
+    <item msgid="4665183401128289653">"켜진 상태로 유지"</item>
+    <item msgid="8584357129746649222">"위치"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"짧게"</item>
     <item msgid="2560532955514699713">"보통"</item>
     <item msgid="2372711992605524591">"길게"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART(디버그)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Dalvik 사용"</item>
+    <item msgid="5131846588686178907">"ART 사용"</item>
+    <item msgid="4530003713865319928">"ART 디버그 빌드 사용"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"확인 안함"</item>
     <item msgid="6042769699089883931">"DRM 콘텐츠만 확인"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"애니메이션 배율 5x"</item>
     <item msgid="1069584980746680398">"애니메이션 배율 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"없음"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi 및 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"없음"</item>
+    <item msgid="9089630089455370183">"로그캣"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"OFF"</item>
+    <item msgid="7688197031296835369">"오버드로 영역 표시"</item>
+    <item msgid="8332661909019981149">"오버드로 카운터 표시"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"표준 제한"</item>
     <item msgid="4071574792028999443">"백그라운드 프로세스 없음"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"시간초과됨"</item>
     <item msgid="7664124146786465092">"실패"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"질문"</item>
+    <item msgid="5077768429488260031">"허용 안함"</item>
+    <item msgid="1417929597727989746">"항상 허용"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 58d12e4..656aacf 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"예"</string>
     <string name="no" msgid="6731231425810196216">"아니요"</string>
     <string name="create" msgid="3578857613172647409">"만들기"</string>
+    <string name="allow" msgid="3349662621170855910">"허용"</string>
+    <string name="deny" msgid="6947806159746484865">"거부"</string>
     <string name="device_info_default" msgid="7847265875578739287">"알 수 없음"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"개발자가 되려면 <xliff:g id="STEP_COUNT">%1$d</xliff:g>단계가 남았습니다."</item>
+    <item quantity="other" msgid="6722953419953594148">"개발자가 되려면 <xliff:g id="STEP_COUNT">%1$d</xliff:g>단계가 남았습니다."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"개발자가 되셨습니다."</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"이미 개발자입니다."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"무선 및 네트워크"</string>
     <string name="header_category_device" msgid="5781174212691167553">"기기"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"개인 설정"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"충전 중"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"사용 중"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(무선)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"충전 안함"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"충전 안함"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"충전 완료"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"전원연결되지 않음"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"무선"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"알 수 없음"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"알 수 없음"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"알 수 없는 오류"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"부족함"</string>
     <string name="bluetooth" msgid="5549625000628014477">"블루투스"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"검색 가능"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"모든 가까운 블루투스 기기에 표시(<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"모든 가까운 블루투스 기기에 표시"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"다른 블루투스 기기에 표시되지 않음"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"페어링된 기기에만 표시"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"장치를 검색 가능하게 설정"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"검색 가능 시간제한"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"검색 가능 기간 설정"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"잠금 시 음성 다이얼링"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"화면 잠금 시 블루투스 다이얼러 사용 방지"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"블루투스 장치"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"받은 파일 보기"</string>
     <string name="device_picker" msgid="8398232791303186677">"블루투스 기기 선택기"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"블루투스 권한 요청"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"앱에서 블루투스를 사용하려고 합니다. 허용하시겠습니까?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"태블릿의 앱이 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 블루투스 기기에서 사용자의 태블릿을 검색할 수 있도록 설정하려고 합니다. 허용하시겠습니까?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"휴대전화의 앱이 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 블루투스 기기에서 사용자의 휴대전화를 검색할 수 있도록 설정하려고 합니다. 허용하시겠습니까?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"태블릿의 앱이 다른 블루투스 기기에서 사용자의 태블릿을 \'항상 검색\'할 수 있도록 설정하려고 합니다. 허용하시겠습니까?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"휴대전화의 앱이 다른 블루투스 기기에서 사용자의 휴대전화를 \'항상 검색\'할 수 있도록 설정하려고 합니다. 허용하시겠습니까?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"태블릿의 앱이 블루투스를 사용 설정하고 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 기기에서 사용자의 태블릿을 검색할 수 있도록 설정하려고 합니다. 허용하시겠습니까?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"휴대전화의 앱이 블루투스를 사용 설정하고 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 기기에서 사용자의 휴대전화를 검색할 수 있도록 설정하려고 합니다. 허용하시겠습니까?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"태블릿의 앱이 블루투스를 사용 설정하고 다른 기기에서 사용자의 태블릿을 검색할 수 있도록 설정하려고 합니다. 허용하시겠습니까?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"휴대전화의 앱이 블루투스를 사용 설정하고 다른 기기에서 사용자의 휴대전화를 검색할 수 있도록 설정하려고 합니다. 허용하시겠습니까?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"앱에서 블루투스를 사용하도록 설정하려고 합니다."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"앱에서 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 블루투스 기기에 사용자의 태블릿이 표시되도록 설정하려고 합니다."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"앱에서 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 블루투스 기기에 사용자의 휴대전화가 표시되도록 설정하려고 합니다."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"앱에서 다른 블루투스 기기에 사용자의 태블릿이 표시되도록 설정하려고 합니다. 나중에 블루투스 설정에서 변경할 수 있습니다."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"앱에서 다른 블루투스 기기에 사용자의 휴대전화가 표시되도록 설정하려고 합니다. 나중에 블루투스 설정에서 변경할 수 있습니다."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"앱에서 블루투스를 사용하고 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 기기에 사용자의 태블릿이 표시되도록 설정하려고 합니다."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"앱에서 블루투스를 사용하고 <xliff:g id="TIMEOUT">%1$d</xliff:g>초 동안 다른 기기에 사용자의 휴대전화가 표시되도록 설정하려고 합니다."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"앱에서 블루투스를 사용하고 다른 기기에 사용자의 태블릿이 표시되도록 설정하려고 합니다. 나중에 블루투스 설정에서 변경할 수 있습니다."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"앱에서 블루투스를 사용하고 다른 기기에 사용자의 휴대전화가 표시되도록 설정하려고 합니다. 나중에 블루투스 설정에서 변경할 수 있습니다."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"블루투스를 켜는 중"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"블루투스를 사용 중지하는 중"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"자동 연결"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP 프록시는 브라우저에서 사용되며 다른 앱에서는 사용되지 않을 수 있습니다."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"위치:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"인접한 CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"데이터 시도:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS 서비스:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"로밍:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"데이터 로밍을 사용 중지한 상태에서 홈 네트워크를 벗어났으므로 데이터 연결이 끊어졌습니다."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"사용"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"데이터 로밍을 허용하면 높은 로밍 요금이 부과될 수 있습니다."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"데이터 로밍을 허용하면 높은 로밍 요금이 부과될 수 있습니다.\n\n이 설정은 태블릿의 모든 사용자에게 영향을 줍니다."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"데이터 로밍을 허용하면 높은 로밍 요금이 부과될 수 있습니다.\n\n이 설정은 휴대전화의 모든 사용자에게 영향을 줍니다."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"데이터 로밍을 허용하시겠습니까?"</string>
     <string name="networks" msgid="6333316876545927039">"운영자 선택"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"네트워크 운영자 선택"</string>
@@ -297,6 +307,10 @@
     <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>
@@ -306,10 +320,10 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"태블릿 암호화"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"휴대전화 암호화"</string>
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"태블릿의 전원을 켤 때마다 암호 해독을 위해 숫자 PIN 또는 비밀번호 입력"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"휴대전화의 전원을 켤 때마다 휴대전화의 암호를 해독하기 위해 숫자 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">"계정, 설정, 다운로드된 애플리케이션과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 태블릿을 암호화하면 전원을 켤 때마다 숫자 PIN 또는 비밀번호를 입력하여 암호를 해제해야 합니다. 초기화하여 모든 데이터를 삭제해야만 태블릿 암호화를 해제할 수 있습니다."\n\n"암호화에는 1시간 이상이 걸릴 수 있습니다. 충전된 배터리로 암호화를 시작하고 완료될 때까지 태블릿의 전원 연결을 해제하지 않아야 합니다. 암호화 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"계정, 설정, 다운로드된 애플리케이션과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 휴대전화를 암호화하면 전원을 켤 때마다 숫자 PIN 또는 비밀번호를 입력하여 암호를 해제해야 합니다. 초기화하여 모든 데이터를 삭제해야만 휴대전화 암호화를 해제할 수 있습니다."\n\n"암호화에는 1시간 이상이 걸릴 수 있습니다. 충전된 배터리로 암호화를 시작하고 완료될 때까지 휴대전화의 전원 연결을 해제하지 않아야 합니다. 암호화 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"계정, 설정, 다운로드된 애플리케이션과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 태블릿을 암호화하면 전원을 켤 때마다 숫자 PIN 또는 비밀번호를 입력하여 암호를 해제해야 합니다. 초기화하여 모든 데이터를 삭제해야만 태블릿 암호화를 해제할 수 있습니다.\n\n암호화에는 1시간 이상이 걸릴 수 있습니다. 충전된 배터리로 암호화를 시작하고 완료될 때까지 태블릿의 전원 연결을 해제하지 않아야 합니다. 암호화 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"계정, 설정, 다운로드된 애플리케이션과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 휴대전화를 암호화하면 전원을 켤 때마다 숫자 PIN 또는 비밀번호를 입력하여 암호를 해제해야 합니다. 초기화하여 모든 데이터를 삭제해야만 휴대전화 암호화를 해제할 수 있습니다.\n\n암호화에는 1시간 이상이 걸릴 수 있습니다. 충전된 배터리로 암호화를 시작하고 완료될 때까지 휴대전화의 전원 연결을 해제하지 않아야 합니다. 암호화 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"태블릿 암호화"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"휴대전화 암호화"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"배터리를 충전한 다음 다시 시도하세요."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g>초 후에 다시 시도하세요."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"비밀번호 입력"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"암호화하지 못했습니다."</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"암호화가 중단되어 완료할 수 없습니다. 따라서 태블릿의 데이터에 더 이상 액세스할 수 없습니다. "\n\n" 태블릿을 다시 사용하려면 초기화해야 합니다. 초기화한 후 태블릿을 설정하면, Google 계정에 백업되어 있던 데이터를 복원할 수 있습니다."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"암호화가 중단되어 완료할 수 없습니다. 따라서 휴대전화의 데이터에 더 이상 액세스할 수 없습니다. "\n\n"휴대전화를 다시 사용하려면 초기화해야 합니다. 초기화한 후 휴대전화를 설정하면, Google 계정에 백업되어 있던 데이터를 복원할 수 있습니다."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"암호화가 중단되어 완료할 수 없습니다. 따라서 태블릿의 데이터에 더 이상 액세스할 수 없습니다. \n\n 태블릿을 다시 사용하려면 초기화해야 합니다. 초기화한 후 태블릿을 설정하면, Google 계정에 백업되어 있던 데이터를 복원할 수 있습니다."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"암호화가 중단되어 완료할 수 없습니다. 따라서 휴대전화의 데이터에 더 이상 액세스할 수 없습니다. \n\n휴대전화를 다시 사용하려면 초기화해야 합니다. 초기화한 후 휴대전화를 설정하면, Google 계정에 백업되어 있던 데이터를 복원할 수 있습니다."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"입력 방법 전환"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"화면 잠금 선택"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"백업 잠금 선택"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"잠금해제 PIN 변경"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"잠금해제 비밀번호 변경"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"비밀번호는 %d자 이상이어야 합니다."</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN은 %d자 이상이어야 합니다."</string>
+    <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>
@@ -406,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>
@@ -480,64 +503,98 @@
     <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_empty_list_wifi_display_off" msgid="1225626898926363100">"기기를 확인하려면 무선 디스플레이를 켜세요."</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_paired_devices" msgid="7395326840730024303">"페어링된 디스플레이"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"사용가능 기기"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"연결 중"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"연결됨"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"사용 가능"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"사용 중"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"디스플레이 설정"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"연결을 해제하시겠습니까?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 연결이 끊어집니다."</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"무선 디스플레이 옵션"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"삭제"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"완료"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"이름"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"사용"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"사용 안함"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"사용 중지됨"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"태블릿이 다른 기기와 접촉하면 데이터 교환이 시작됩니다."</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"태블릿이 다른 기기와 접촉하면 데이터 교환 허용"</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_off_summary" msgid="4663095428454779138">"사용 안함"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC가 꺼져 있어 사용할 수 없음"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"이 기능을 사용하도록 설정하면 기기를 서로 가까이 두어 앱 콘텐츠를 다른 NFC 지원 기기로 전송할 수 있습니다. 예를 들어 브라우저 페이지, YouTube 동영상, 주소록 등을 전송할 수 있습니다."\n\n"서로 뒷면을 향하는 방식 등으로 기기를 맞댄 후에 화면을 터치하기만 하면 됩니다. 전송할 대상은 앱이 결정합니다."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"이 기능을 사용하도록 설정하면 기기를 서로 가까이 두어 앱 콘텐츠를 다른 NFC 지원 기기로 전송할 수 있습니다. 예를 들어 브라우저 페이지, YouTube 동영상, 주소록 등을 전송할 수 있습니다.\n\n서로 뒷면을 향하는 방식 등으로 기기를 맞댄 후에 화면을 터치하기만 하면 됩니다. 전송할 대상은 앱이 결정합니다."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"네트워크 서비스 검색"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"다른 기기의 앱에서 이 기기의 앱을 검색하도록 허용"</string>
-    <string name="wifi_quick_toggle_title" msgid="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="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="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="8116564886303972764">"Wi-Fi 공유기에 개인 식별 번호 <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_in_progress" msgid="2944576520214787628">"WPS를 이미 처리하고 있으며 완료하는 데 최대 2분이 소요됩니다."</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"무선 공유기 보안 설정(TKIP)은 지원되지 않습니다."</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"인증하지 못했습니다. 다시 시도하세요."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"다른 WPS 세션이 감지되었습니다. 잠시 후 다시 시도해 주세요."</string>
     <string name="wifi_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>
@@ -564,6 +621,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>
@@ -571,8 +631,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_advanced_titlebar" msgid="1627063574532930090">"고급 Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi 주파수 대역"</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="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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"검색 중…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"기기 이름 변경"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"P2P 기기"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"저장된 그룹"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"연결할 수 없습니다."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"기기 이름을 바꾸지 못했습니다."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"연결을 해제하시겠습니까?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"연결을 중단하면 <xliff:g id="PEER_NAME">%1$s</xliff:g> 외 다른 <xliff:g id="PEER_COUNT">%2$s</xliff:g>개 기기와의 연결이 끊어집니다."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"초대를 취소하시겠습니까?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>와(과) 연결하려는 초대를 취소하시겠습니까?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"휴대용 Wi-Fi 핫스팟"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"이 그룹을 삭제할까요?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"휴대용 Wi-Fi 핫스팟"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"음악 효과"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"모드 설정"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"무음 시 진동"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"기본 알림"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"기본 알림 소리"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"알림등 반복 표시"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"벨소리"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"알림"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"전화 벨소리와 알림을 같은 볼륨으로"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"알림 벨소리 선택"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"기본 알림 소리"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"미디어"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"음악 및 동영상에 대한 볼륨 설정"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"알람"</string>
@@ -671,15 +743,16 @@
     <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="3848608373818910549">"스크린 캔디"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"전원에 연결된 경우 절전 모드 시 시작"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"사용 안함"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"선택한 캔디"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"활성화 시기"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 이상 유휴 상태일 때"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"안함"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"사용해 보기"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"도킹할 때도 시작"</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">"휴대전화가 도킹 또는 절전 모드일 때 작동 방식을 조정하려면 화면 보호기를 사용하도록 설정합니다."</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>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"잘못된 PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN이 일치하지 않음"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"PIN을 변경할 수 없습니다."\n"PIN이 잘못된 것 같습니다."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"PIN을 변경할 수 없습니다.\nPIN이 잘못된 것 같습니다."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN이 변경되었습니다."</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM 카드 잠금 상태를 변경할 수 없습니다."\n"PIN이 잘못된 것 같습니다."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM 카드 잠금 상태를 변경할 수 없습니다.\nPIN이 잘못된 것 같습니다."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"확인"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"취소"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"태블릿 상태"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"기저대역 버전"</string>
     <string name="kernel_version" msgid="9192574954196167602">"커널 버전"</string>
     <string name="build_number" msgid="3075795840572241758">"빌드 번호"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux 상태"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"표시할 수 없음"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"상태"</string>
     <string name="device_status" msgid="607405385799807324">"상태"</string>
@@ -733,12 +807,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">"모바일 네트워크 유형"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"통신사 정보"</string>
     <string name="status_data_state" msgid="5503181397066522950">"모바일 네트워크 상태"</string>
     <string name="status_service_state" msgid="2323931627519429503">"서비스 상태"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"신호 강도"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB 저장소"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD 카드"</string>
     <string name="memory_available" msgid="5052397223077021181">"사용 가능"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"사용 가능(읽기 전용)"</string>
     <string name="memory_size" msgid="6629067715017232195">"총 공간"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"계산 중..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"앱(앱 데이터 및 미디어 콘텐츠)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"사진, 동영상"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"오디오(음악, 벨소리, podcast 등)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"기타"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"캐시된 데이터"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"공유 저장장치 마운트 해제"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD 카드 마운트 해제"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"내부 USB 저장소 마운트 해제"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD 카드 지우기"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"내부 USB 저장소에 있는 모든 데이터(예: 음악 및 사진)를 지웁니다."</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"SD 카드에 있는 모든 데이터(예: 음악 및 사진) 지우기"</string>
-    <string name="read_only" msgid="6702420168629076340">" (읽기전용)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"캐시된 데이터를 지우시겠습니까?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"모든 앱의 캐시된 데이터가 지워집니다."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP 또는 PTP 기능 사용 중"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"USB 저장소를 마운트 해제하시겠습니까?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"SD 카드를 마운트 해제하시겠습니까?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"USB 저장소를 마운트 해제하면 사용 중인 일부 앱이 중지되고 USB 저장소를 다시 마운트할 때까지 사용할 수 없게 됩니다."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"카메라(PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"카메라 소프트웨어를 사용하여 사진을 전송하고, MTP를 지원하지 않는 컴퓨터의 파일을 전송할 수 있습니다."</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"파일 전송 도구 설치"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"다른 사용자"</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>
@@ -822,6 +902,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>
@@ -839,7 +921,7 @@
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"휴대전화의 모든 데이터 지우기"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"공장 초기화하면 태블릿의 "<b>"내부 저장소의 모든 데이터가 삭제됩니다."</b>\n\n<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"공장 초기화하면 휴대전화의 "<b>"내부 저장소의 모든 데이터가 삭제됩니다."</b>\n\n<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"현재 로그인한 계정:"\n</string>
+    <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>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"음악이나 사진, 기타 사용자 데이터를 지우려면 "<b>"SD 카드"</b>"를 삭제해야 합니다."</string>
@@ -890,17 +972,22 @@
     <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"1개 기기에 대해 이 휴대전화의 인터넷 연결 공유 중"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"<xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>개 기기에 대해 이 태블릿의 인터넷 연결 공유 중"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"<xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>개 기기에 대해 이 휴대전화의 인터넷 연결 공유 중"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"이 태블릿의 인터넷 연결 공유 상태 아님"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"이 휴대전화의 인터넷 연결 공유 상태 아님"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"태블릿의 인터넷 연결을 공유하고 있지 않음"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"휴대전화의 인터넷 연결을 공유하고 있지 않음"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"테더링되지 않음"</string>
     <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="manage_mobile_plan_title" msgid="7588182101738043593">"모바일 요금제 관리"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"알 수 없는 SIM 운영자입니다."</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s에 알려진 프로비저닝 웹사이트가 없습니다."</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIM 카드를 삽입하고 다시 시작하세요."</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"인터넷에 연결하세요."</string>
     <string name="location_title" msgid="1029961368397484576">"사용자 위치"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"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_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를 사용하여 사용자 위치를 파악하도록 함"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"앱이 사용자 휴대전화의 GPS를 사용하여 사용자 위치를 파악하도록 함"</string>
@@ -909,19 +996,20 @@
     <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>
     <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="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>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"잠금해제 PIN 변경"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"저장된 패턴 확인"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"다시 시도:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"잠금해제 패턴 그리기"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"잠금해제 패턴 그리기:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"도움말을 보려면 메뉴를 누르세요."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"완료되면 손가락을 뗍니다."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"<xliff:g id="NUMBER">%d</xliff:g>개 이상의 점을 연결합니다. 다시 시도하세요."</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"잠금해제 패턴을 그리는 방법"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"잘못된 시도 횟수가 너무 많습니다."</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g>초 후에 다시 시도하세요."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"취소"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"다음"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"태블릿 보안 설정"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"휴대전화 보안 설정"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"나만의 화면 잠금해제 패턴을 만들어서 인증되지 않은 사람이 태블릿을 사용하지 못하게 할 수 있습니다. 다음 화면에서 손가락을 슬라이드하여 원하는 순서로 점을 연결하세요. 최소한 4개의 점을 연결해야 합니다. "\n\n"시작할 준비가 되었으면 \'다음\'을 터치합니다."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"나만의 화면 잠금해제 패턴을 만들어서 인증되지 않은 사람이 휴대전화를 사용하지 못하게 할 수 있습니다. 다음 화면에서 손가락을 슬라이드하여 원하는 순서로 최소한 4개의 점을 연결하세요. "\n\n"시작할 준비가 되었으면 \'다음\'을 터치합니다."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"휴대전화에 설치되어 있지 않은 애플리케이션입니다."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"앱 관리"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"설치된 앱 관리 및 제거"</string>
     <string name="applications_settings" msgid="1721442176406964682">"애플리케이션"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"알 수 없는 출처의 앱 설치 허용"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"태블릿 및 개인 정보는 출처를 알 수 없는 앱의 공격에 매우 취약합니다. 이러한 앱을 사용하여 발생할 수 있는 태블릿 손상이나 데이터 손실에 대해 사용자에게 책임이 있음에 동의합니다."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"휴대전화 및 개인 정보는 출처를 알 수 없는 앱의 공격에 매우 취약합니다. 이러한 앱을 사용하여 발생할 수 있는 휴대전화 손상이나 데이터 손실에 대해 사용자에게 책임이 있음에 동의합니다."</string>
+    <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="application_info_label" msgid="5736524913065714880">"앱 정보"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB 저장소 데이터"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD 카드"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"제거"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"모든 사용자에 대해 제거"</string>
+    <string name="install_text" msgid="884360662922471113">"설치"</string>
     <string name="disable_text" msgid="6544054052049395202">"사용 안함"</string>
     <string name="enable_text" msgid="9217362512327828987">"사용"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"데이터 지우기"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"캐시된 프로세스 표시"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"앱 환경설정 재설정"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"앱 환경설정을 재설정하시겠습니까?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"이 작업을 수행하면 다음 환경설정이 모두 재설정됩니다."\n\n" "<li>"사용 중지된 앱"</li>\n" "<li>"사용 중지된 앱 알림"</li>\n" "<li>"작업을 수행할 때 사용하는 기본 애플리케이션"</li>\n" "<li>"앱에 대한 백그라운드 데이터 제한"</li>\n\n" 앱 데이터는 손실되지 않습니다."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"이 작업을 수행하면 다음 환경설정이 모두 재설정됩니다.\n\n "<li>"사용 중지된 앱"</li>\n" "<li>"사용 중지된 앱 알림"</li>\n" "<li>"작업을 수행할 때 사용하는 기본 애플리케이션"</li>\n" "<li>"앱에 대한 백그라운드 데이터 제한"</li>\n\n" 앱 데이터는 손실되지 않습니다."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"앱 재설정"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"공간 관리"</string>
     <string name="filter" msgid="2018011724373033887">"필터"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"필터 옵션 선택"</string>
     <string name="filter_apps_all" msgid="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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD 카드"</string>
     <string name="disabled" msgid="9206776641295849915">"사용 안함"</string>
+    <string name="not_installed" msgid="1475144352069281880">"설치되지 않음"</string>
     <string name="no_applications" msgid="7336588977497084921">"앱 없음"</string>
     <string name="internal_storage" msgid="1584700623164275282">"내부 저장소"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB 저장소"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> 및 <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"유료 앱일 수 있습니다."</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"프리미엄 SMS 보내기"</string>
     <string name="computing_size" msgid="1599186977475211186">"계산 중..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"패키지 크기를 계산할 수 없습니다."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"설치된 타사 앱이 없습니다."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"새 앱의 기본 설치 위치를 변경합니다."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"내장 앱을 사용중지하시겠습니까?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"내장 앱을 사용중지하면 다른 앱에 예기치 않은 오류가 발생할 수 있습니다."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"데이터를 삭제하고 앱을 사용 중지하시겠습니까?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"사용자: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"삭제된 사용자"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"프로세스 <xliff:g id="NUMPROCESS">%1$d</xliff:g>개 및 서비스 <xliff:g id="NUMSERVICES">%2$d</xliff:g>개"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"프로세스 <xliff:g id="NUMPROCESS">%1$d</xliff:g>개 및 서비스 <xliff:g id="NUMSERVICES">%2$d</xliff:g>개"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"프로세스 <xliff:g id="NUMPROCESS">%1$d</xliff:g>개 및 서비스 <xliff:g id="NUMSERVICES">%2$d</xliff:g>개"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"물리적 키보드 설정"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"스페이스바를 두 번 눌러 \'.\' 삽입"</string>
     <string name="show_password" msgid="3001113966880559611">"비밀번호 표시"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></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>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"전환하려면 Control-Spacebar를 누름"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"기본값"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"키보드 레이아웃"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"사용자 사전"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"개인 사전"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"개인 사전"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"개인 사전"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"추가"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"사전에 추가"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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="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="bt_hci_snoop_log" msgid="3340699311158865670">"블루투스 HCI 스누프 로그 사용"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"모든 블루투스 HCI 패킷을 하나의 파일에 캡처"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"런타임 선택"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"런타임 선택"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"다시 부팅하여 <xliff:g id="OLD">%1$s</xliff:g>에서 <xliff:g id="NEW">%2$s</xliff:g>(으)로 런타임을 변경하시겠습니까?"</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>
+    <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="enable_terminal_title" msgid="95572094356054120">"로컬 터미널"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"로컬 셸 액세스를 제공하는 터미널 앱 사용"</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>
@@ -1234,29 +1345,43 @@
     <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_toggle_large_text_title" msgid="6618674985313017711">"텍스트 확대"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"전원 버튼으로 통화 종료"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"비밀번호 말하기"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"길게 누르기 지연"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"웹 접근성 향상"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"확대 동작"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"이 기능을 사용하면 화면을 3번 탭하여 확대 및 축소할 수 있습니다.\n\n화면을 확대한 상태에서 다음 작업을 수행할 수 있습니다.\n"<ul><li>"이동: 화면에서 두 개 이상의 손가락을 드래그"</li>\n<li>"확대/축소 수준 조정: 두 개 이상의 손가락을 오므리거나 벌림"</li></ul>\n\n"또한 3번 탭한 상태를 유지하여 손가락 아래에 있는 항목을 일시적으로 확대할 수 있습니다. 확대한 상태에서 손가락을 드래그하여 화면의 다른 부분을 탐색할 수 있습니다. 손가락을 떼면 이전 상태로 돌아갑니다.\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_description" msgid="750438015254396963">"이 기능을 사용하면 다음 두 단계를 통해 접근성 기능을 빠르게 사용하도록 설정할 수 있습니다.\n\n1단계: 소리가 나거나 진동이 느껴질 때까지 전원 버튼을 길게 누릅니다.\n\n2단계: 확인음이 들릴 때까지 두 손가락으로 길게 터치합니다.\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_toggle_speak_password_preference_title" msgid="5986628515113204844">"비밀번호 말하기"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"길게 누르기 지연"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"설정"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"설정"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"사용 안함"</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="accessibility_feature_state_on" msgid="2864292320042673806">"사용"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"사용 안함"</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="print_settings" msgid="4742428530112487843">"인쇄"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"인쇄 설정"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"서비스"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용하시겠습니까?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"인쇄한 문서를 <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>에서 받을 수 있습니다. 이런 문서에는 민감한 데이터가 포함되어 있을 수 있습니다."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"설치된 서비스 없음"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"설정"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"프린터 추가"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"ON"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"OFF"</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>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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_data_send" msgid="3875198715268918671">"모바일 데이터 전송"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"모바일 데이터 수신"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Wi‑Fi 데이터 전송"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Wi‑Fi 데이터 수신"</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>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <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="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>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"피치"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"발음된 텍스트의 톤에 적용"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"언어"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"언어가 선택되지 않음"</string>
     <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>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"밝기 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"자동"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"최고 밝기"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"중간 밝기"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"최저 밝기"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"자격증명 저장소"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"저장소에서 설치"</string>
@@ -1390,6 +1534,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>
@@ -1411,22 +1558,19 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"앱을 다시 설치하면 백업된 설정과 데이터 복원"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"버그 신고 받기"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"이렇게 하면 현재 기기 상태에 대한 정보를 수집하여 이메일 메시지로 전송합니다. 버그 신고를 시작하여 전송할 준비가 되려면 약간 시간이 걸립니다."</string>
-    <string name="report" msgid="302437572240018342">"신고"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"데스크톱 백업 비밀번호"</string>
-    <string name="local_backup_password_summary_none" msgid="393503434408227110">"데스크톱 전체 백업에 비밀번호가 설정되어 있지 않습니다."</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"데스크톱 전체 백업에 비밀번호가 설정되어 있지 않음"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"데스크톱 전체 백업에 대한 비밀번호를 변경하거나 삭제하려면 터치하세요."</string>
     <string name="local_backup_password_toast_success" msgid="582016086228434290">"새로운 백업 비밀번호 세트"</string>
     <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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"캘린더"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"연락처"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Google 동기화에 오신 것을 환영합니다."</font>" "\n"Google 동기화는 사용자가 어디에서든지 연락처, 일정 등에 액세스할 수 있도록 데이터를 동기화하는 Google 서비스입니다."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Google 동기화에 오신 것을 환영합니다."</font>" \nGoogle 동기화는 사용자가 어디에서든지 연락처, 일정 등에 액세스할 수 있도록 데이터를 동기화하는 Google 서비스입니다."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"앱 동기화 설정"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"데이터 및 동기화"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"비밀번호 변경"</string>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"전체 창 표면이 업데이트되었을 때 플래시 처리"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU 보기 업데이트 표시"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPU로 드로잉했을 때 창 내부 보기 플래시 처리"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"하드웨어 업데이트 표시"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"업데이트 할 때 하드웨어 레이어 깜박이기"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"GPU 오버드로 디버깅"</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>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"클립 경계, 여백 등을 표시"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU 사용량 표시"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"현재 CPU 사용량 오버레이 표시"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU 렌더링 강제 설정"</string>
     <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>
+    <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>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"사용자가 종료하는 즉시 바로 제거"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <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" msgid="1466689968707308512">"모바일 네트워크만 사용할 수 있는 경우 백그라운드 데이터에 의존하는 앱이 중단될 수 있습니다."\n\n"앱 설정에서 데이터 사용을 더 적절하게 관리할 수 있는 컨트롤을 찾아볼 수 있습니다."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"모바일 네트워크만 사용할 수 있는 경우 백그라운드 데이터에 의존하는 앱이 중단될 수 있습니다.\n\n앱 설정에서 데이터 사용을 더 적절하게 관리할 수 있는 컨트롤을 찾아볼 수 있습니다."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="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>
@@ -1620,22 +1769,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" 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_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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"VPN 프로필 추가"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"프로필 수정"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"프로필 삭제"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"연결 유지 VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"VPN 프로필을 선택하여 연결된 상태를 유지하세요. 이 VPN에 연결된 상태에서만 네트워크 트래픽이 허용됩니다."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"없음"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPN을 연결 상태로 유지하려면 서버와 DNS의 IP 주소가 필요합니다."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"네트워크에 연결되어 있지 않습니다. 잠시 후 다시 시도해 주세요."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"인증서가 누락되었습니다. 프로필을 수정하세요."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"시스템"</string>
@@ -1678,31 +1834,93 @@
     <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>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"추가 시스템 업데이트"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"사용자/제한사항"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"사용자"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"사용자 추가"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"세부정보 수정"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"사용자 정보"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"이름"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"콘텐츠 제한"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"PIN 필요"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"콘텐츠 등급"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"시스템 앱"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"설치된 앱"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"삭제"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"사용자 삭제"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"칭얼대는 아이"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"사용 안함"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"허가"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"시행"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"사용자"</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="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_confirm_remove_message" msgid="5284111415714437285">"기기에서 사용자와 모든 관련 데이터를 삭제하시겠습니까?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"글꼴 크기 변경"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"제한사항"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"제한사항 삭제"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN 변경"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"알림 표시"</string>
     <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_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="6160672982086584261">"앱 제한 설정"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g>에서 관리"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"이 앱은 제한된 프로필에 지원되지 않습니다."</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"이 앱은 계정에 액세스할 수 있습니다."</string>
+    <string name="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-land/dimens.xml b/res/values-land/dimens.xml
index 2ced533..288d4e3 100755
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -17,4 +17,11 @@
 <resources>
     <dimen name="appwidget_width">421dip</dimen>
     <dimen name="appwidget_height">68dip</dimen>
+    <dimen name="appwidget_preview_width">120dip</dimen>
+    <dimen name="appwidget_preview_height">70dip</dimen>
+    <dimen name="keyguard_appwidget_picker_margin_left">2dip</dimen>
+    <dimen name="keyguard_appwidget_picker_margin_right">2dip</dimen>
+    <integer name="keyguard_appwidget_picker_cols">2</integer>
+
+    <dimen name="captioning_preview_height">100dp</dimen>
 </resources>
diff --git a/res/drawable/wifi_signal.xml b/res/values-land/styles.xml
similarity index 60%
copy from res/drawable/wifi_signal.xml
copy to res/values-land/styles.xml
index 86c1ab0..0903167 100644
--- a/res/drawable/wifi_signal.xml
+++ b/res/values-land/styles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- 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.
@@ -14,9 +14,8 @@
      limitations under the License.
 -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock" />
-    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open" />
-</selector>
-
+<resources>
+    <style name="KeyguardAppWidgetItem">
+        <item name="android:textSize">16sp</item>
+    </style>
+</resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 39d788a..9581200 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,16 +218,127 @@
     <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="886742181977884584">"Medija"</item>
+    <item msgid="7924928667052300589">"Į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>
+    <item msgid="5124443975763747838">"medijos mygtukai"</item>
+    <item msgid="4547883971364273343">"garso sutelktis"</item>
+    <item msgid="2603878814882344450">"pagrindinis garsumas"</item>
+    <item msgid="7136963238377062018">"balso garsumas"</item>
+    <item msgid="4270236897655923007">"skambučio garsumas"</item>
+    <item msgid="6325739889222559394">"medijos garsumas"</item>
+    <item msgid="5762123934816216821">"signalo garsumas"</item>
+    <item msgid="785049718065337473">"pranešimų garsumas"</item>
+    <item msgid="6700305533746877052">"„Bluetooth“ garsumas"</item>
+    <item msgid="2029227495214047094">"neužmigdyti"</item>
+    <item msgid="26109888160231211">"stebėti vietovę"</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>
+    <item msgid="5753789168376302997">"Medijos mygtukai"</item>
+    <item msgid="3265262911688671938">"Garso sutelktis"</item>
+    <item msgid="2098976479485046797">"Pagrindinis garsumas"</item>
+    <item msgid="5660213838861789350">"Balso garsumas"</item>
+    <item msgid="7983336752371254444">"Skambučio garsumas"</item>
+    <item msgid="7878027809189330917">"Medijos garsumas"</item>
+    <item msgid="7260546305036218513">"Signalo garsumas"</item>
+    <item msgid="9103719301075748925">"Pranešimo garsumas"</item>
+    <item msgid="7025966722295861512">"„Bluetooth“ garsumas"</item>
+    <item msgid="4665183401128289653">"Neužmigdyti"</item>
+    <item msgid="8584357129746649222">"Vietovė"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Trumpas"</item>
     <item msgid="2560532955514699713">"Vidutinis"</item>
     <item msgid="2372711992605524591">"Ilgas"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (derinimas)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Naudoti „Dalvik“"</item>
+    <item msgid="5131846588686178907">"Naudoti ART"</item>
+    <item msgid="4530003713865319928">"Naudoti ART derinimo versiją"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Niekada netikrinti"</item>
     <item msgid="6042769699089883931">"Tikrinti tik DRM turinį"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Animacijos mastelis 5 x"</item>
     <item msgid="1069584980746680398">"Animacijos mastelis 10 x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Nėra"</item>
+    <item msgid="688482401508173818">"720 x 480 mdpi"</item>
+    <item msgid="1725473474827398815">"1 280 x 720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1 920 x 1 080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi ir 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Nėra"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Išjungti"</item>
+    <item msgid="7688197031296835369">"Rodyti perdangos sritis"</item>
+    <item msgid="8332661909019981149">"Rodyti priešingą perdangą"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standartinis apribojimas"</item>
     <item msgid="4071574792028999443">"Nėra fono procesų"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Skirtasis laikas"</item>
     <item msgid="7664124146786465092">"Nepavyko"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Klausti"</item>
+    <item msgid="5077768429488260031">"Niekada neleisti"</item>
+    <item msgid="1417929597727989746">"Visada leisti"</item>
+  </string-array>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index c4b76e3..a3320df 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Taip"</string>
     <string name="no" msgid="6731231425810196216">"Ne"</string>
     <string name="create" msgid="3578857613172647409">"Kurti"</string>
+    <string name="allow" msgid="3349662621170855910">"Leisti"</string>
+    <string name="deny" msgid="6947806159746484865">"Atmesti"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nežinomas"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Liko atlikti <xliff:g id="STEP_COUNT">%1$d</xliff:g> veiksm. ir būsite kūrėjas."</item>
+    <item quantity="other" msgid="6722953419953594148">"Liko atlikti <xliff:g id="STEP_COUNT">%1$d</xliff:g> veiksm. ir būsite kūrėjas."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Dabar esate kūrėjas!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Nereikia, jūs jau esate kūrėjas."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEVIELIS RYŠYS IR TINKLAI"</string>
     <string name="header_category_device" msgid="5781174212691167553">"ĮRENGINYS"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"ASMENIŠKA"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Kraunasi..."</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Iškraunama"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(belaidis)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Nekraunama"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nekraunama"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Visiškai įkrautas"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Neįjungtas į lizdą"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"belaidis"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC ir USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Nežinomas"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Nežinomas"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Nežinoma klaida"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Neveikiantis"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Randamas"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Matoma visiems netol. esant. „Bluetooth“ įr. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Matoma visiems netoliese esan. „Bluetooth“ įreng."</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nematoma kitiems „Bluetooth“ įrenginiams"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Matoma tik suporuotiems įrenginiams."</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Padaryti įrenginį atrandamą"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Baigėsi skirtasis matomumo laikas"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Nustatyti, kiek laiko įrenginys bus aptinkamas"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Užrakinti numerio rinkimą balsu"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Neleisti naudoti „Bluetooth“ numerio rinkiklio, kai ekranas užrakintas"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"„Bluetooth“ įrenginiai"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Rodyti gautus failus"</string>
     <string name="device_picker" msgid="8398232791303186677">"„Bluetooth“ įrenginio pasirinkimo priemonė"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"„Bluetooth“ leidimo užklausa"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Programoje norima įjungti „Bluetooth“. Leisti?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Programoje planšetiniame kompiuteryje norima padaryti planšetinį kompiuterį <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. aptinkamą kitų „Bluetooth“ įrenginių. Leisti?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Programoje telefone norima padaryti telefoną <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. aptinkamą kitų „Bluetooth“ įrenginių. Leisti?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Programoje planšetiniame kompiuteryje norima padaryti planšetinį kompiuterį „visada aptinkamą“ kitų „Bluetooth“ įrenginių. Leisti?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Programoje telefone norima padaryti telefoną „visada aptinkamą“ kitų „Bluetooth“ įrenginių. Leisti?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Programoje planšetiniame kompiuteryje norima įjungti „Bluetooth“ ir padaryti planšetinį kompiuterį <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. aptinkamą kitų įrenginių. Leisti?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Programoje telefone norima įjungti „Bluetooth“ ir padaryti telefoną <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. aptinkamą kitų įrenginių. Leisti?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Programoje planšetiniame kompiuteryje norima įjungti „Bluetooth“ ir padaryti jį aptinkamą kitų įrenginių. Leisti?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Programoje telefone norima įjungti „Bluetooth“ ir padaryti telefoną aptinkamą kitų įrenginių. Leisti?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Programa nori įjungti „Bluetooth“."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Programa nori padaryti planšetinį kompiuterį <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. aptinkamą kitų „Bluetooth“ įrenginių."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Programa nori padaryti telefoną <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. aptinkamą kitų „Bluetooth“ įrenginių."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Programa nori padaryti planšetinį kompiuterį matomą kitų „Bluetooth“ įrenginių. Tai galėsite vėliau pakeisti „Bluetooth“ nustatymuose."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Programa nori padaryti telefoną matomą kitų „Bluetooth“ įrenginių. Tai galėsite vėliau pakeisti „Bluetooth“ nustatymuose."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Programa nori įjungti „Bluetooth“ ir padaryti planšetinį kompiuterį <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. matomą kitų įrenginių."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Programa nori įjungti „Bluetooth“ ir padaryti telefoną <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. matomą kitų įrenginių."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Programa nori įjungti „Bluetooth“ ir padaryti planšetinį kompiuterį matomą kitų įrenginių. Tai galėsite vėliau pakeisti „Bluetooth“ nustatymuose."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Programa nori įjungti „Bluetooth“ ir padaryti telefoną matomą kitų įrenginių. Tai galėsite vėliau pakeisti „Bluetooth“ nustatymuose."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Įjungti „Bluetooth“?"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"„Bluetooth“ išjungiamas…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatiškai prisijungti"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP įgaliotąjį serverį naudoja naršyklė, bet jo negali naudoti kitos programos."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Vieta:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Šalia esantis CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Mob. tel. informacija:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Duomenų bandymai:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS paslauga:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Tarptinklinis ryšys:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Praradote duomenų jungiamumą, nes pagrindinį tinklą palikote išjungę tarptinklinį ryšį."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Įjungti"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Leisdami tarptinklinį duomenų ryšį, galite būti apmokestinti nemažais tarptinklinio ryšio mokesčiais!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Kai leidžiate tarptinklinį duomenų ryšį, gali būti taikomi dideli tarptinklinio ryšio mokesčiai.\n\nŠis nustatymas turi įtakos visiems šio planšetinio kompiuterio naudotojams."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Kai leidžiate tarptinklinį duomenų ryšį, gali būti taikomi dideli tarptinklinio ryšio mokesčiai.\n\nŠis nustatymas turi įtakos visiems šio telefono naudotojams."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Leisti tarptinklinį duomenų ryšį?"</string>
     <string name="networks" msgid="6333316876545927039">"Operatoriaus pasirinkimas"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Pasirinkite tinklo operatorių"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Savininko informac."</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Reikalauti skaitinio PIN kodo ar slaptažodžio, norint iššifruoti planšetinį kompiuterį kaskart jį įjungus"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Reikalauti skaitinio PIN kodo ar slaptažodžio, norint iššifruoti telefoną kaskart jį įjungus"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifruotas"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Galite užšifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją ir kitus failus. Užšifravę planšetinį kompiuterį turėsite įvesti skaitinį PIN kodą arba slaptažodį, kad iššifruotumėte jį kiekvieną kartą įjungę. Planšetinio kompiuterio iššifruoti negalite, išskyrus atvejus, kai atkuriate gamyklinius duomenis, ištrindami visus turimus duomenis."\n\n"Šifravimas trunka valandą ar daugiau. Turite pradėti darbą naudodami įkrautą akumuliatorių ir laikyti planšetinį kompiuterį prijungtą prie maitinimo tinklo, kol šifravimas bus baigtas. Pertraukus šifravimo procesą bus prarasti kai kurie arba visi duomenys."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Galite užšifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją ir kitus failus. Užšifravę telefoną turėsite įvesti skaitinį PIN kodą arba slaptažodį, kad iššifruotumėte jį kiekvieną kartą įjungę. Telefono iššifruoti negalite, išskyrus atvejus, atkuriate gamyklinius duomenis, ištrindami visus turimus duomenis."\n\n"Šifravimas trunka valandą ar daugiau. Turite pradėti darbą naudodami įkrautą akumuliatorių ir laikyti telefoną prijungtą prie maitinimo tinklo, kol šifravimas bus baigtas. Pertraukus šifravimo procesą bus prarasti kai kurie arba visi duomenys."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Galite užšifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją ir kitus failus. Užšifravę planšetinį kompiuterį turėsite įvesti skaitinį PIN kodą arba slaptažodį, kad iššifruotumėte jį kiekvieną kartą įjungę. Planšetinio kompiuterio iššifruoti negalite, išskyrus atvejus, kai atkuriate gamyklinius duomenis, ištrindami visus turimus duomenis.\n\nŠifravimas trunka valandą ar daugiau. Turite pradėti darbą naudodami įkrautą akumuliatorių ir laikyti planšetinį kompiuterį prijungtą prie maitinimo tinklo, kol šifravimas bus baigtas. Pertraukus šifravimo procesą bus prarasti kai kurie arba visi duomenys."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Galite užšifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją ir kitus failus. Užšifravę telefoną turėsite įvesti skaitinį PIN kodą arba slaptažodį, kad iššifruotumėte jį kiekvieną kartą įjungę. Telefono iššifruoti negalite, išskyrus atvejus, atkuriate gamyklinius duomenis, ištrindami visus turimus duomenis.\n\nŠifravimas trunka valandą ar daugiau. Turite pradėti darbą naudodami įkrautą akumuliatorių ir laikyti telefoną prijungtą prie maitinimo tinklo, kol šifravimas bus baigtas. Pertraukus šifravimo procesą bus prarasti kai kurie arba visi duomenys."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifruoti planšetinį kompiuterį"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifruoti telefoną"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Įkraukite akumuliatorių ir bandykite dar kartą."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Bandyti dar kartą po <xliff:g id="DELAY">^1</xliff:g> sek."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Įveskite slaptažodį"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifruotė nepavyko"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifravimas buvo pertrauktas ir negali būti užbaigtas. Todėl duomenys planšetiniame kompiuteryje nebepasiekiami. "\n\n" Jei norite vėl naudoti planšetinį kompiuterį, turite iš naujo nustatyti gamyklinius nustatymus. Kai iš naujo nustatę nustatysite planšetinį kompiuterį, galėsite atkurti visus duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifravimas buvo pertrauktas ir negali būti užbaigtas. Todėl duomenys telefone nebepasiekiami. "\n\n"Jei norite vėl naudoti telefoną, turite iš naujo nustatyti gamyklinius nustatymus. Kai iš naujo nustatę nustatysite telefoną, galėsite atkurti visus duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifravimas buvo pertrauktas ir negali būti užbaigtas. Todėl duomenys planšetiniame kompiuteryje nebepasiekiami. \n\n Jei norite vėl naudoti planšetinį kompiuterį, turite iš naujo nustatyti gamyklinius nustatymus. Kai iš naujo nustatę nustatysite planšetinį kompiuterį, galėsite atkurti visus duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifravimas buvo pertrauktas ir negali būti užbaigtas. Todėl duomenys telefone nebepasiekiami. \n\nJei norite vėl naudoti telefoną, turite iš naujo nustatyti gamyklinius nustatymus. Kai iš naujo nustatę nustatysite telefoną, galėsite atkurti visus duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Perjungti įvesties metodą"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pasir. ekrano užrak."</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pasirinkti atsarginį užrakinimą"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Pakeisti atrakinimo PIN kodą"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Pakeisti atrakinimo slaptažodį"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Slaptažodį turi sudaryti mažiausiai %d simboliai."</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN kodą turi sudaryti mažiausiai %d simboliai (-ių)"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN kodą turi sudaryti mažiausiai %d skaitm."</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Atlikę spustelėkite „Tęsti“"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Tęsti"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Slaptažodį turi sudaryti mažiau nei <xliff:g id="NUMBER">%d</xliff:g> simboliai (-ių)."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kaip kalbėtojo telefonas"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Muzikai ir medijai"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Atsiminti nustatymus"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Susietos pateiktys"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Pasiekiami įrenginiai"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Jungiama"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Prijungta"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Pasiekiama"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Naudojama"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Pateikties nustatymai"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Atsijungti?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Tai nutrauks ryšį su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Belaidžio rodymo parinktys"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Pamiršti"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Atlikta"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Pavadinimas"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Įjungta"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Išjungta"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Neleidžiama"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Leisti keistis duomenimis, kai planšetinis kompiuteris aptinka kitą įrenginį"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Leisti keistis duomenimis, kai telefonas paliečia kitą įrenginį"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Išjungta"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Negalima, nes išjungtas ALR"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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\nTiesiog 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">"Rinktis „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="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="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="8116564886303972764">"Įveskite „Wi-Fi“ maršruto parinktuvo PIN kodą <xliff:g id="NUMBER">%1$s</xliff:g>. Sąranka gali trukti iki dviejų min."</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_in_progress" msgid="2944576520214787628">"WPS jau vykdoma ir gali užtrukti iki dviejų min., kol bus baigta"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Belaidžio maršruto parinktuvo saugos nustatymas (TKIP) nepalaikomas"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Nepavyko autentifikuoti. Bandykite dar kartą."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Aptikta kita WPS sesija. Po kelių minučių bandykite dar kartą."</string>
     <string name="wifi_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>
@@ -564,6 +621,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\nAr 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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Išsaugoti"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Išsaugant tinklą įvyko klaida."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Atšaukti"</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_skip_anyway" msgid="6965361454438011190">"Vis tiek praleisti"</string>
+    <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\nNustatant 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\nNustatant telefoną gali reikėti daug naudoti tinklą."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Ieškoma…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Pervardyti įrenginį"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Lygiaverčiai įrenginiai"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Įsimintos grupės"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Nepavyko prijungti."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Nepavyko pervardyti įrenginio."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Atsijungti?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Atsijungus, bus nutrauktas ryšys su „<xliff:g id="PEER_NAME">%1$s</xliff:g>“ ir <xliff:g id="PEER_COUNT">%2$s</xliff:g> kitais (-ų) įrenginiais (-ių)."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Perkeliama „Wi-Fi“ aktyvioji sritis"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Pamiršti šią grupę?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Kilnojamasis „Wi-Fi“ viešosios interneto prieigos taškas"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Muzikos efektai"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Skambučio garsumas"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibruoti, kai veikia tyliuoju režimu"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Numatytasis pranešimas"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Numatytasis pranešimo garsas"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsuojanti įspėjimo šviesa"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Skambėjimo tonas"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Įspėjimas"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Įspėjimams naudoti gaunamų skambučių garsumą"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Pasirinkti pranešimo skambėjimo toną"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Numatytasis pranešimo garsas"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Medija"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Nustatyti muzikos ir vaizdo įrašų garsumą"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Signalas"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neveiklumo"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Darbalaukio fonas"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pasirinkti darbalaukio foną iš"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Ekrano užsklandos"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Bus pradėta, kai veikia miego režimas, jei įjungta į lizdą"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Išjungta"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Pasirinkta ekrano užsklanda"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Kada aktyvinti"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Kai <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neatliekama jokių veiksmų"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Niekada"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Išbandykite!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Taip pat pradėti, kai įrenginys yra doke"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Svajonė"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kai yra doke arba kai veikia miego režimas ir kraunamas akumuliatorius"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Abiem atvejais"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Įkraunant"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Kai yra doke"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Išjungta"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Jei norite valdyti, kas vyksta, kai telefonas yra doke ir (arba) veikia miego režimu, įjunkite funkciją „Svajonės“."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kada svajoti"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Pradėti dabar"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Nustatymai"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatinis ryškumas"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Šrifto dydis"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Šrifto dydis"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM kortelės PIN kodas"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Netinkamas PIN kodas"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN kodai neatitinka"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Nepavyksta pakeisti PIN kodo."\n"Tikriausiai netinkamas PIN kodas."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Nepavyksta pakeisti PIN kodo.\nTikriausiai netinkamas PIN kodas."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM kortelės PIN kodas sėkmingai pakeistas"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Neįmanoma pakeisti SIM kortelės užrakto būsenos."\n"Tikriausiai netinkamas PIN kodas."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Neįmanoma pakeisti SIM kortelės užrakto būsenos.\nTikriausiai netinkamas PIN kodas."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Gerai"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Atšaukti"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Planšetinio kompiuterio būsena"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Nemoduliuojamo perdavimo versija"</string>
     <string name="kernel_version" msgid="9192574954196167602">"„Kernel“ versija"</string>
     <string name="build_number" msgid="3075795840572241758">"Versijos numeris"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"„SELinux“ būsena"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Negalima"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Būsena"</string>
     <string name="device_status" msgid="607405385799807324">"Būsena"</string>
@@ -733,12 +807,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">"Mobilaus tinklo tipas"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Operatoriaus informacija"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Mobiliojo tinklo būsena"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Paslaugos būsena"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB atmintinė"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD kortelė"</string>
     <string name="memory_available" msgid="5052397223077021181">"Pasiekiama"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Pasiekiama (tik skaitoma)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Visa vieta"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Skaičiuojama..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Programos (programų duomenys ir medijos turinys)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Paveikslėliai, vaizdo įrašai"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Garso įr. (muzika, skamb. tonai, tinklal. ir kt.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Įvairūs"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Talpykloje saugomi duomenys"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Atjung. bendrin. atmint."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Išimti SD kortelę"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Atjungti vidinę USB atmintinę"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Ištrinti SD kortelę"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Ištrinami visi vidinės USB atmint. duomenys, pvz., muzikos failai ir nuotraukos"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Ištrinami visi SD kortelės duomenys, pvz., muzikos failai ir nuotraukos"</string>
-    <string name="read_only" msgid="6702420168629076340">" (tik skaitoma)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Išvalyti talpykloje saugomus duomenis?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Bus išval. visų progr. talpykl. saugomi duomen."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP ar PTP funkcija aktyvi"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Pašalinti USB atmintį?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Išimti SD kortelę?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Jei pašalinsite USB atmintį, kai kurios naudojamos programos bus sustabdytos ir gali būti nepasiekiamos, kol iš naujo ją įrengsite."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Fotoaparatas (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Galite perduoti nuotraukas naudodami fotoaparato programinę įrangą ir perduoti bet kokius failus MTP nepalaikančiuose kompiuteriuose"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Įdiegti failų perdavimo įrankius"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Kiti naudotojai"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Akumuliatoriaus būsena"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akumuliatoriaus lygis"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Gamyklos duomenų nustatymas iš naujo"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Ištrinami visi planšetinio kompiuterio duomenys"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Ištrina visus telefono duomenis"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Taip bus ištrinti visi duomenys iš planšetinio kompiuterio "<b>"vidinės atminties"</b>", įskaitant:"\n\n<li>"„Google“ paskyrą"</li>\n<li>"Sistemos ir programų duomenis bei nustatymus"</li>\n<li>"Atsisiųstas programas"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Taip bus ištrinti visi duomenys iš telefono "<b>"vidinės atminties"</b>", įskaitant:"\n\n<li>"„Google“ paskyrą"</li>\n<li>"Sistemos ir programų duomenis bei nustatymus"</li>\n<li>"Atsisiųstas programas"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Šiuo metu esate prisijungę prie šių paskyrų:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Taip bus ištrinti visi duomenys iš planšetinio kompiuterio "<b>"vidinės atminties"</b>", įskaitant:\n\n"<li>"„Google“ paskyrą"</li>\n<li>"Sistemos ir programų duomenis bei nustatymus"</li>\n<li>"Atsisiųstas programas"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Taip bus ištrinti visi duomenys iš telefono "<b>"vidinės atminties"</b>", įskaitant:\n\n"<li>"„Google“ paskyrą"</li>\n<li>"Sistemos ir programų duomenis bei nustatymus"</li>\n<li>"Atsisiųstas programas"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Šiuo metu esate prisijungę prie šių paskyrų:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzika"</li>\n<li>"Nuotraukos"</li>\n<li>"Kiti naudotojo duomenys"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Norint išvalyti muzikos failus, paveikslėlius bei kitus naudotojo duomenis, reikia ištrinti "<b>"USB atmintį"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Norint išvalyti muzikos failus, paveikslėlius ir kitus naudotojo duomenis, reikia ištrinti "<b>"SD kortelę"</b>"."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus atsietas."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pagalba"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilūs tinklai"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Tvarkykite mobiliojo planą"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Nežinomas SIM operatorius"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"„%1$s“ neturi aprūpinimo svetainės"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Įdėkite SIM kortelę ir paleiskite iš naujo"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Prisijunkite prie interneto"</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>
@@ -917,6 +1004,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Žiūrėti teisinę informaciją, būseną, programinės įrangos versiją"</string>
     <string name="legal_information" msgid="5769301644270604095">"Teisinė informacija"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Pagalbininkai"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Reguliuojam. informacija"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorių teisės"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencija"</string>
     <string name="terms_title" msgid="7697580845616764642">"Taisyklės ir nuostatos"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Pakeisti atrakinimo PIN kodą"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Patvirtinti išsaugotą modelį"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Bandykite dar kartą:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Nustatyti atrakinimo modelį"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Nubrėžti atrakinimo piešinį:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Jei norite gauti pagalbos, paspauskite „Meniu“."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Baigę atleiskite pirštą."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Prijunkite mažiausiai <xliff:g id="NUMBER">%d</xliff:g> taškus. Bandykite dar kartą:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kaip nustatyti atrakinimo modelį"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Per daug neteisingų bandymų!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Bandyti dar kartą po <xliff:g id="NUMBER">%d</xliff:g> sek."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Atšaukti"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Kitas"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Planšetinio kompiuterio saugumo užtikrinimas"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Telefono apsaugojimas"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Apsaugokite planšetinį kompiuterį nuo neteisėto naudojimo sukurdami asmeninį ekrano atrakinimo šabloną. Pirštu bet kokia tvarka sujunkite taškus kitame ekrane. Reikia sujungti bent keturis taškus. "\n\n"Pasiruošę pradėti? Palieskite „Kitas“."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Apsaugokite telefoną nuo neteisėto naudojimo sukurdami asmeninį ekrano atrakinimo modelį. Pirštu bet kokia tvarka sujunkite mažiausiai keturis taškus kitame ekrane. "\n\n"Pasiruošę pradėti? Palieskite „Kitas“."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Programa jūsų telefone neįdiegta."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Valdyti programas"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Tvarkykite ir pašalinkite įdiegtas programas"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Programos"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Leisti diegti programas iš nežinomų šaltinių"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Planšetinis kompiuteris ir asmeniniai duomenys prastai apsaugoti nuo programų iš nežinomų šaltinių atakų. Sutinkate, kad tik jūs atsakote už visus planšetinio kompiuterio pažeidimus ar duomenų praradimą naudojant šias programas."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefonas ir asmeniniai duomenys prastai apsaugoti nuo programų iš nežinomų šaltinių atakų. Sutinkate, kad tik jūs atsakote už visus telefono pažeidimus ar duomenų praradimą naudojant šias programas."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Patvirtinti programas"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Neleisti arba įspėti prieš diegiant programas, kurios gali būti kenksmingos"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Išplėstiniai nustatymai"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Įgalinti daugiau nustatymų parinkčių"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Programos informacija"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB atminties duomenys"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD kortelė"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Pašalinti"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Pašalinti visiems naudotojams"</string>
+    <string name="install_text" msgid="884360662922471113">"Įdiegti"</string>
     <string name="disable_text" msgid="6544054052049395202">"Neleisti"</string>
     <string name="enable_text" msgid="9217362512327828987">"Įgalinti"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Išvalyti duomenis"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Rodyti padėtus procesus"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Iš naujo nustat. nuostat."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Iš naujo nust. nuostat.?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Bus iš naujo nustatytos visos toliau nurodytų elementų nuostatos:"\n\n" "<li>"Neleidžiamos programos"</li>\n" "<li>"Neleidžiami programų pranešimai"</li>\n" "<li>"Numatytosios veiksmų programos"</li>\n" "<li>"Programų fono duomenų apribojimai"</li>\n\n" Nebus prarasti jokie programų duomenys."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Bus iš naujo nustatytos visos toliau nurodytų elementų nuostatos:\n\n "<li>"Neleidžiamos programos"</li>\n" "<li>"Neleidžiami programų pranešimai"</li>\n" "<li>"Numatytosios veiksmų programos"</li>\n" "<li>"Programų fono duomenų apribojimai"</li>\n\n" Nebus prarasti jokie programų duomenys."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Iš naujo nustat. program."</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Valdyti vietą"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD kortelėje"</string>
     <string name="disabled" msgid="9206776641295849915">"Neleidžiama"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Neįdiegta"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nėra programų"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Vidinė atmint."</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB atmintinė"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> ir <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Naudodami šią programą galite būti apmokestinti:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Siųsti brangesnį SMS"</string>
     <string name="computing_size" msgid="1599186977475211186">"Apskaičiuojama..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Nepavyko apskaičiuoti paketo dydžio."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Neturite įdiegtų trečiosios šalies programų."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Pakeisti pageidaujamą naujų programų diegimo vietą"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Neleisti integruotos programos?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Jei neleisite integruotos programos, kitos programos gali neveikti tinkamai."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Ištrinti duomenis ir neleisti programos?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Naudotojas: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Pašalintas naudotojas"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesas ir <xliff:g id="NUMSERVICES">%2$d</xliff:g> paslauga"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesas ir <xliff:g id="NUMSERVICES">%2$d</xliff:g> paslaugos (-ų)"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesai (-ų) ir <xliff:g id="NUMSERVICES">%2$d</xliff:g> paslauga"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Fiziniai klaviatūros nustatymai"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Du kartus paspauskite tarpo klavišą, kad įterptumėte „.“"</string>
     <string name="show_password" msgid="3001113966880559611">"Padaryti slaptažodžius matomus"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Naudojant šį įvesties metodą galima rinkti visą įvedamą tekstą, įskaitant asmeninius duomenis, pvz., slaptažodžius ir kredito kortelių numerius. Jis pateikiamas naudojant programą „<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>“. Naudoti šį įvesties metodą?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Naudojant šią rašybos tikrinimo programą galima rinkti visą įvedamą tekstą, įskaitant asmeninius duomenis, pvz., slaptažodžius ir kredito kortelių numerius. Ji pateikiama naudojant programą „<xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>“. Naudoti šią rašybos tikrinimo programą?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Nustatymai"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Kad perj., pasp. vald. ir tarpo kl."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Numatytasis"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Klaviatūros išdėstymai"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Naudotojo žodynas"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Asmeninis žodynas"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Asmeniniai žodynai"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Asmeninis žodynas"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Pridėti"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Pridėti prie žodyno"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Kraunant ekranas niekada neveiks miego režimu"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Įgalinti „Bluetooth“ HCI šnipinėjimo žurnalą"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Užfiksuoti visus faile esančius „Bluetooth“ HCI paketus"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Pasirinkti vykdymo laiką"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Pasirinkti vykdymo laiką"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Įkelti iš naujo, kad vykdymo laikas būtų pakeistas iš <xliff:g id="OLD">%1$s</xliff:g> į <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Leisti imituoti vietas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Leisti imituoti vietas"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Patikrinkite, ar programų, įdiegtų naudojant ADB / ADT, veikimas nėra žalingas."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Apsaugoti USB atmintį"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Programos turi prašyti leidimo skaityti USB atmintį"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Apsaugoti USB atmintį?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Jei USB atmintis yra apsaugota, programos turi prašyti leidimo skaityti išorinėje atmintinėje esančius duomenis."\n\n"Kai kurios programos gali neveikti, kol jų neatnaujins kūrėjai."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Jei USB atmintis yra apsaugota, programos turi prašyti leidimo skaityti išorinėje atmintinėje esančius duomenis.\n\nKai kurios programos gali neveikti, kol jų neatnaujins kūrėjai."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Apsaugoti SD kortelę"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Programos turi prašyti leidimo skaityti SD kortelę"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Apsaugoti SD kortelę?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Jei SD kortelė yra apsaugota, programos turi prašyti leidimo skaityti išorinėje atmintinėje esančius duomenis."\n\n"Kai kurios programos gali neveikti, kol jų neatnaujins kūrėjai."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Jei SD kortelė yra apsaugota, programos turi prašyti leidimo skaityti išorinėje atmintinėje esančius duomenis.\n\nKai kurios programos gali neveikti, kol jų neatnaujins kūrėjai."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Vietinis terminalas"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Įgal. terminalo progr., siūlančią prieigą prie viet. apvalkalo"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Pasirinkti programėlę"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Pasirinkti valdiklį"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Sukurti valdiklį ir leisti prieigą?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Pasiekiamumo nustatymai"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Paslaugos"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Didelis tekstas"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Maitinimo mygtukas baigia skambutį"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Sakyti slaptažodžius"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"„Paliesti ir laikyti“ delsa"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Padidinti žiniatinklio pasiekiamumą"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Didinimo gestai"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kai ši funkcija įjungta, galite artinti ir tolinti tris kartus palietę ekraną.\n\nKai priartinate, galite:\n"<ul><li>"Iš lėto apžvelgti: mažiausiai dviem pirštais vilkite ekranu."</li>\n<li>"Koreguoti priartinimo lygį: suimkite mažiausiai dviem pirštais arba išskėskite juos."</li></ul>\n\n"Be to, galite laikinai padidinti tai, kas po pirštu, tris kartus palietę ir laikydami. Esant šiai padidinto vaizdo būsenai galite vilkti pirštu, jei norite naršyti skirtingas ekrano dalis. Pakelkite pirštą, kad grįžtumėte į ankstesnę būseną.\n\nPastaba: palietimo tris kartus, kad būtų padidinta, funkcija veikia visur, išskyrus klaviatūrą ir naršymo juostą."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Spart. pritaikymo neįgal. įjungimas"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Įjungta"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Išjungta"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kai ši funkcija įjungta, galite greitai įgalinti pritaikymo neįgaliesiems funkcijas šiais dviem veiksmais:\n\n1 veiksmas: paspauskite ir laikykite paspaudę maitinimo mygtuką, kol išgirsite garsą ar pajusite vibraciją.\n\n2 veiksmas: palieskite ir laikykite palietę dviem pirštais, kol išgirsite patvirtinamąjį garso pranešimą\n\nJei įrenginį naudoja keli naudotojai, užrakinimo ekrane įjungus šią funkciją laikinai bus įgalintas pritaikymas neįgaliesiems, kol įrenginys bus atrakintas."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Didelis tekstas"</string>
+    <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. 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_menu_item_settings" msgid="3344942964710773365">"Nustatymai"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Įjungta"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"Įjungta"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Išjungta"</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="print_settings" msgid="4742428530112487843">"Spausdinimas"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Spausdinimo nustatymai"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Paslaugos"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Naudoti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"„<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>“ galės gauti jūsų spausdinamus dokumentus. Šiuose dokumentuose gali būti delikačių duomenų."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nėra įdiegta jokių paslaugų"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Nustatymai"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Pridėti spausdintuvų"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Įjungta"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Išjungta"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterija"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Kas naudojo akumuliatorių"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Akum. naudoj. duom. nepasiek."</string>
@@ -1268,22 +1393,22 @@
     <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">"Išsami istorijos informacija"</string>
+    <string name="history_details_title" msgid="3608240585315506067">"Istorijos informacija"</string>
     <string name="details_title" msgid="3792801565213935385">"Išsami naudojimo informacija"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Išsami naudojimo informacija"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Reguliuoti maitinimo naudojimą"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Įtraukti paketai"</string>
     <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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Gauti duomenys"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Mob. tinklo duomenys išsiųsti"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobiliojo tinklo duomenys gauti"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"„Wi‑Fi“ tinklo duomenys išsiųsti"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"„Wi‑Fi“ tinklo duomenys gauti"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Garso įrašas"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Vaizdo įrašas"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Laikas, kai buvo įjungta"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Stabdyti ar pašalinti programą"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Rankiniu būdu valdyti GPS, kad programa jos negalėtų naudoti"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Programa gali pasiūlyti nustatymus, kad būtų išeikvojama mažiau akumuliatoriaus energijos"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Naudotojo sunaudota akumuliatoriaus energija"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> po to, kai buvo ištrauktas iš lizdo"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Kai paskutinį kartą buvo ištrauktas iš lizdo <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Visas naudojimas"</string>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Garso aukštis"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Daro poveikį sakomo teksto tonui"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Kalba"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Kalba nepasirinkta"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Nustato konkrečiai kalbai būdingą sakomo teksto balsą"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Klausytis pavyzdžio"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Paleisti trumpą kalbos sintezės demonstraciją"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Skaistis <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatinis"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"visiškas"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"pusinis"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"išjungta"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Įgaliojimų atmintinė"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Įdiegti iš atmintinės"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Iš naujo įdiegdami programą atkurkite nustatymus ir duomenis, kurių atsarginės kopijos buvo sukurtos"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Pranešti apie triktį"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Bus surinkta informacija apie dabartinę įrenginio būklę ir išsiųsta el. pašto pranešimu. Šiek tiek užtruks, kol pranešimas apie triktį bus paruoštas siųsti; būkite kantrūs."</string>
-    <string name="report" msgid="302437572240018342">"Pranešti"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Viet. atsrg. kop. slapt."</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Šiuo metu visos vietinės atsarginės kopijos neapsaugotos"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Jei norite pakeisti ar pašalinti visų vietinių atsarginių kopijų slaptažodį, palieskite"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nPalieskite "<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>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalendorius"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kontaktai"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Sveiki! Tai – „Google“ sinchronizavimas!"</font>" "\n"Tai yra „Google“ požiūris į duomenų sinchronizavimą, kad būtų galima pasiekti kontaktus, susitikimus ir dar daugiau, nesvarbu, kur būtumėte."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Sveiki! Tai – „Google“ sinchronizavimas!"</font>" \nTai yra „Google“ požiūris į duomenų sinchronizavimą, kad būtų galima pasiekti kontaktus, susitikimus ir dar daugiau, nesvarbu, kur būtumėte."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Programos sinchronizavimo nustatymai"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Duomenys ir sinchronizavimas"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Keisti slaptažodį"</string>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Naujinant mirginti visus langų paviršius"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Rodyt GPU rodinių naujin."</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"„Flash“ rodiniai languose atvaizduojant su GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Rod. apar. įr. sl. nauj."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Kai atsin. apar. įr. sl., rod. juos blyks. ž. sp."</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Derinti GPU perdangą"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Rodyti centr. proc. naud."</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Ekrano perdanga rodo dabartinį centr. proc. naud."</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Priverst. GPU atvaizd."</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Imituoti antrin. ekranus"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Programos"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Nesaugoti veiklos"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Sunaikinti visą veiklą, kai naud. iš jos išeina"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Nel. fon. duom. mob. tinkl. Ne mob. tinkl. bus naud., jei pas."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Kad aprib. šios progr. fon. duom., pirm. nustat. mob. duom. apr."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Apriboti foninius duomenis?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Dėl šios funkcijos, kai pasiekiami tik mobilieji tinklai, gali neveikti programos, kurių veikimas priklauso nuo foninių duomenų."\n\n"Programos nustatymuose galite rasti tinkamesnių duomenų naudojimo valdiklių."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Dėl šios funkcijos, kai pasiekiami tik mobilieji tinklai, gali neveikti programos, kurių veikimas priklauso nuo foninių duomenų.\n\nProgramos nustatymuose galite rasti tinkamesnių duomenų naudojimo valdiklių."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Apriboti foninius duomenis galima tik nustačius mobiliojo ryšio duomenų apribojimą."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Įjungti autom. sinchronizavimą?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Bet kokie paskyrų pakeitimai, kuriuos atliekate žiniatinklyje, bus automatiškai nukopijuoti į planšetinį kompiuterį."\n\n"Iš kai kurių paskyrų į žiniatinklį gali būti automatiškai kopijuojami visi planšetiniame kompiuteryje atlikti pakeitimai. Taip pat daroma ir „Google“ paskyroje."\n\n"Jei norite pasirinkti, kokią kiekvienos paskyros informaciją sinchronizuoti, eikite į „Nustatymai“ &gt; „Paskyros“."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Bet kokie paskyrų pakeitimai, kuriuos atliekate žiniatinklyje, bus automatiškai nukopijuoti į telefoną."\n\n"Iš kai kurių paskyrų į žiniatinklį gali būti automatiškai kopijuojami visi telefone atlikti pakeitimai. Taip pat daroma ir „Google“ paskyroje."\n\n"Jei norite pasirinkti, kokią kiekvienos paskyros informaciją sinchronizuoti, eikite į „Nustatymai“ &gt; „Paskyros“."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Bet kokie paskyrų pakeitimai, kuriuos atliekate žiniatinklyje, bus automatiškai nukopijuoti į planšetinį kompiuterį.\n\nIš kai kurių paskyrų į žiniatinklį gali būti automatiškai kopijuojami visi planšetiniame kompiuteryje atlikti pakeitimai. Taip pat daroma ir „Google“ paskyroje.\n\nJei norite pasirinkti, kokią kiekvienos paskyros informaciją sinchronizuoti, eikite į „Nustatymai“ &gt; „Paskyros“."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Bet kokie paskyrų pakeitimai, kuriuos atliekate žiniatinklyje, bus automatiškai nukopijuoti į telefoną.\n\nIš kai kurių paskyrų į žiniatinklį gali būti automatiškai kopijuojami visi telefone atlikti pakeitimai. Taip pat daroma ir „Google“ paskyroje.\n\nJei norite pasirinkti, kokią kiekvienos paskyros informaciją sinchronizuoti, eikite į „Nustatymai“ &gt; „Paskyros“."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Išjungti autom. sinchronizavimą?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Tai atlikus bus saikingai naudojami duomenys ir akumuliatoriaus energija, tačiau, jei norėsite surinkti naujausią informaciją, turėsite sinchronizuoti kiekvieną paskyrą rankiniu būdu. Be to, negausite pranešimų, kai atsiras naujinių."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Naudojimo ciklo nustatymo iš naujo data"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Nustatyti duomenų naudojimo įspėjimą"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nustatyti duomenų naudojimo apribojimą"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Duomenų naudojimo ribojimas"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobiliųjų duomenų ryšys bus neleidžiamas, kai bus pasiektas nurodytas apribojimas.\n\nKadangi 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\nKadangi 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" 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Pašalintos programos ir naudotojai"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"Gauta: <xliff:g id="RECEIVED">%1$s</xliff:g>, išsiųsta: <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>: sunaudota apie <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>: 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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Pridėti VPN profilį"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Redaguoti profilį"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Ištrinti profilį"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Visada įjungtas VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Pasirinkite VPN profilį, kad visada būtumėte prisijungę. Tinklo srautas bus leidžiamas, tik prisijungus prie šio VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Joks"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Norint, kad VPN būtų visada įjungtas, reikalingas serverio ir DNS IP adresas."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Šiuo metu nėra tinklo ryšio. Bandykite dar kartą vėliau."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Nėra sertifikato. Redaguokite profilį."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Atšaukti"</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">"Papildomi sistemos naujiniai"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Naudotojai ir apribojimai"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Naudotojai"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Pridėti naudotoją"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Redaguoti informaciją"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Naudotojo informacija"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Vardas"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Turinio apribojimai"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Reikalauti PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Turinio įvertinimas"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Sistemos programos"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Įdiegtos programos"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Atmesti"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Pašalinti naudotoją"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Įkyrus vaikas"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Neleidžiama"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Negriežta"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Vykdoma"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Naudotojai"</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="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\nSukūrus naują naudotoją, tas asmuo turi įvykdyti sąrankos procesą.\n\nBet 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\nBet 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_confirm_remove_message" msgid="5284111415714437285">"Ar tikrai norite pašalinti naudotoją ir visus susijusius duomenis iš įrenginio?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Keisti šrifto dydį"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Apribojimai"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Pašalinti apribojimus"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Keisti PIN kodą"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Rodyti pranešimus"</string>
     <string name="help_label" msgid="1107174367904110532">"Pagalba"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Turiniui skirta paskyra"</string>
+    <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="6160672982086584261">"Nustatykite programos apribojimus"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Kontroliuoja „<xliff:g id="APP">%1$s</xliff:g>“"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ši programa nepalaikoma apribotuose profiliuose"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ši programa gali pasiekti jūsų paskyras"</string>
+    <string name="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 de78636..97bf2b8 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,16 +218,127 @@
     <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="886742181977884584">"Multivide"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"multivides pogas"</item>
+    <item msgid="4547883971364273343">"audio uzsvars"</item>
+    <item msgid="2603878814882344450">"galvenais skaļums"</item>
+    <item msgid="7136963238377062018">"balss skaļums"</item>
+    <item msgid="4270236897655923007">"zvana skaļums"</item>
+    <item msgid="6325739889222559394">"multivides skaļums"</item>
+    <item msgid="5762123934816216821">"signāla skaļums"</item>
+    <item msgid="785049718065337473">"paziņojumu skaļums"</item>
+    <item msgid="6700305533746877052">"Bluetooth apjoms"</item>
+    <item msgid="2029227495214047094">"neļaut pāriet miega rež."</item>
+    <item msgid="26109888160231211">"pārraudzīt atrašanās vietu"</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>
+    <item msgid="5753789168376302997">"Multivides pogas"</item>
+    <item msgid="3265262911688671938">"Audio uzsvars"</item>
+    <item msgid="2098976479485046797">"Galvenais skaļums"</item>
+    <item msgid="5660213838861789350">"Balss skaļums"</item>
+    <item msgid="7983336752371254444">"Zvana skaļums"</item>
+    <item msgid="7878027809189330917">"Multivides skaļums"</item>
+    <item msgid="7260546305036218513">"Signāla skaļums"</item>
+    <item msgid="9103719301075748925">"Paziņojumu skaļums"</item>
+    <item msgid="7025966722295861512">"Bluetooth apjoms"</item>
+    <item msgid="4665183401128289653">"Neļaut pāriet miega rež."</item>
+    <item msgid="8584357129746649222">"Atrašanās vieta"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Īss"</item>
     <item msgid="2560532955514699713">"Vidējs"</item>
     <item msgid="2372711992605524591">"Ilgs"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (atkļūdošana)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Izmantot Dalvik"</item>
+    <item msgid="5131846588686178907">"Izmantot ART"</item>
+    <item msgid="4530003713865319928">"Izmantot ART atkļūdošanas versiju"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nekad nepārbaudīt"</item>
     <item msgid="6042769699089883931">"Pārbaudīt tikai DRM saturu"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Animācijas mērogs: 5x"</item>
     <item msgid="1069584980746680398">"Animācijas mērogs: 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Nav"</item>
+    <item msgid="688482401508173818">"720 x 480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280 x 720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280 x 720 tvdpi un 1920 x 1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Nav"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Izslēgta"</item>
+    <item msgid="7688197031296835369">"Rādīt apgab., kur pārsn. kapacitāte"</item>
+    <item msgid="8332661909019981149">"Rādīt kapac. pārsnieguma skaitītāju"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standarta ierobežojums"</item>
     <item msgid="4071574792028999443">"Nav fona procesu"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Noildze"</item>
     <item msgid="7664124146786465092">"Neizdevās"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Vaicāt"</item>
+    <item msgid="5077768429488260031">"Neatļaut nekad"</item>
+    <item msgid="1417929597727989746">"Vienmēr atļaut"</item>
+  </string-array>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 4323d7d..600aa4a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Jā"</string>
     <string name="no" msgid="6731231425810196216">"Nē"</string>
     <string name="create" msgid="3578857613172647409">"Izveidot"</string>
+    <string name="allow" msgid="3349662621170855910">"Atļaut"</string>
+    <string name="deny" msgid="6947806159746484865">"Aizliegt"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nezināms"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Lai jūs kļūtu par izstrādātāju, atlikusi <xliff:g id="STEP_COUNT">%1$d</xliff:g> darbība."</item>
+    <item quantity="other" msgid="6722953419953594148">"Lai jūs kļūtu par izstrādātāju, atlikušas <xliff:g id="STEP_COUNT">%1$d</xliff:g> darbības."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Tagad jūs esat izstrādātājs!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Nav nepieciešams, ja jau esat izstrādātājs."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEZVADU PAKALPOJUMI UN TĪKLI"</string>
     <string name="header_category_device" msgid="5781174212691167553">"IERĪCE"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PERSONISKIE"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Uzlāde"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Izlāde"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(bezvadu)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Nenotiek uzlāde"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nenotiek uzlāde"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Pilns"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Atvienots"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"Maiņstrāva"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"bezvadu"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Nezināms"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Nezināms"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Nezināma kļūda"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Auksts"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Atklājams"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Redzams visām blakus esošām Bluetooth ier. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Redzams visām blakus esošām Bluetooth ierīcēm"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nav redzams citām Bluetooth ierīcēm"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Redzams tikai pārī savienotām ierīcēm"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Padarīt ierīci atklājamu"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Redzamības noildze"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Iestatiet laiku, cik ilgi ierīce būs atklājama."</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloķēt balss iezvani"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Neļaut izmantot Bluetooth iezvanprogrammu, kad ekrāns ir bloķēts"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth ierīces"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Rādīt saņemtos failus"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth ierīces izvēle"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth atļaujas pieprasījums"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Lietotnē tiek mēģināts ieslēgt Bluetooth savienojumu. Vai atļaut?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Planšetdatorā instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm padarīt planšetdatoru redzamu citām Bluetooth ierīcēm. Vai atļaut?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Tālrunī instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm padarīt tālruni redzamu citām Bluetooth ierīcēm. Vai atļaut?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Planšetdatorā instalētā lietotnē tiek mēģināts padarīt planšetdatoru vienmēr redzamu citām Bluetooth ierīcēm. Vai atļaut?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Tālrunī instalētā lietotnē tiek mēģināts padarīt tālruni vienmēr redzamu citām Bluetooth ierīcēm. Vai atļaut?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Planšetdatorā instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm ieslēgt Bluetooth savienojumu un padarīt planšetdatoru redzamu citām ierīcēm. Vai atļaut?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Tālrunī instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm ieslēgt Bluetooth savienojumu un padarīt tālruni redzamu citām ierīcēm. Vai to atļaut?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Planšetdatorā instalētā lietotnē tiek mēģināts ieslēgt Bluetooth savienojumu un padarīt planšetdatoru redzamu citām ierīcēm. Vai atļaut?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Tālrunī instalētā lietotnē tiek mēģināts ieslēgt Bluetooth savienojumu un padarīt tālruni redzamu citām ierīcēm. Vai atļaut?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Lietotnē tiek mēģināts ieslēgt Bluetooth savienojumu. Vai atļaut?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Planšetdatorā instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm padarīt planšetdatoru redzamu citām Bluetooth ierīcēm."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Tālrunī instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm padarīt tālruni redzamu citām Bluetooth ierīcēm."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Planšetdatorā instalētā lietotnē tiek mēģināts padarīt planšetdatoru redzamu citām Bluetooth ierīcēm. Vēlāk varēsiet to mainīt Bluetooth iestatījumos."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Tālrunī instalētā lietotnē tiek mēģināts padarīt tālruni redzamu citām Bluetooth ierīcēm. Vēlāk varēsiet to mainīt Bluetooth iestatījumos."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Planšetdatorā instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm ieslēgt Bluetooth savienojumu un padarīt planšetdatoru redzamu citām ierīcēm. Vai atļaut?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Tālrunī instalētā lietotnē tiek mēģināts uz <xliff:g id="TIMEOUT">%1$d</xliff:g> sekundēm ieslēgt Bluetooth savienojumu un padarīt tālruni redzamu citām ierīcēm. Vai atļaut?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Planšetdatorā instalētā lietotnē tiek mēģināts ieslēgt Bluetooth savienojumu un padarīt planšetdatoru redzamu citām ierīcēm. Vēlāk varēsiet to mainīt Bluetooth iestatījumos."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Tālrunī instalētā lietotnē tiek mēģināts ieslēgt Bluetooth savienojumu un padarīt tālruni redzamu citām ierīcēm. Vēlāk varēsiet to mainīt Bluetooth iestatījumos."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Tiek ieslēgta tehnoloģija Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Notiek Bluetooth savienojuma izslēgšana…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automātiski izveidot savienojumu"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP starpniekserveris tiek izmantots pārlūkprogrammā, taču, iespējams, netiek izmantots citās lietotnēs."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Atrašanās vieta:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Tuvējais CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Tālruņa atrašanās vietas informācija:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Datu mēģinājumi:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS pakalpojums:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Viesabonēšana:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Datu savienojamība ir zaudēta, jo mājas tīkls ar datu viesabonēšanu ir izslēgts."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Ieslēgt"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Atļaujot datu viesabonēšanu, var rasties ievērojamas viesabonēšanas izmaksas."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Atļaujot datu viesabonēšanu, var rasties ievērojamas viesabonēšanas izmaksas.\n\nŠis iestatījums ietekmē visus planšetdatora lietotājus."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Atļaujot datu viesabonēšanu, var rasties ievērojamas viesabonēšanas izmaksas.\n\nŠis iestatījums ietekmē visus tālruņa lietotājus."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Vai atļaut datu viesabonēšanu?"</string>
     <string name="networks" msgid="6333316876545927039">"Operatora atlase"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Izvēlēties tīkla operatoru"</string>
@@ -294,9 +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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Ieslēdzot planšetdatoru, ikreiz tiek pieprasīts skaitlisks PIN kods vai parole šifra noņemšanai."</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Ieslēdzot tālruni, ikreiz tiek pieprasīts skaitlisks PIN kods vai parole šifra noņemšanai."</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrēts"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Varat šifrēt kontus, iestatījumus, lejupielādētās lietotnes un tajās esošos datus, multivides un cita veida failus. Ja šifrēsiet planšetdatoru, ikreiz pēc tā ieslēgšanas būs jāievada ciparu PIN vai parole, lai planšetdatoru atšifrētu. Planšetdatora šifrējumu var noņemt, tikai veicot datu atiestatīšanu uz rūpnīcas iestatījumiem. To darot, tiek dzēsti arī visi dati."\n\n"Šifrēšana ilgst stundu vai ilgāk. Akumulatoram ir jābūt pilnībā uzlādētam un planšetdatoram ir jābūt pievienotam elektrotīklam, līdz šifrēšana tiek pabeigta. Ja šifrēšanas process tiks pārtraukts, tiks zaudēti visi dati vai kāda to daļa."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Varat šifrēt kontus, iestatījumus, lejupielādētās lietotnes un tajās esošos datus, multivides un cita veida failus. Ja šifrēsiet tālruni, ikreiz pēc tā ieslēgšanas būs jāievada ciparu PIN vai parole, lai tālruni atšifrētu. Tālruņa šifrējumu var noņemt, tikai veicot datu atiestatīšanu uz rūpnīcas iestatījumiem. To darot, tiek dzēsti arī visi dati."\n\n"Šifrēšana ilgst stundu vai ilgāk. Akumulatoram ir jābūt pilnībā uzlādētam un tālrunim ir jābūt pievienotam elektrotīklam, līdz šifrēšana tiek pabeigta. Ja šifrēšanas process tiks pārtraukts, tiks zaudēti visi dati vai kāda to daļa."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Varat šifrēt kontus, iestatījumus, lejupielādētās lietotnes un tajās esošos datus, multivides un cita veida failus. Ja šifrēsiet planšetdatoru, ikreiz pēc tā ieslēgšanas būs jāievada ciparu PIN vai parole, lai planšetdatoru atšifrētu. Planšetdatora šifrējumu var noņemt, tikai veicot datu atiestatīšanu uz rūpnīcas iestatījumiem. To darot, tiek dzēsti arī visi dati.\n\nŠifrēšana ilgst stundu vai ilgāk. Akumulatoram ir jābūt pilnībā uzlādētam un planšetdatoram ir jābūt pievienotam elektrotīklam, līdz šifrēšana tiek pabeigta. Ja šifrēšanas process tiks pārtraukts, tiks zaudēti visi dati vai kāda to daļa."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Varat šifrēt kontus, iestatījumus, lejupielādētās lietotnes un tajās esošos datus, multivides un cita veida failus. Ja šifrēsiet tālruni, ikreiz pēc tā ieslēgšanas būs jāievada ciparu PIN vai parole, lai tālruni atšifrētu. Tālruņa šifrējumu var noņemt, tikai veicot datu atiestatīšanu uz rūpnīcas iestatījumiem. To darot, tiek dzēsti arī visi dati.\n\nŠifrēšana ilgst stundu vai ilgāk. Akumulatoram ir jābūt pilnībā uzlādētam un tālrunim ir jābūt pievienotam elektrotīklam, līdz šifrēšana tiek pabeigta. Ja šifrēšanas process tiks pārtraukts, tiks zaudēti visi dati vai kāda to daļa."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifrēt planšetdatoru"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifrēt tālruni"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Uzlādējiet akumulatoru un mēģiniet vēlreiz."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Mēģiniet vēlreiz pēc <xliff:g id="DELAY">^1</xliff:g> sekundēm."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Ierakstiet paroli"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifrēšana neizdevās."</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Planšetdatora dati vairs nav pieejami."\n\n"Lai atsāktu lietot planšetdatoru, ir jāveic rūpnīcas iestatījumu atiestatīšana. Kad pēc atiestatīšanas esat pabeidzis planšetdatora iestatīšanu, varat atjaunot visus datus, kas tika dublēti jūsu Google kontā."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Tālruņa dati vairs nav pieejami."\n\n"Lai atsāktu lietot tālruni, ir jāveic rūpnīcas iestatījumu atiestatīšana. Kad pēc atiestatīšanas esat pabeidzis tālruņa iestatīšanu, varat atjaunot visus datus, kas tika dublēti jūsu Google kontā."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Planšetdatora dati vairs nav pieejami.\n\nLai atsāktu lietot planšetdatoru, ir jāveic rūpnīcas iestatījumu atiestatīšana. Kad pēc atiestatīšanas esat pabeidzis planšetdatora iestatīšanu, varat atjaunot visus datus, kas tika dublēti jūsu Google kontā."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Tālruņa dati vairs nav pieejami.\n\nLai atsāktu lietot tālruni, ir jāveic rūpnīcas iestatījumu atiestatīšana. Kad pēc atiestatīšanas esat pabeidzis tālruņa iestatīšanu, varat atjaunot visus datus, kas tika dublēti jūsu Google kontā."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Pārslēgt ievades metodi"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekrāna bloķēš. izvēle"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Rezerves bloķ. izvēle"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Mainīt atbloķēšanas PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mainīt atbloķēšanas paroli"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Parolē jābūt vismaz %d rakstzīmēm"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN kodā jābūt vismaz %d rakstzīmēm"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN kodā ir jābūt vismaz %d cipariem."</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Kad ir pabeigts, pieskarieties Turpināt"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Turpināt"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Parole nedrīkst būt garāka par <xliff:g id="NUMBER">%d</xliff:g> rakstzīmēm."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kā mikrofons ar skaļruni"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Mūzikai un multividei"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Iegaumēt iestatījumus"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Pārī savienoti displeji"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Pieejamās ierīces"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Notiek savienojuma izveide."</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Pievienotas"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Pieejamas"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Tiek lietota"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Displeja iestatījumi"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Vai pārtraukt savienojumu?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Tiks pārtraukts savienojums ar:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Bezvadu attēlošanas opcijas"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Aizmirst"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Gatavs"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Nosaukums"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Ieslēgts"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Izslēgts"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Atspējots"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Atļaut datu apmaiņu, kad planšetdators saskaras ar citu ierīci"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Atļaut datu apmaiņu, kad tālrunis saskaras ar citu ierīci"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Izslēgta"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nav pieejams, jo NFC ir izslēgti."</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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\nVienkā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="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="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="8116564886303972764">"Ievadiet Wi-Fi maršrutētājā 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_in_progress" msgid="2944576520214787628">"WPS jau notiek, un tās pabeigšana var ilgt divas minūtes."</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Bezvadu maršrutētāja drošības iestatījums (TKIP) netiek atbalstīts."</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentificēšana neizdevās. Lūdzu, mēģiniet vēlreiz."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Tika noteikta cita WPS sesija. Lūdzu, pēc dažām minūtēm mēģiniet vēlreiz."</string>
     <string name="wifi_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>
@@ -564,6 +621,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\nVai 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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Saglabāt"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Neizdevās saglabāt tīklu."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Atcelt"</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_skip_anyway" msgid="6965361454438011190">"Tik un tā izlaist"</string>
+    <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\nIestatot 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\nIestatot tālruni, var ievērojami palielināties tīkla darbības apjoms."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Notiek meklēšana..."</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Pārdēvēt ierīci"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Vienādranga ierīces"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Iegaumētās grupas"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Nevarēja izveidot savienojumu."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Neizdevās pārdēvēt ierīci."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Vai pārtraukt savienojumu?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Atvienojot tiks pārtraukts savienojums ar ierīci <xliff:g id="PEER_NAME">%1$s</xliff:g> un vēl <xliff:g id="PEER_COUNT">%2$s</xliff:g> citām ierīcēm."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Pārnēsājams Wi-Fi tīklājs"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vai aizmirst šo grupu?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Pārnēsājams Wi-Fi tīklājs"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Mūzikas efekti"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Zvanītāja skaļums"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrē klusuma režīmā"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Noklusējuma paziņojums"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Noklusējuma paziņojuma skaņa"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsa paziņojuma indikators"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvana signāls"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Paziņojums"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Paziņojumiem izmantot ienākošā zvana skaļumu"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Paziņojuma zvana signāla izvēle"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Noklusējuma paziņojuma skaņa"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Multivide"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Mūzikas un videoklipu skaļuma iestatīšana"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Signāls"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pēc <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivitātes"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fona tapete"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Fona tapetes izvēle no"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Ekrānsaudzētājs"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Tiks aktivizēts miega režīma laikā, ja ierīce tiks pievienota strāvas avotam"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Atspējots"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Atlasītais ekrānsaudzētājs"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Aktivizēšanas laiks"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Pēc dīkstāves laika: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nekad"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Izmēģiniet!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Aktivizēt arī tad, kad ierīce tiek dokota"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Ekrānsaudzētājs"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kad tālrunis tiek dokots vai ir miega režīmā un notiek uzlāde"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Vienā no gadījumiem"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Uzlādes laikā"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Kamēr tiek dokots"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Izslēgts"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Lai kontrolētu, kas notiek laikā, kad tālrunis ir pievienots dokstacijai un/vai atrodas miega režīmā, ieslēdziet ekrānsaudzētāju."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Ekrānsaudzētāja režīmā"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Sākt tūlīt"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Iestatījumi"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automātisks spilgtums"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fonta lielums"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Fonta lielums"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN kods"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Nepareizs PIN kods"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN kodi ir atšķirīgi"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Nevar mainīt PIN kodu."\n"Iespējams, ka PIN kods nav pareizs."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Nevar mainīt PIN kodu.\nIespējams, ka PIN kods nav pareizs."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN ir veiksmīgi nomainīts"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Nevar mainīt SIM kartes bloķēšanas stāvokli."\n"Iespējams, ka ievadījāt nepareizu PIN kodu."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Nevar mainīt SIM kartes bloķēšanas stāvokli.\nIespējams, ka ievadījāt nepareizu PIN kodu."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Labi"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Atcelt"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Planšetdatora statuss"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Pamatjoslas versija"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel versija"</string>
     <string name="build_number" msgid="3075795840572241758">"Būvējuma numurs"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux statuss"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nav pieejams"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Statuss"</string>
     <string name="device_status" msgid="607405385799807324">"Statuss"</string>
@@ -733,12 +807,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">"Mobilo sakaru tīkla veids"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Mobilo sakaru operatora informācija"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Mobilo sakaru tīkla statuss"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Pakalpojuma statuss"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB krātuve"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD karte"</string>
     <string name="memory_available" msgid="5052397223077021181">"Pieejama"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Pieejams (tikai lasāms)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Kopējā vieta"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Notiek aprēķināšana..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Lietotnes (lietotņu dati un multivides saturs)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Attēli, videoklipi"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (mūzika, zvana signāli, aplādes utt.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Dažādi"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Kešatmiņā ievietotie dati"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Atvienot kopīgoto krātuvi"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Atvienot SD karti"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Atvienojiet iekš. USB krātuvi"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Dzēst SD karti"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Dzēst visus iekšējā USB krātuvē saglabātos datus, piem., mūziku vai fotoattēlus."</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Dzēš visus SD kartē saglabātos datus, piemēram, mūzikas failus un fotoattēlus."</string>
-    <string name="read_only" msgid="6702420168629076340">" (Tikai lasāms)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Vai notīrīt kešatmiņā ievietotos datus?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Tiks tīrīti kešatmiņā ievietotie lietotņu dati."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP vai PTP funkcija ir aktīva."</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Vai atvienot USB atmiņu?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Vai atvienot SD karti?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Ja atvienosiet USB atmiņu, tiks apturēta dažu izmantoto lietotņu darbība un tās, iespējams, nebūs pieejamas līdz brīdim, kad atkal pievienosiet USB atmiņu."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Ļauj pārsūtīt fotoattēlus, izmantojot kameras programmatūru, un pārsūtīt no datoriem jebkurus failus, kas neatbalsta MTP."</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalēt failu pārsūtīšanas rīkus"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Citi lietotāji"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Akumulatora statuss"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akumulatora uzlādes līmenis"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Rūpnīcas datu atiestatīšana"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Dzēš visus datus planšetdatorā"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Dzēst visus tālrunī saglabātos datus"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tādējādi tiks izdzēsti visi planšetdatora "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:"\n\n<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tiks dzēsti visi tālruņa "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:"\n\n<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Pašlaik esat pierakstījies šādos kontos:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tādējādi tiks izdzēsti visi planšetdatora "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tiks dzēsti visi tālruņa "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Pašlaik esat pierakstījies šādos kontos:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Mūzika"</li>\n<li>"Fotoattēli"</li>\n<li>"Citi lietotāja dati"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jāizdzēš "<b>"USB atmiņas"</b>" saturs."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jādzēš "<b>"SD kartes"</b>" saturs."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atsaistīta."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Palīdzība"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilo sakaru tīkli"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Pārvaldīt mob. ier. pakalp. tarifu"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Nezināms SIM operators"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Operatora %1$s nodrošināšanas vietne nav zināma."</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Lūdzu, ievietojiet SIM karti un restartējiet."</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Lūdzu, izveidojiet savienojumu ar internetu."</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>
@@ -917,6 +1004,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Skatīt juridisko informāciju, statusu, programmatūras versiju"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridiskā informācija"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Līdzdalībnieki"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Regulējoša informācija"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autortiesības"</string>
     <string name="license_title" msgid="1990487604356037871">"Licence"</string>
     <string name="terms_title" msgid="7697580845616764642">"Pakalpojumu sniegšanas noteikumi"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Mainīt atbloķēšanas PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Apstiprināt saglabāto kombināciju"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Mēģiniet vēlreiz:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Zīmēt atbloķēšanas kombināciju"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Uzzīmējiet grafisko atslēgu:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Lai saņemtu palīdzību, nospiediet Izvēlne."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Atbrīvojiet pirkstu, kad esat pabeidzis."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Pievienojiet vismaz <xliff:g id="NUMBER">%d</xliff:g> punktus. Mēģiniet vēlreiz:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kā zīmēt atbloķēšanas kombināciju"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Pārāk daudz nepareizu mēģinājumu!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Mēģiniet vēlreiz pēc <xliff:g id="NUMBER">%d</xliff:g> sekundēm."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Atcelt"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Tālāk"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Planšetdatora drošība"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Tālruņa nodrošināšana"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Aizsargājiet savu planšetdatoru pret neatļautu lietošanu, izveidojot personalizētu ekrāna grafisko atslēgu. Velkot ar pirkstu, jebkurā secībā savienojiet nākamajā ekrānā redzamos punktus. Ir jāsavieno vismaz četri punkti. "\n\n"Vai esat gatavs sākt? Pieskarieties vienumam Tālāk."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Aizsargājiet savu tālruni pret neatļautu lietošanu, izveidojot personalizētu ekrāna atbloķēšanas rakstu. Velkot ar pirkstu, jebkurā secībā savienojiet vismaz četrus no nākamajā ekrānā redzamajiem punktiem. "\n\n"Vai esat gatavs sākt? Pieskarieties vienumam Tālāk."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Lietojumprogramma jūsu tālrunī nav instalēta."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Pārvaldīt lietotnes"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Pārvaldiet un noņemiet instalētās lietotnes"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Lietotnes"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Atļaut instalēt lietotnes no nezināmiem avotiem"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Lietotnes no nezināmiem avotiem ir īpaši bīstamas jūsu planšetdatoram un personīgajiem datiem. Jūs piekrītat uzņemties vienpersonisku atbildību par jebkādiem planšetdatora bojājumiem vai datu zudumiem, ko var izraisīt šādu lietotņu izmantošana."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Lietotnes no nezināmiem avotiem ir īpaši bīstamas jūsu tālrunim un personīgajiem datiem. Jūs piekrītat uzņemties vienpersonisku atbildību par jebkādiem tālruņa bojājumiem vai datu zudumiem, ko var izraisīt šādu lietotņu izmantošana."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Pārbaudīt lietotnes"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Neļaut instalēt lietotnes, kuras var kaitēt, vai brīdināt par to instalēšanu"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Papildu iestatījumi"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Iespējot papildu iestatījumu opcijas"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informācija par lietotni"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB atmiņas dati"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD karte"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Atinstalēt"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Atinstalēt visiem lietotājiem"</string>
+    <string name="install_text" msgid="884360662922471113">"Instalēt"</string>
     <string name="disable_text" msgid="6544054052049395202">"Atspējot"</string>
     <string name="enable_text" msgid="9217362512327828987">"Iespējot"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Notīrīt datus"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Rādīt kešatmiņā iev. pr."</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Atiest. lietotnes prefer."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vai atiest. liet. pref.?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Tādējādi tiks atiestatītas visas preferences saistībā ar:"\n\n<li>"atspējotajām lietotnēm;"</li>\n<li>"atspējoto lietotņu paziņojumiem;"</li>\n<li>"noklusējuma lietojumprogrammām attiecībā uz darbību veikšanu;"</li>\n<li>"fona datu ierobežojumiem attiecībā uz lietotnēm."</li>\n\n"Jūs nezaudēsiet lietotņu datus."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Tādējādi tiks atiestatītas visas preferences saistībā ar:\n\n"<li>"atspējotajām lietotnēm;"</li>\n<li>"atspējoto lietotņu paziņojumiem;"</li>\n<li>"noklusējuma lietojumprogrammām attiecībā uz darbību veikšanu;"</li>\n<li>"fona datu ierobežojumiem attiecībā uz lietotnēm."</li>\n\n"Jūs nezaudēsiet lietotņu datus."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Atiestatīt lietotnes"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Vietas pārvaldība"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD kartē"</string>
     <string name="disabled" msgid="9206776641295849915">"Atspējots"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Nav instalēts"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nav lietotņu"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Iekšējā krātuve"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB krātuve"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> un <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Šī lietotne var iekasēt no jums naudu:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Nosūtīt īpašo īsziņu"</string>
     <string name="computing_size" msgid="1599186977475211186">"Notiek aprēķināšana..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Nevar aprēķināt pakotnes izmēru."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Nav instalēta neviena trešās puses lietotne."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Mainīt jaunu lietotņu vēlamo instalēšanas vietu"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Vai atspējot iebūvēto lietotni?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Ja atspējosiet iebūvētu lietotni, var rasties citu lietotņu darbības traucējumi."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Vai dzēst datus un atspējot lietotni?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Lietotājs: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Noņemts lietotājs"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process un <xliff:g id="NUMSERVICES">%2$d</xliff:g> pakalpojums"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process un <xliff:g id="NUMSERVICES">%2$d</xliff:g> pakalpojumi"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesi un <xliff:g id="NUMSERVICES">%2$d</xliff:g> pakalpojums"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Fiziskās tastatūras iestatījumi"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Divreiz nospiediet atstarpes taustiņu, lai ievietotu “.”"</string>
     <string name="show_password" msgid="3001113966880559611">"Padarīt paroles redzamas"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Izmantojot šo ievades metodi, var tikt vākta informācija par visu ierakstīto tekstu, tostarp personiskiem datiem, piemēram, parolēm un kredītkaršu numuriem. Šī metode ir saistīta ar lietotni <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Vai lietot šo ievades metodi?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Izmantojot šo pareizrakstības pārbaudītāju, var tikt vākta informācija par visu ierakstīto tekstu, tostarp personīgiem datiem, piemēram, parolēm un kredītkaršu numuriem. Šis pareizrakstības pārbaudītājs ir saistīts ar lietotni <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Vai izmantot šo pareizrakstības pārbaudītāju?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Iestatījumi"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Lai pārsl., nosp. Ctrl + atst. t."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Noklusējums"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tastatūras izkārtojumi"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Lietotāja vārdnīca"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personiskā vārdnīca"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personiskās vārdnīcas"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personiskā vārdnīca"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Pievienot"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Pievienot vārdnīcai"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Uzlādes laikā ekrāns nekad nepārslēgsies miega režīmā"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Iespējot Bluetooth HCI analizētāja žurnālu"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tvert visas Bluetooth HCI paketes failā"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Izpildlaika atlase"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Izpildlaika atlase"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Vai atsāknēt, lai mainītu izpildlaiku no <xliff:g id="OLD">%1$s</xliff:g> uz <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Atļaut neīstas vietas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Atļaut neīstas vietas"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Pārbaudīt, vai lietotņu, kuru instalēšanai izmantots ADB/ADT, darbība nav kaitīga."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Aizsargāt USB atmiņu"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Lietotnēm ir jāpieprasa atļauja lasīt USB atmiņu."</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vai aizsargāt USB atmiņu?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Ja USB atmiņa ir aizsargāta, lietotnēm ir jāpieprasa atļauja lasīt datus no ārējas atmiņas."\n\n"Dažas lietotnes, iespējams, nedarbosies, kamēr tās neatjauninās izstrādātāji."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Ja USB atmiņa ir aizsargāta, lietotnēm ir jāpieprasa atļauja lasīt datus no ārējas atmiņas.\n\nDažas lietotnes, iespējams, nedarbosies, kamēr tās neatjauninās izstrādātāji."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Aizsargāt SD karti"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Lietotnēm ir jāpieprasa atļauja lasīt SD karti."</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vai aizsargāt SD karti?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Ja SD karte ir aizsargāta, lietotnēm ir jāpieprasa atļauja lasīt datus no ārējas atmiņas."\n\n"Dažas lietotnes, iespējams, nedarbosies, kamēr tās neatjauninās izstrādātāji."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Ja SD karte ir aizsargāta, lietotnēm ir jāpieprasa atļauja lasīt datus no ārējas atmiņas.\n\nDažas lietotnes, iespējams, nedarbosies, kamēr tās neatjauninās izstrādātāji."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Vietējā beigu lietotne"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Iespējot beigu lietotni, kurā piedāvāta vietējā čaulas piekļuve"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Izvēlēties sīkrīku"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Izvēlēties logrīku"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vai izveidot logrīku un atļaut piekļuvi?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Pieejamības iestatījumi"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Pakalpojumi"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistēma"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Liels teksts"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Beigt zv., nosp. baroš. pogu"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Paroļu izrunāšana"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Aizkav., pieskar. un turot nosp."</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Tīmekļa pieejamības uzlabošana"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Palielināšanas žesti"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Ja šī funkcija ir ieslēgta, varat tuvināt un tālināt, trīs reizes pieskaroties ekrānam.\n\nJa veicāt tuvināšanu, varat veikt arī tālāk norādītās darbības.\n"<ul><li>"Panoramēt — velciet divus pirkstus vai vairāk pāri ekrānam."</li>\n<li>"Pielāgot tālummaiņas līmeni — savelciet kopā divus pirkstus vai vairāk vai izpletiet tos."</li></ul>\n\n"Varat arī uz brīdi palielināt zem pirksta redzamo vienumu, trīs reizes pieskaroties ekrānam un turot. Šādā palielinājumā varat pārvilkt pirkstu, lai izvērstu citas ekrāna daļas. Paceliet pirkstu, lai atgrieztu iepriekšējo ekrāna stāvokli.\n\nPiezīme. Palielināšana, trīs reizes pieskaroties ekrānam, darbojas visos ekrānos, izņemot tastatūru un navigācijas joslu."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Pieejamības saīsne"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Ieslēgts"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Izslēgta"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Ja šī funkcija ir ieslēgta, varat ātri iespējot pieejamības funkcijas, veicot divas darbības.\n\n1. darbība: nospiediet barošanas pogu un turiet to, līdz izdzirdat kādu skaņu vai sajūtat vibrāciju.\n\n2. darbība: pieskarieties ar diviem pirkstiem un uzgaidiet, līdz izdzirdat audio apstiprinājumu.\n\nJa ierīcei ir vairāki lietotāji, izmantojot šo saīsni bloķēšanas ekrānā, varat uz laiku iespējot pieejamību līdz ierīces atbloķēšanai."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Liels teksts"</string>
+    <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">"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_menu_item_settings" msgid="3344942964710773365">"Iestatījumi"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Ieslēgts"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Izslēgts"</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="accessibility_feature_state_on" msgid="2864292320042673806">"Ieslēgta"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Izslēgta"</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="print_settings" msgid="4742428530112487843">"Drukāšana"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Drukāšanas iestatījumi"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Pakalpojumi"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vai izmantot pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> var saņemt jūsu drukātos dokumentus. Šajos dokumentos var būt ietverti sensitīvi dati."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nav instalēts neviens pakalpojums"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Iestatījumi"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Pievienot printerus"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Ieslēgta"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Izslēgta"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Akumulators"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Kas patērējis akumulatoru"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Akumul. liet. dati nav pieej."</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Dati ir saņemti"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Nosūtīto mobilo datu apjoms"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Saņemto mobilo datu apjoms"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Nosūtīto Wi‑Fi datu apjoms"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Saņemto Wi‑Fi datu apjoms"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Videoklips"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Laiks ieslēgtā stāvoklī"</string>
@@ -1306,17 +1433,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Apturiet lietotnes darbību vai atinstalējiet lietotni"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Manuāli kontrolējiet GPS, lai šīs līdzeklis netiktu izmantots lietotnē"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Lietotnē var būt pieejami iestatījumi akumulatora enerģijas patēriņa samazināšanai"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Lietotāja patērētā akumulatora jauda"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> kopš atslēgšanas"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Pēdējās atslēgšanas laikā <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Kopējais patēriņš"</string>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonis"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Ietekmē ierunātā teksta toni"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Valoda"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nav atlasīta valoda."</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Runātajam tekstam iestata valodai raksturīgu balsi"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Noklausīties piemēru"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Atskaņot īsu runas sintēzes demonstrāciju"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Spilgtums <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automātisks"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"maksimālais"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"puse"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"izslēgts"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Akreditācijas datu krātuve"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalēšana no atmiņas"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Atkārtoti instalējot lietotni, atjaunot dublētos iestatījumus un datus"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Kļūdu ziņojuma sagatavošana"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Veicot šo darbību, tiks apkopota informācija par jūsu ierīces pašreizējo stāvokli un nosūtīta e-pasta ziņojuma veidā. Kļūdu ziņojuma pabeigšana, lai to varētu nosūtīt, var ilgt kādu laiku. Lūdzu, esiet pacietīgs."</string>
-    <string name="report" msgid="302437572240018342">"Sagatavot ziņojumu"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Datora dublējuma parole"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Darbvirsmas pilnie dublējumi pašlaik nav aizsargāti."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Pieskarieties, lai mainītu vai noņemtu paroli pilniem darbvirsmas dublējumiem."</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nLai 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>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Atjaun. visa loga virsmas, kad tās tiek atjaunin."</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Rādīt GPU skat. atjaun."</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Atjaunināt logu skat., ja zīm. tiek liet. GPU."</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Rādīt apar. slāņu atjaun."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Atjaunin. aparatūras slāņiem ir jāmirgo zaļā krāsā"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Atkļūdot graf. proc. kapac. pārsn."</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Rādīt CPU lietojumu"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Ekrāna pārklājums ar aktuālo CPU lietojumu"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Piespiedu GPU render."</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulēt sekundāros ekr."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Lietotnes"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Nesaglabāt darbības"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Iznīcināt katru darbību, kad lietotājs to pārtrauc"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Atsp. fona datus mob. tīklos. Tiks izm. citi tīkli, ja pieejami."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Lai ierob. fona d. šai liet., vispirms jāiest. mob. d. ierobež."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Vai ierobežot fona datus?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ja būs pieejami tikai mobilie tīkli, šī funkcija var pārtraukt tādas lietotnes darbību, kurā tiek izmantoti fona dati."\n\n"Lietotnē pieejamajos iestatījumos varat skatīt citas piemērotas datu lietojuma vadīklas."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ja būs pieejami tikai mobilie tīkli, šī funkcija var pārtraukt tādas lietotnes darbību, kurā tiek izmantoti fona dati.\n\nLietotnē pieejamajos iestatījumos varat skatīt citas piemērotas datu lietojuma vadīklas."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Fona datu ierobežošana ir iespējama tikai tad, ja ir iestatīts mobilo datu ierobežojums."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Vai ieslēgt datu automātisko sinhronizāciju?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Visas tīmekļa kontā veiktās izmaiņas tiks automātiski kopētas uz jūsu planšetdatoru."\n\n"Daži konti var arī automātiski kopēt visas planšetdatorā veiktās izmaiņas uz tīmekļa kontu. Google konts darbojas šādā veidā."\n\n"Lai izvēlētos sinhronizējamās informācijas veidu katrā kontā, skatiet: Iestatījumi &gt; Konti."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Visas jūsu tīmekļa kontos veiktās izmaiņas tiks automātiski kopētas uz jūsu tālruni."\n\n"Daži konti var arī automātiski kopēt visas tālrunī veiktās izmaiņas uz tīmekļa kontu. Google konts darbojas šādā veidā."\n\n"Lai izvēlētos sinhronizējamās informācijas veidu katrā kontā, skatiet: Iestatījumi &gt; Konti."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Visas tīmekļa kontā veiktās izmaiņas tiks automātiski kopētas uz jūsu planšetdatoru.\n\nDaži konti var arī automātiski kopēt visas planšetdatorā veiktās izmaiņas uz tīmekļa kontu. Google konts darbojas šādā veidā.\n\nLai izvēlētos sinhronizējamās informācijas veidu katrā kontā, skatiet: Iestatījumi &gt; Konti."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Visas jūsu tīmekļa kontos veiktās izmaiņas tiks automātiski kopētas uz jūsu tālruni.\n\nDaži konti var arī automātiski kopēt visas tālrunī veiktās izmaiņas uz tīmekļa kontu. Google konts darbojas šādā veidā.\n\nLai izvēlētos sinhronizējamās informācijas veidu katrā kontā, skatiet: Iestatījumi &gt; Konti."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Vai izslēgt datu automātisko sinhronizāciju?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Tiks saglabāti dati un akumulatora lietojums, bet jums vajadzēs manuāli sinhronizēt katru kontu, lai apkopotu jaunāko informāciju. Un jūs nesaņemsiet paziņojumus par atjauninājumiem."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Izmantošanas cikla atiestatīšanas datums"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Datu lietošanas brīdinājuma iestatīšana"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Datu lietošanas ierobežojuma iestatīšana"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Datu izmantošanas ierobežošana"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobilais datu savienojums tiks atspējots, tiklīdz būs sasniegts noteiktais ierobežojums.\n\nTā 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\nTā 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" 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Noņemtās lietotnes un lietotāji"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"Saņemts: <xliff:g id="RECEIVED">%1$s</xliff:g>; nosūtīts: <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>: izmantots apmēram <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>: 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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Pievienot VPN profilu"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Rediģēt profilu"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Dzēst profilu"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Vienmēr ieslēgts VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Izvēlieties VPN profilu, ar kuru izveidot pastāvīgu savienojumu. Tīkla datplūsma tiks atļauta, tikai esot izveidotam savienojumam ar šo VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Nav"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Vienmēr ieslēgtam VPN ir nepieciešama servera un DNS IP adrese."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Nav tīkla savienojuma. Lūdzu, vēlāk mēģiniet vēlreiz."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Nav norādīts sertifikāts. Lūdzu, rediģējiet profilu."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistēma"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Atcelt"</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">"Papildu sistēmas atjauninājumi"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Lietotāji un ierobežojumi"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Lietotāji"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Pievienot lietotāju"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Datu rediģēšana"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Lietotāja informācija"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Nosaukums"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Satura ierobežojumi"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Pieprasīt PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Satura vērtējums"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Sistēmas lietotnes"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Instalētās lietotnes"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Atmest"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Noņemt lietotāju"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Neciešams bērns"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Atspējots"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Atļaujošs"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Īstenots"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Lietotāji"</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="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\nKad tiek pievienots jauns lietotājs, viņam ir jāveic iestatīšanas process.\n\nIkviens 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\nIkviens 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_confirm_remove_message" msgid="5284111415714437285">"Vai tiešām vēlaties no ierīces noņemt lietotāju un visus ar viņu saistītos datus?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Fonta lieluma maiņa"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Ierobežojumi"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Ierobežojumu atcelšana"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Mainīt PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Rādīt paziņojumus"</string>
     <string name="help_label" msgid="1107174367904110532">"Palīdzība"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Konts saturam"</string>
+    <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="6160672982086584261">"Iestatīt lietotnes ierobežojumus"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Pārvalda lietotne <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ierobežotiem profiliem netiek atbalstīta šī lietotne."</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Šī lietotne var piekļūt jūsu kontiem."</string>
+    <string name="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 257c0b8..fd349bc 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,16 +218,127 @@
     <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="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"butang media"</item>
+    <item msgid="4547883971364273343">"tumpuan audio"</item>
+    <item msgid="2603878814882344450">"kelantangan induk"</item>
+    <item msgid="7136963238377062018">"kelantangan suara"</item>
+    <item msgid="4270236897655923007">"kelantangan deringan"</item>
+    <item msgid="6325739889222559394">"kelantangan media"</item>
+    <item msgid="5762123934816216821">"kelantangan penggera"</item>
+    <item msgid="785049718065337473">"kelantangan pemberitahuan"</item>
+    <item msgid="6700305533746877052">"kelantangan bluetooth"</item>
+    <item msgid="2029227495214047094">"kekal berjaga"</item>
+    <item msgid="26109888160231211">"pantau lokasi"</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>
+    <item msgid="5753789168376302997">"Butang media"</item>
+    <item msgid="3265262911688671938">"Tumpuan audio"</item>
+    <item msgid="2098976479485046797">"Kelantangan utama"</item>
+    <item msgid="5660213838861789350">"Kelantangan suara"</item>
+    <item msgid="7983336752371254444">"Kelantangan deringan"</item>
+    <item msgid="7878027809189330917">"Kelantangan media"</item>
+    <item msgid="7260546305036218513">"Kelantangan penggera"</item>
+    <item msgid="9103719301075748925">"Kelantangan pemberitahuan"</item>
+    <item msgid="7025966722295861512">"Kelantangan Bluetooth"</item>
+    <item msgid="4665183401128289653">"Kekal berjaga"</item>
+    <item msgid="8584357129746649222">"Lokasi"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Pendek"</item>
     <item msgid="2560532955514699713">"Sederhana"</item>
     <item msgid="2372711992605524591">"Panjang"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (nyahpepijat)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Gunakan Dalvik"</item>
+    <item msgid="5131846588686178907">"Gunakan ART"</item>
+    <item msgid="4530003713865319928">"Gunakan binaan nyahpepijat ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Jangan sekali-kali semak"</item>
     <item msgid="6042769699089883931">"Semak kandungan DRM sahaja"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Skala animasi 5x"</item>
     <item msgid="1069584980746680398">"Skala animasi 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Tiada"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi dan 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Tiada"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Mati"</item>
+    <item msgid="7688197031296835369">"Tunjukkan kawasan lebih lukis"</item>
+    <item msgid="8332661909019981149">"Tunjukkan kaunter lebih lukis"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Had standard"</item>
     <item msgid="4071574792028999443">"Tiada proses latar belakang"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Tamat masa"</item>
     <item msgid="7664124146786465092">"Tidak berjaya"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Tanya"</item>
+    <item msgid="5077768429488260031">"Jangan benarkan"</item>
+    <item msgid="1417929597727989746">"Sentiasa benarkan"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 5f40e43..adbfc58 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Ya"</string>
     <string name="no" msgid="6731231425810196216">"Tidak"</string>
     <string name="create" msgid="3578857613172647409">"Buat"</string>
+    <string name="allow" msgid="3349662621170855910">"Benarkan"</string>
+    <string name="deny" msgid="6947806159746484865">"Nafikan"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Tidak diketahui"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Anda kini <xliff:g id="STEP_COUNT">%1$d</xliff:g> langkah daripada menjadi pemaju."</item>
+    <item quantity="other" msgid="6722953419953594148">"Anda kini <xliff:g id="STEP_COUNT">%1$d</xliff:g> langkah daripada menjadi pemaju."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Anda kini pemaju!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Tidak perlu, anda sudah pun menjadi pemaju."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"WAYARLES &amp; RANGKAIAN"</string>
     <string name="header_category_device" msgid="5781174212691167553">"PERANTI"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PERIBADI"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Mengecas"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Menyahcas"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(wayarles)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Tidak mengecas"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Tidak mengecas"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Penuh"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Palam dicabut"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"(AC)"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"wayarles"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Tidak diketahui"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Tidak diketahui"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Ralat tidak diketahui"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Sejuk"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Boleh ditemui"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Kelihatan kpd semua peranti Bluetooth berdekatan (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Kelihatan kpd semua peranti Bluetooth berdekatan"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Tidak kelihatan kepada peranti Bluetooth lain"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Hanya kelihatan kepada peranti yg menjadi pasangan"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Jadikan peranti boleh ditemui"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tamat masa kebolehlihatan"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Menetapkan berapa lama peranti akan boleh ditemui"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Kunci dailan suara"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Halang penggunaan pendail bluetooth apabila skrin dikunci"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Peranti Bluetooth"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Tunjukkan fail yang diterima"</string>
     <string name="device_picker" msgid="8398232791303186677">"Pemilih peranti Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Permintaan kebenaran Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Aplikasi mahu menghidupkan Bluetooth. Benarkan?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Satu aplikasi pada tablet anda ingin menjadikan tablet anda ditemui oleh peranti Bluetooth yang lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat. Benarkan?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Satu aplikasi dengan telefon anda ingin menjadikan telefon anda boleh ditemui oleh peranti Bluetooth yang lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat. Benarkan?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Satu aplikasi pada tablet anda ingin menjadikan tablet anda \"sentiasa boleh ditemui\" oleh peranti Bluetooth yang lain. Benarkan?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Satu aplikasi dengan telefon anda ingin menjadikan telefon anda \"sentiasa boleh ditemui\" oleh peranti Bluetooth yang lain. Benarkan?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Satu aplikasi pada tablet anda ingin menghidupkan Bluetooth dan menjadikan tablet anda boleh ditemui oleh peranti lain selama <xliff:g id="TIMEOUT">%1$d</xliff:g> saat. Benarkan?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Satu aplikasi pada telefon anda ingin menghidupkan Bluetooth dan menjadikan telefon anda boleh ditemui oleh peranti lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat. Benarkan?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Satu aplikasi pada tablet anda ingin menjadikan tablet anda boleh ditemui oleh peranti Bluetooth yang lain. Benarkan?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Satu aplikasi pada telefon anda ingin menghidupkan Bluetooth dan menjadikan telefon anda boleh ditemui oleh peranti lain. Benarkan?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Satu apl ingin menghidupkan Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Satu apl ingin menjadikan tablet anda kelihatan kepada peranti Bluetooth lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Satu apl ingin menjadikan telefon anda kelihatan kepada peranti Bluetooth lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Satu apl mahu menjadikan tablet anda kelihatan kepada peranti Bluetooth lain. Anda boleh menukar tetapan ini dalam tetapan Bluetooth kemudian."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Satu apl mahu menjadikan telefon anda kelihatan kepada peranti Bluetooth lain. Anda boleh menukar tetapan ini dalam tetapan Bluetooth kemudian."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Satu apl ingin menghidupkan Bluetooth dan menjadikan tablet anda kelihatan kepada peranti lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Satu apl ingin menghidupkan Bluetooth dan menjadikan telefon anda kelihatan kepada peranti lain untuk <xliff:g id="TIMEOUT">%1$d</xliff:g> saat."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Satu apl mahu menghidupkan Bluetooth dan menjadikan tablet anda kelihatan kepada peranti lain. Anda boleh menukar tetapan ini dalam tetapan Bluetooth kemudian."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Satu apl mahu menghidupkan Bluetooth dan menjadikan telefon anda kelihatan kepada peranti lain. Anda boleh menukar tetapan ini dalam tetapan Bluetooth kemudian."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Menghidupkan Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Mematikan Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Autosambung"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proksi HTTP digunakan oleh penyemak imbas tetapi tidak boleh digunakan oleh aplikasi lain."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasi:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID berdekatan:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Info Sel:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Percubaan data:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Perkhidmatan GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Perayauan:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Anda telah kehilangan kesambungan data kerana anda meninggalkan rangkaian rumah anda dengan data perayauan dimatikan."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Hidupkannya"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Apabila anda membenarkan perayauan data,  anda boleh dikenakan caj perayauan yang tinggi!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Apabila anda membenarkan perayauan data, anda mungkin dikenakan caj perayauan yang tinggi!\n\nTetapan ini melibatkan semua pengguna pada tablet ini."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Apabila anda membenarkan perayauan data, anda mungkin dikenakan caj perayauan yang tinggi!\n\nTetapan ini melibatkan semua pengguna pada telefon ini."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Benarkan perayauan data?"</string>
     <string name="networks" msgid="6333316876545927039">"Pilihan pengendali"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Pilih pengendali rangkaian"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Maklumat pemilik"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Memerlukan PIN atau kata laluan angka untuk menyahsulit tablet anda setiap kali anda menghidupkannya"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Memerlukan PIN atau kata laluan angka untuk menyahsulit telefon anda setiap kali dan menghidupkannya"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Disulitkan"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Anda boleh menyulitkan akaun anda, tetapan, apl yang dimuat turun dan datanya, media, dan fail-fail lain. Sebaik sahaja anda menyulitkan tablet anda, anda perlu menaip PIN nombor atau kata laluan untuk menyahsulit setiap kali anda menghidupkannya. Anda tidak boleh menyahsulit tablet anda kecuali dengan melakukan penetapan semula data kilang, yang memadamkan semua data anda."\n\n"Penyulitan mengambil masa satu jam atau lebih. Anda mesti bermula dengan bateri yang telah dicas dan memastikan tablet anda dipasang pada palam sehingga penyulitan selesai. Jika anda mengganggu proses penyulitan, anda akan kehilangan sebahagian atau semua data anda."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Anda boleh menyulitkan akaun anda, tetapan, apl yang dimuat turun dan datanya, media, dan fail-fail lain. Sebaik sahaja anda menyulitkan telefon anda, anda perlu menaip PIN nombor atau kata laluan untuk menyahsulit setiap kali anda menghidupkannya. Anda tidak boleh menyahsulit telefon anda kecuali dengan melakukan tetapan semula data kilang, yang memadamkan semua data anda."\n\n"Penyulitan mengambil satu jam atau lebih. Anda mesti bermula dengan bateri yang telah dicas dan memastikan fon anda dipasang pada palam sehingga penyulitan selesai. Jika anda mengganggu proses penyulitan, anda akan kehilangan sebahagian atau semua data anda."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Anda boleh menyulitkan akaun anda, tetapan, apl yang dimuat turun dan datanya, media, dan fail-fail lain. Sebaik sahaja anda menyulitkan tablet anda, anda perlu menaip PIN nombor atau kata laluan untuk menyahsulit setiap kali anda menghidupkannya. Anda tidak boleh menyahsulit tablet anda kecuali dengan melakukan penetapan semula data kilang, yang memadamkan semua data anda.\n\nPenyulitan mengambil masa satu jam atau lebih. Anda mesti bermula dengan bateri yang telah dicas dan memastikan tablet anda dipasang pada palam sehingga penyulitan selesai. Jika anda mengganggu proses penyulitan, anda akan kehilangan sebahagian atau semua data anda."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Anda boleh menyulitkan akaun anda, tetapan, apl yang dimuat turun dan datanya, media, dan fail-fail lain. Sebaik sahaja anda menyulitkan telefon anda, anda perlu menaip PIN nombor atau kata laluan untuk menyahsulit setiap kali anda menghidupkannya. Anda tidak boleh menyahsulit telefon anda kecuali dengan melakukan tetapan semula data kilang, yang memadamkan semua data anda.\n\nPenyulitan mengambil satu jam atau lebih. Anda mesti bermula dengan bateri yang telah dicas dan memastikan fon anda dipasang pada palam sehingga penyulitan selesai. Jika anda mengganggu proses penyulitan, anda akan kehilangan sebahagian atau semua data anda."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Sulitkan tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Sulitkan telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Cas bateri anda dan cuba lagi."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Cuba lagi dalam <xliff:g id="DELAY">^1</xliff:g> saat."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Taipkan kata laluan anda"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Penyulitan tidak berjaya"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Penyulitan telah diganggu dan tidak dapat dilengkapkan. Akibatnya, data pada tablet anda tidak lagi boleh diakses. "\n\n" Untuk menyambung semula menggunakan tablet anda, anda perlu melakukan tetapan semula kilang. Apabila anda menyediakan tablet anda selepas menetap semula, anda akan berpeluang untuk memulihkan apa-apa data yang dibuat sandaran ke Akaun Google anda."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Penyulitan telah diganggu dan tidak dapat dilengkapkan. Akibatnya, data pada telefon anda tidak lagi boleh diakses. "\n\n"Untuk menyambung semula menggunakan telefon anda, anda perlu melakukan tetapan semula kilang. Apabila anda menetapkan telefon anda selepas menetap semula, anda akan mempunyai peluang untuk memulihkan apa-apa data yang dibuat sandaran ke Akaun Google anda."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Penyulitan telah diganggu dan tidak dapat dilengkapkan. Akibatnya, data pada tablet anda tidak lagi boleh diakses. \n\n Untuk menyambung semula menggunakan tablet anda, anda perlu melakukan tetapan semula kilang. Apabila anda menyediakan tablet anda selepas menetap semula, anda akan berpeluang untuk memulihkan apa-apa data yang dibuat sandaran ke Akaun Google anda."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Penyulitan telah diganggu dan tidak dapat dilengkapkan. Akibatnya, data pada telefon anda tidak lagi boleh diakses. \n\nUntuk menyambung semula menggunakan telefon anda, anda perlu melakukan tetapan semula kilang. Apabila anda menetapkan telefon anda selepas menetap semula, anda akan mempunyai peluang untuk memulihkan apa-apa data yang dibuat sandaran ke Akaun Google anda."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Tukar kaedah input"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pilih kunci skrin"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pilih kunci sandaran"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Tukar PIN buka kunci"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Tkr kta lluan bka knci"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Kata laluan mesti sekurang-kurangnya %d aksara"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN mestilah sekurang-kurangnya %d aksara"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN mesti sekurang-kurangnya %d digit"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Sentuh Teruskan apabila selesai"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Teruskan"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Kata laluan mesti kurang daripada <xliff:g id="NUMBER">%d</xliff:g> aksara."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sebagai telefon pembesar suara"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Untuk muzik dan media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ingat tetapan"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Paparan berpasangan"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Peranti tersedia"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Menyambung"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Bersambung"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Tersedia"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Sedang digunakan"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Tetapan paparan"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Putuskan sambungan WiFi?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Ini akan menamatkan sambungan anda dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Pilihan paparan wayarles"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Lupakan"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Selesai"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Nama"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Hidup"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Matikan"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Dilumpuhkan"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Benarkan pertukaran data apabila tablet menyentuh peranti lain"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Benarkan pertukaran data apabila telefon menyentuh peranti lain"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Mati"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Tidak tersedia kerana NFC dimatikan"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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\nHanya 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="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="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="8116564886303972764">"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_in_progress" msgid="2944576520214787628">"WPS sudah pun dijalankan dan boleh mengambil masa sehingga dua minit untuk selesai"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Tetapan keselamatan penghala wayarles (TKIP) tidak disokong"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Pengesahan gagal. Sila cuba lagi."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Sesi WPS lain dikesan. Sila cuba lagi dalam beberapa minit."</string>
     <string name="wifi_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>
@@ -564,6 +621,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\nBenarkan 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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Simpan"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Gagal menyimpan rangkaian"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Batal"</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_skip_anyway" msgid="6965361454438011190">"Langkau juga"</string>
+    <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\nPersediaan 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\nPersediaan telefon berpotensi menggunakan aktiviti rangkaian yang banyak."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Mencari..."</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Namakan semula peranti"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Peranti setara"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Kumpulan diingati"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Tidak boleh menyambung."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Gagal menamakan semula peranti."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Putuskan sambungan?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Jika anda menyahsambung, sambungan anda dengan <xliff:g id="PEER_NAME">%1$s</xliff:g> dan <xliff:g id="PEER_COUNT">%2$s</xliff:g> peranti lain akan berakhir."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Titik panas Wi-Fi mudah alih"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Lupakan kumpulan ini?"</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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Kesan muzik"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Kelantangan pendering"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Getar apabila senyap"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Pemberitahuan lalai"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Bunyi pemberitahuan lalai"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Lampu pemberitahuan denyutan"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Nada dering"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Pemberitahuan"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Gunakan kelantangan panggilan masuk untuk pemberitahuan"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Pilih nada dering pemberitahuan"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Bunyi pemberitahuan lalai"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Media"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Tetapkan kelantangan untuk muzik dan video"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Penggera"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tanpa aktiviti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Kertas dinding"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pilih kertas dinding dari"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Gul-gula Skrin"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Akan bermula daripada tidur jika disambungkan kepada kuasa"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Dilumpuhkan"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Gula-gula yang dipilih"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Bila hendak diaktifkan"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> terbiar melahu"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Tidak sekali-kali"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Cubalah!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Juga bermula apabila didok"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Lamunan"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Apabila didok atau tidur dan dicas"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Salah satu"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Semasa mengecas"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Semasa didok"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Dimatikan"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Untuk mengawal apa yang berlaku semasa telefon didok dan/atau tidur, hidupkan Daydream."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Bila untuk melamun"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Mulakan sekarang"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Tetapan"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan automatik"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Saiz fon"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Saiz fon"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN salah"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN tidak sepadan"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Tidak boleh menukar PIN."\n"Berkemungkinan PIN salah."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Tidak boleh menukar PIN.\nBerkemungkinan PIN salah."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN SIM berjaya ditukar"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Tidak boleh menukar keadaan kunci kad SIM."\n"Mungkin PIN salah."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Tidak boleh menukar keadaan kunci kad SIM.\nMungkin PIN salah."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Batal"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status tablet"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versi jalur dasar"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versi inti"</string>
     <string name="build_number" msgid="3075795840572241758">"Nombor binaan"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Status SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Tidak tersedia"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -733,12 +807,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">"Jenis rangkaian mudah alih"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Maklumat pembawa"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Keadaan rangkaian mudah alih"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Keadaan perkhidmatan"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Storan USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Kad SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"Tersedia"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Tersedia (baca-sahaja)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Jumlah ruang"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Mengira..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Apl (data apl &amp; kandungan media)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Gambar, video"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (muzik, nada dering, podcast, dll.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Pelbagai"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Data cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Nyahlekap storan kongsi"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Nyahlekap kad SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Nyahlekap storan USB dalaman"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Padam kad SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Memadamkan semua data pada storan USB dalaman, seperti muzik dan foto"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Memadamkan semua data pada kad SD, seperti muzik dan foto"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Baca sahaja)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Padam bersih data cache?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Ini akan memadam bersih data cache bagi semua apl."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Fungsi MTP atau PTP adalah aktif"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Nyahlekap storan USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Nyahlekap kad SD?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Jika anda menyahlekap storan USB, sesetengah aplikasi yang anda sedang gunakan akan berhenti dan menjadi tidak tersedia sehingga anda melekapkan semula storan USB."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Membolehkan anda memindahkan foto menggunakan perisian kamera dan memindahkan sebarang fail pada komputer yang tidak menyokong MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Pasang alat pemindahan fail"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Pengguna lain"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Status bateri"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Aras bateri"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Tetapan semula data kilang"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Memadamkan semua data pada tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Memadamkan semua data pada telefon"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ini akan memadamkan semua data dari "<b>"storan dalaman"</b>" tablet anda, termasuk:"\n\n<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Ini akan memadamkan semua data dari "<b>"storan dalaman"</b>" telefon anda, termasuk:"\n\n<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Anda melog masuk ke dalam akaun berikut buat masa ini:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ini akan memadamkan semua data dari "<b>"storan dalaman"</b>" tablet anda, termasuk:\n\n"<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Ini akan memadamkan semua data dari "<b>"storan dalaman"</b>" telefon anda, termasuk:\n\n"<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Anda melog masuk ke dalam akaun berikut buat masa ini:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna yang lain"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Untuk memadam bersih muzik, gambar dan data pengguna lain, "<b>"storan USB"</b>" perlu dipadamkan."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Untuk turut memadam bersih muzik, gambar dan data pengguna lain, "<b>"kad SD"</b>" perlu dipadamkan."</string>
@@ -875,7 +957,7 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Titik panas mudah alih"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Penambatan Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Penambatan"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Liputan t\'batan &amp; m\'alih"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Liputan tambatan &amp; mudah alih"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Penambatan USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB disambungkan, semak untuk menambat"</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dinyahtambat."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Bantuan"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Rangkaian mudah alih"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Urus pelan mudah alih"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Pengendali SIM tidak dikenali"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s tdk mempunyai tapak web peruntukan dikenali"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sila masukkan kad SIM dan mulakan semula"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Sila sambung ke internet"</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>
@@ -917,6 +1004,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Lihat maklumat undang-undang, status, versi perisian"</string>
     <string name="legal_information" msgid="5769301644270604095">"Maklumat undang-undang"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Penyumbang"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Maklumat kawal selia"</string>
     <string name="copyright_title" msgid="865906688917260647">"Hak cipta"</string>
     <string name="license_title" msgid="1990487604356037871">"Lesen"</string>
     <string name="terms_title" msgid="7697580845616764642">"Terma dan Syarat"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Tukar PIN buka kunci"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Sahkan corak yang disimpan"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Cuba lagi:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Lukis corak buka kunci"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Lukis corak buka kunci:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tekan Menu untuk mendapatkan bantuan."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Alihkan jari apabila selesai."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Sambung sekurang-kurangnya <xliff:g id="NUMBER">%d</xliff:g> titik. Cuba lagi:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cara melukis corak buka kunci"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Terlalu banyak percubaan yang salah!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Cuba lagi dalam <xliff:g id="NUMBER">%d</xliff:g> saat."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Batal"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Seterusnya"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Melindungi tablet anda"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Melindungi telefon anda"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Lindungi tablet anda daripada penggunaan tanpa kebenaran dengan membuat corak buka kunci skrin peribadi. Luncurkan jari anda untuk menyambungkan titik dalam sebarang tertib pada skrin berikutnya. Anda mesti menyambungkan sekurang-kurangnya empat titik."\n\n"Sedia untuk bermula? Sentuh Seterusnya."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Lindungi telefon anda daripada penggunaan tanpa kebenaran dengan membuat corak buka kunci skrin peribadi. Luncurkan jari anda untuk menyambungkan sekurang-kurangnya empat titik dalam sebarang tertib pada skrin seterusnya. "\n\n"Sedia untuk bermula? Sentuh Seterusnya."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Aplikasi tidak dipasang pada telefon anda."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Urus aplikasi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Urus dan alih keluar aplikasi yang dipasang"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplikasi"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Benarkan pemasangan apl dari sumber tidak diketahui"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tablet dan data peribadi anda lebih terdedah kepada serangan oleh aplikasi dari sumber yang tidak diketahui. Anda bersetuju bahawa anda bertanggungjawab sepenuhnya bagi apa-apa kerosakan kepada tablet atau kehilangan data yang mungkin berlaku akibat penggunaan aplikasi ini."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefon dan data peribadi anda lebih terdedah kepada serangan oleh aplikasi dari sumber yang tidak diketahui. Anda bersetuju bahawa anda bertanggungjawab sepenuhnya untuk apa-apa kerosakan kepada telefon anda atau kehilangan data yang mungkin berlaku akibat menggunakan aplikasi ini."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Sahkan apl"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Larang atau beri amaran sebelum pemasangan apl yang mungkin membahayakan"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Tetapan terperinci"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Dayakan lebih banyak pilihan tetapan"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Maklumat aplikasi"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Data storan USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Kad SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Nyahpasang"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Nyahpasang untuk semua pengguna"</string>
+    <string name="install_text" msgid="884360662922471113">"Pasang"</string>
     <string name="disable_text" msgid="6544054052049395202">"Lumpuhkan"</string>
     <string name="enable_text" msgid="9217362512327828987">"Dayakan"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Padam bersih data"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Tunjuk proses yg dicache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Tetapkan semula pilihan apl"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Tetapkan semula pilihan app?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ini akan menetapkan semula semua pilihan untuk:"\n\n" "<li>"Apl dilumpuhkan"</li>\n" "<li>"Pemberitahuan apl dilumpuhkan"</li>\n" "<li>"Aplikasi lalai untuk tindakan"</li>\n" "<li>"Sekatan data latar belakang untuk apl"</li>\n\n" Anda tidak akan kehilangan sebarang data apl."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ini akan menetapkan semula semua pilihan untuk:\n\n "<li>"Apl dilumpuhkan"</li>\n" "<li>"Pemberitahuan apl dilumpuhkan"</li>\n" "<li>"Aplikasi lalai untuk tindakan"</li>\n" "<li>"Sekatan data latar belakang untuk apl"</li>\n\n" Anda tidak akan kehilangan sebarang data apl."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Tetapkan semula apl"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Urus ruang"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Pada kad SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Dilumpuhkan"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Tidak dipasangkan"</string>
     <string name="no_applications" msgid="7336588977497084921">"Tiada aplikasi."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Storan dalaman"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Storan USB"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> d <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Aplikasi ini boleh mengenakan bayaran kepada anda:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Hantar SMS premium"</string>
     <string name="computing_size" msgid="1599186977475211186">"Mengira..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Tidak dapat mengira saiz pakej."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Anda tidak mempunyai sebarang aplikasi pihak ketiga dipasangkan."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Tukar lokasi pemasangan pilihan untuk aplikasi baru"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Lumpuhkan aplikasi terbina dalam?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Jika anda melumpuhkan aplikasi terbina-dalam, aplikasi lain mungkin berfungsi secara salah."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Padam data dan lumpuhkan apl?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Pengguna: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Pengguna dialih keluar"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses dan <xliff:g id="NUMSERVICES">%2$d</xliff:g> perkhidmatan"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses dan <xliff:g id="NUMSERVICES">%2$d</xliff:g> perkhidmatan"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proses dan <xliff:g id="NUMSERVICES">%2$d</xliff:g> perkhidmatan"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Tetapan papan kekunci fizikal"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Tekan kekunci Space dua kali untuk memasukkan \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Perlihatkan kata laluan"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Kaedah input ini mungkin boleh mengumpulkan semua teks yang anda taipkan, termasuk data peribadi seperti kata laluan dan nombor kad kredit. Ia datang daripada aplikasi <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Gunakan kaedah input ini?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Penyemak ejaan ini mungkin mampu mengumpul semua teks yang anda taip, termasuk data peribadi seperti kata laluan dan nombor kad kredit. Ia datang dari aplikasi <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Gunakan penyemak ejaan ini?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Tetapan"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Untuk bertukar, tekan Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Lalai"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Susun atur papan kekunci"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kamus pengguna"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Kamus peribadi"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Kamus peribadi"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Kamus peribadi"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Tambah"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Tambah ke kamus"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skrin tidak sekali-kali akan tidur semasa pengecasan"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Dayakan log intip HCI Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tangkap semua paket HCI bluetooth dalam fail"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Pilih waktu jalan"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Pilih waktu jalan"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"But semula untuk menukar waktu jalan daripada <xliff:g id="OLD">%1$s</xliff:g> kepada <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Benarkan lokasi olokan"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Benarkan lokasi olokan"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Semak apl yang dipasang melalui ADB/ADT untuk tingkah laku yang berbahaya."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Lindungi storan USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apl mesti meminta kebenaran untuk membaca storan USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Lindungi storan USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Apabila storan USB dilindungi, apl mesti meminta kebenaran untuk membaca data dari storan luaran."\n\n"Sesetengah apl mungkin tidak berfungsi sehingga dikemas kini oleh pemaju apl itu."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Apabila storan USB dilindungi, apl mesti meminta kebenaran untuk membaca data dari storan luaran.\n\nSesetengah apl mungkin tidak berfungsi sehingga dikemas kini oleh pemaju apl itu."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Lindungi kad SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apl mesti meminta kebenaran untuk membaca kad SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Lindungi kad SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Apabila kad SD dilindungi, apl mesti meminta kebenaran untuk membaca data dari storan luaran."\n\n"Sesetengah apl mungkin tidak berfungsi sehingga dikemas kini oleh pemaju apl itu."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Apabila kad SD dilindungi, apl mesti meminta kebenaran untuk membaca data dari storan luaran.\n\nSesetengah apl mungkin tidak berfungsi sehingga dikemas kini oleh pemaju apl itu."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal setempat"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Dayakan apl terminal yang menawarkan akses shell tempatan"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Pilih alat"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Pilih widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Buat widget dan benarkan akses?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Tetapan kebolehaksesan"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Perkhidmatan"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Teks besar"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Butang kuasa menamatkan panggilan"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Tuturkan kata laluan"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Lengah sentuh &amp; tahan"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Tingkatkan kebolehcapaian web"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gerak isyarat pembesaran"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Apabila ciri ini dihidupkan, anda boleh mengezum masuk dan keluar dengan mengetik skrin tiga kali.\n\nSemasa dizum masuk, anda boleh:\n"<ul><li>"Menyorot: Seret menggunakan dua atau lebih jari merentasi skrin."</li>\n<li>"Melaraskan tahap zum: Rapatkan atau jarakkan dua atau lebih jari."</li></ul>\n\n"Anda juga boleh membesarkan item di bawah jari anda untuk sementara waktu dengan mengetik tiga kali dan menahannya. Dalam keadaan zum besar ini, anda boleh menyeret jari anda untuk meneroka bahagian-bahagian lain pada skrin. Angkat jari anda untuk kembali kepada keadaan sebelumnya.\n\nNota: Ketik tiga kali untuk pembesaran berfungsi di semua tempat kecuali pada papan kekunci dan bar navigasi."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Pintasan kebolehcapaian"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Hidupkan"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Matikan"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Apabila ciri ini dihidupkan, anda boleh mendayakan ciri kebolehaksesan dengan cepat dalam dua langkah:\n\nLangkah 1: Tekan dan tahan butang kuasa sehingga anda mendengar bunyi atau merasai getaran.\n\nLangkah 2: Sentuh terus menggunakan dua jari sehingga anda mendengar pengesahan audio.\n\nJika peranti digunakan oleh beberapa orang pengguna, menggunakan pintasan ini pada skrin kunci akan mendayakan kebolehaksesan untuk sementara waktu sehingga peranti dibuka kuncinya."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Teks besar"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Pembesaran skrin"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto kemas kini pembesaran skrin"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Kemas kini pembesaran skrin pada peralihan apl"</string>
+    <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_menu_item_settings" msgid="3344942964710773365">"Tetapan"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Hidup"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"Hidup"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Mati"</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="print_settings" msgid="4742428530112487843">"Pencetakan"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Tetapan pencetakan"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Perkhidmatan"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> boleh menerima dokumen yang anda cetak. Dokumen seperti itu mungkin mengandungi data sensitif."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Tiada perkhidmatan dipasangkan"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Tetapan"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Tambah pencetak"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Hidup"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Mati"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Apa yang telah menggunakan bateri"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Data penggunaan bateri tidak tersedia.."</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Data yang diterima"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Data mudah alih yang dihantar"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Data mudah alih yang diterima"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Data Wi-Fi yang dihantar"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Data Wi-Fi yang diterima"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Masa hidup"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Hentikan atau nyahpasang aplikasi"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Kawal GPS secara manual untuk mengelakkan aplikasi daripada menggunakannya"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplikasi ini mungkin menawarkan tetapan untuk mengurangkan penggunaan bateri"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Bateri digunakan oleh pengguna"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sejak palam dicabut"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Semasa kali terakhir palam dicabut untuk <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Jumlah penggunaan"</string>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pic"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Mempengaruhi nada teks pertuturan"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Bahasa"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Bahasa tidak dipilih"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Menetapkan suara khusus bahasa untuk teks pertuturan"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Dengar contoh"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Mainkan tunjuk cara singkat sintesis pertuturan"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Kecerahan <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"auto"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"penuh"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"separuh"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"mati"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Storan bukti kelayakan"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Pasang daripada storan"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Apabila memasang semula aplikasi, pulihkan tetapan dan data yang disandarkan"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Ambil laporan pepijat"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Ini akan mengumpul maklumat tentang keadaan peranti semasa anda untuk dihantarkan sebagai mesej e-mel. Ini akan mengambil sedikit masa bermula dari laporan pepijat sehingga siap untuk dihantar; jadi diharap bersabar."</string>
-    <string name="report" msgid="302437572240018342">"Laporkan"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Kata laluan sandaran komputer meja"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Sandaran penuh meja komputer tidak dilindungi pada masa ini"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Sentuh untuk menukar atau mengalih keluar kata laluan untuk sandaran penuh komputer meja"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nSentuh "<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>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Denyar permukaan tetingkap yg dikemas kini"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Tunjuk kemas kini GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Denyar pandangan dlm tetingkap yg dilukis dgn GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Menunjukkan lapisan kemas kini perkakasan"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Pancar hijau lapisan perkakasan yg dikemas kini"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Nyahpepijat lebih lukis GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Tunjukkan penggunaan CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Tindihan atas skrin menunjukkan penggunaan semasa CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Paksa penyerahan GPU"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulasikan paparan kedua"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikasi"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Jangan simpan aktiviti"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Musnahkn setiap aktviti slps pengguna mengglkannya"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Lumpuhkan data latar belakang pada rangkaian mudah alih. Rangkaian bukan mudah alih akan digunakan jika tersedia."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Untuk menyekat data latar belakang untuk aplikasi ini, mula-mula tetapkan had data mudah alih."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Hadkan data latar belakang?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ciri ini boleh menyebabkan apl yang bergantung kepada data latar belakang berhenti berfungsi apabila hanya rangkaian bermeter yang tersedia."\n\n"Anda boleh menemui lebih banyak kawalan penggunaan data dalam tetapan yang tersedia dalam apl."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ciri ini boleh menyebabkan apl yang bergantung kepada data latar belakang berhenti berfungsi apabila hanya rangkaian bermeter yang tersedia.\n\nAnda boleh menemui lebih banyak kawalan penggunaan data dalam tetapan yang tersedia dalam apl."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Menyekat data latar belakang hanya boleh dilakukan apabila anda telah menetapkan had data mudah alih."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Hidupkan auto-segerak data?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Sebarang perubahan yang anda buat kepada akaun anda di web akan disalin secara automatik ke tablet anda."\n\n"Sesetengah akaun juga boleh secara automatik menyalin sebarang perubahan yang anda buat di tablet ke web. Akaun Google juga berfungsi begini."\n\n"Untuk memilih jenis maklumat yang hendak disegerakkan dalam setiap akaun, pergi ke Tetapan &gt; Akaun."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Sebarang perubahan yang anda buat kepada akaun anda di web akan disalin secara automatik ke telefon anda."\n\n"Sesetengah akaun juga boleh secara automatik menyalin sebarang perubahan yang anda buat di telefon ke web. Akaun Google juga berfungsi begini."\n\n"Untuk memilih maklumat jenis apa untuk disegerakkan dalam setiap akaun, pergi ke Tetapan &gt; Akaun."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Sebarang perubahan yang anda buat kepada akaun anda di web akan disalin secara automatik ke tablet anda.\n\nSesetengah akaun juga boleh secara automatik menyalin sebarang perubahan yang anda buat di tablet ke web. Akaun Google juga berfungsi begini.\n\nUntuk memilih jenis maklumat yang hendak disegerakkan dalam setiap akaun, pergi ke Tetapan &gt; Akaun."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Sebarang perubahan yang anda buat kepada akaun anda di web akan disalin secara automatik ke telefon anda.\n\nSesetengah akaun juga boleh secara automatik menyalin sebarang perubahan yang anda buat di telefon ke web. Akaun Google juga berfungsi begini.\n\nUntuk memilih maklumat jenis apa untuk disegerakkan dalam setiap akaun, pergi ke Tetapan &gt; Akaun."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Matikan auto-segerak data?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Ini akan memelihara data dan penggunaan bateri, tetapi anda perlu menyegerakkan setiap akaun secara manual untuk mengumpul maklumat terkini. Dan anda takkan menerima pemberitahuan apabila kemas kini berlaku."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tarikh tetapan semula kitaran penggunaan"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Tetapkan amaran penggunaan data"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Tetapkan had penggunaan data"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Mengehadkan penggunaan data"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Sambungan data mudah alih anda akan dilumpuhkan apabila mencapai had tertentu.\n\nMemandangkan 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\nMemandangkan 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" 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\nTetapan 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\nTetapan 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Apl dan pengguna yang dialih keluar"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> diterima, <xliff:g id="SENT">%2$s</xliff:g> dihantar"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: kira-kira <xliff:g id="TOTAL">%1$s</xliff:g> digunakan."</string>
     <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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Tambah profil VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Edit profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Padam profil"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN sentiasa dihidupkan"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Pilih profil VPN untuk sentiasa kekal bersambung kepada VPN itu. Trafik rangkaian hanya akan dibenarkan apabila bersambung ke VPN ini."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Tiada"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPN yang sentiasa dihidupkan memerlukan alamat IP untuk kedua-dua pelayan dan DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Tiada sambungan rangkaian. Sila cuba sebentar lagi."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Ada sijil yang hilang. Sila edit profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistem"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Batal"</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">"Kemas kini sistem tmbahan"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Sekatan &amp; pengguna"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Pengguna"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Tambah pengguna"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Edit butiran"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Maklumat pengguna"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Nama"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Sekatan kandungan"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Memerlukan PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Rating kandungan"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Apl sistem"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Apl dipasang"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Buang"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Alih keluar pengguna"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Budak pengacau"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Dilumpuhkan"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permisif"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Menguatkuasakan"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Pengguna"</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="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\nSelepas anda membuat pengguna baharu, orang itu perlu melalui proses persediaan.\n\nMana-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\nMana-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_confirm_remove_message" msgid="5284111415714437285">"Adakah anda pasti anda mahu mengalih keluar semua pengguna dan data berkaitan dari peranti?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Tukar saiz fon"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Sekatan"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Alih keluar sekatan"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Tukar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Tunjukkan pemberitahuan"</string>
     <string name="help_label" msgid="1107174367904110532">"Bantuan"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Akaun untuk kandungan"</string>
+    <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="6160672982086584261">"Tetapkan sekatan apl"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Dikawal oleh <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Apl ini tidak disokong dalam profil yang disekat"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Apl ini boleh mengakses akaun anda"</string>
+    <string name="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 85cba56..3ee445d 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>
@@ -133,8 +140,8 @@
     <item msgid="2330782789550628803">"Utenfor rekkevidde"</item>
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="8151962652413645395">"To minutter"</item>
-    <item msgid="8675215713017289017">"Fem minutter"</item>
+    <item msgid="8151962652413645395">"2 minutter"</item>
+    <item msgid="8675215713017289017">"5 minutter"</item>
     <item msgid="477015974247590543">"Én time"</item>
     <item msgid="5198271470953124739">"Aldri tidsavbrudd"</item>
   </string-array>
@@ -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,16 +218,127 @@
     <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="886742181977884584">"Medier"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"medieknapper"</item>
+    <item msgid="4547883971364273343">"audiofokus"</item>
+    <item msgid="2603878814882344450">"hovedvolum"</item>
+    <item msgid="7136963238377062018">"stemmevolum"</item>
+    <item msgid="4270236897655923007">"ringevolum"</item>
+    <item msgid="6325739889222559394">"medievolum"</item>
+    <item msgid="5762123934816216821">"alarmvolum"</item>
+    <item msgid="785049718065337473">"varselvolum"</item>
+    <item msgid="6700305533746877052">"bluetooth-volum"</item>
+    <item msgid="2029227495214047094">"hold aktiv"</item>
+    <item msgid="26109888160231211">"overvåk posisjon"</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>
+    <item msgid="5753789168376302997">"Medieknapper"</item>
+    <item msgid="3265262911688671938">"Audiofokus"</item>
+    <item msgid="2098976479485046797">"Hovedvolum"</item>
+    <item msgid="5660213838861789350">"Stemmevolum"</item>
+    <item msgid="7983336752371254444">"Ringevolum"</item>
+    <item msgid="7878027809189330917">"Medievolum"</item>
+    <item msgid="7260546305036218513">"Alarmvolum"</item>
+    <item msgid="9103719301075748925">"Varselvolum"</item>
+    <item msgid="7025966722295861512">"Bluetooth-volum"</item>
+    <item msgid="4665183401128289653">"Hold aktiv"</item>
+    <item msgid="8584357129746649222">"Posisjon"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Middels"</item>
     <item msgid="2372711992605524591">"Lang"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (feilsøking)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Bruk Dalvik"</item>
+    <item msgid="5131846588686178907">"Bruk ART"</item>
+    <item msgid="4530003713865319928">"Bruk ART-delversjonen for feilsøking"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Kontrollér aldri"</item>
     <item msgid="6042769699089883931">"Se kun etter DRM-innhold"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Animasjonsskala 5 x"</item>
     <item msgid="1069584980746680398">"Animasjonsskala 10 x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Ingen"</item>
+    <item msgid="688482401508173818">"720 x 480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280 x 720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280 x 720 tvdpi og 1920 x 1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Ingen"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Av"</item>
+    <item msgid="7688197031296835369">"Vis overtrekksområder"</item>
+    <item msgid="8332661909019981149">"Vis overtrekksteller"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standard grense"</item>
     <item msgid="4071574792028999443">"Ingen bakgrunnsprosesser"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Tidsavbrudd"</item>
     <item msgid="7664124146786465092">"Mislyktes"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Spør"</item>
+    <item msgid="5077768429488260031">"Aldri tillat"</item>
+    <item msgid="1417929597727989746">"Alltid tillat"</item>
+  </string-array>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f111751..91a4d8a 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nei"</string>
     <string name="create" msgid="3578857613172647409">"Opprett"</string>
+    <string name="allow" msgid="3349662621170855910">"Tillat"</string>
+    <string name="deny" msgid="6947806159746484865">"Avslå"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ukjent"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Du er nå <xliff:g id="STEP_COUNT">%1$d</xliff:g> trinn fra å bli en utvikler."</item>
+    <item quantity="other" msgid="6722953419953594148">"Du er nå <xliff:g id="STEP_COUNT">%1$d</xliff:g> trinn fra å bli en utvikler."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Du er nå utvikler!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Det trengs ikke, du er allerede utvikler."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"TRÅDLØST OG NETTVERK"</string>
     <string name="header_category_device" msgid="5781174212691167553">"ENHET"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PRIVAT"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Lader"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"På batteristrøm"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(trådløs)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Lader ikke"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Lader ikke"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Full"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Ikke plugget i"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"Nettstrøm"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"trådløs"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"Nettstrøm+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Ukjent"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Ukjent"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Ukjent feil"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Kald"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Synlig"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Synlig for alle Bluetooth-enheter i nærheten (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Synlig for alle Bluetooth-enheter i nærheten"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ikke synlig for andre Bluetooth-enheter"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Synlig bare for sammenkoblede enheter"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gjør enheten synlig"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tidsavbrudd for synlighet"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Angi hvor lenge enheten skal være synlig"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Lås taleanrop"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Forhindrer bruk av Bluetooth-telefon når skjermen er låst"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-enheter"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Vis mottatte filer"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth-enhetsvelger"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth-tillatelse"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"En app ønsker å slå på Bluetooth. Vil du tillate dette?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"En app på nettbrettet ditt ønsker å gjøre nettbrettet synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vil du tillate dette?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"En app på telefonen din ønsker å gjøre telefonen synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vil du tillate dette?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"En app på nettbrettet ditt ønsker å angi at nettbrettet alltid er synlig for andre Bluetooth-enheter. Vil du tillate dette?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"En app på telefonen din ønsker å gjøre telefonen alltid tilgjengelig for andre Bluetooth-enheter. Vil du tillate dette?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"En app på nettbrettet ditt ønsker å slå på Bluetooth og gjøre nettbrettet synlig for andre enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vil du tillate dette?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"En app på telefonen ønsker å slå på Bluetooth og gjøre telefonen synlig for andre enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vil du tillate dette?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"En app på nettbrettet ditt ønsker å slå på Bluetooth og gjøre nettbrettet synlig for andre enheter. Vil du tillate dette?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"En app på telefonen ønsker å slå på Bluetooth og gjøre telefonen synlig for andre enheter. Vil du tillate dette?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"En app ønsker å slå på Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"En app ønsker å gjøre nettbrettet ditt synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"En app ønsker å gjøre telefonen din synlig for andre Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"En app ønsker å gjøre nettbrettet ditt synlig for andre Bluetooth-enheter. Du kan endre dette i Bluetooth-innstillingene senere."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"En app ønsker å gjøre telefonen din synlig for andre Bluetooth-enheter. Du kan endre dette i Bluetooth-innstillingene senere."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"En app ønsker å slå på Bluetooth og gjøre nettbrettet ditt synlig for andre enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"En app ønsker å slå på Bluetooth og gjøre telefonen din synlig for andre enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"En app ønsker å slå på Bluetooth og gjøre nettbrettet ditt synlig for andre enheter. Du kan endre dette i Bluetooth-innstillingene senere."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"En app ønsker å slå på Bluetooth og gjøre telefonen din synlig for andre enheter. Du kan endre dette i Bluetooth-innstillingene senere."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Slår på Bluetooth …"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Slår av Bluetooth …"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatisk tilkobling"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-mellomtjeneren brukes av nettleseren, men kan ikke brukes av andre apper."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Posisjon:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Nabo-CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Celleinfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataforsøk:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-tjeneste:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -260,14 +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_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\nDenne 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\nDenne 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>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Eierinformasjon"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Krev personlig tallkode eller passord for å dekryptere nettbrettet hver gang du slår det på"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Numerisk personlig kode eller passord kreves for å dekryptere telefonen hver gang du slår den på"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Kryptert"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Du kan kryptere kontoene dine, innstillinger, nedlastede apper og tilhørende data, mediefiler og andre filer. Når du krypterer nettbrettet ditt, må du skrive inn en numerisk PIN-kode eller et passord for å dekryptere nettbrettet hver gang du slår det på. Du kan ikke fjerne krypteringen av nettbrettet uten å gjennomføre en tilbakestilling til fabrikkinnstillingene, noe som fører til at alle dataene blir slettet."\n\n"Det tar minst én time å gjennomføre krypteringen. Du må starte med fulladet batteri og sørge for at nettbrettet er koblet til et strømuttak helt til krypteringen er fullført. Hvis du avbryter krypteringsprosessen, mister du deler av eller alle dataene dine."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Du kan kryptere kontoene dine, innstillinger, nedlastede apper og tilhørende data, mediefiler og andre filer. Når du krypterer telefonen din, må du skrive inn en numerisk PIN-kode eller et passord for å dekryptere telefonen hver gang du slår den på. Du kan ikke fjerne krypteringen av telefonen uten å gjennomføre en tilbakestilling til fabrikkinnstillingene, noe som fører til at alle dataene blir slettet."\n\n"Det tar minst én time å gjennomføre krypteringen. Du må starte med fulladet batteri og sørge for at telefonen er koblet til et strømuttak helt til krypteringen er fullført. Hvis du avbryter krypteringsprosessen, mister du deler av eller alle dataene dine."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Du kan kryptere kontoene dine, innstillinger, nedlastede apper og tilhørende data, mediefiler og andre filer. Når du krypterer nettbrettet ditt, må du skrive inn en numerisk PIN-kode eller et passord for å dekryptere nettbrettet hver gang du slår det på. Du kan ikke fjerne krypteringen av nettbrettet uten å gjennomføre en tilbakestilling til fabrikkinnstillingene, noe som fører til at alle dataene blir slettet.\n\nDet tar minst én time å gjennomføre krypteringen. Du må starte med fulladet batteri og sørge for at nettbrettet er koblet til et strømuttak helt til krypteringen er fullført. Hvis du avbryter krypteringsprosessen, mister du deler av eller alle dataene dine."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Du kan kryptere kontoene dine, innstillinger, nedlastede apper og tilhørende data, mediefiler og andre filer. Når du krypterer telefonen din, må du skrive inn en numerisk PIN-kode eller et passord for å dekryptere telefonen hver gang du slår den på. Du kan ikke fjerne krypteringen av telefonen uten å gjennomføre en tilbakestilling til fabrikkinnstillingene, noe som fører til at alle dataene blir slettet.\n\nDet tar minst én time å gjennomføre krypteringen. Du må starte med fulladet batteri og sørge for at telefonen er koblet til et strømuttak helt til krypteringen er fullført. Hvis du avbryter krypteringsprosessen, mister du deler av eller alle dataene dine."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Krypter nettbrett"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Krypter telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Lad batteriet og prøv på nytt."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Prøv på nytt om <xliff:g id="DELAY">^1</xliff:g> sekunder."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Skriv inn passordet"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Kryptering mislykket"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krypteringen ble avbrutt og kan ikke fullføres. Dette betyr at dataene på nettbrettet ditt ikke lenger er tilgjengelige."\n\n"For å fortsette å bruke nettbrettet, må du gjennomføre en tilbakestilling til fabrikkstandard. Når du konfigurerer nettbrettet etter tilbakestillingen, får du mulighet til å gjenopprette data som ble sikkerhetskopiert til Google-kontoen din."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krypteringen ble avbrutt og kan ikke fullføres. Dette betyr at dataene på telefonen din ikke lenger er tilgjengelige."\n\n"For å fortsette å bruke telefonen, må du gjennomføre en tilbakestilling til fabrikkstandard. Når du konfigurerer telefonen etter tilbakestillingen, får du mulighet til å gjenopprette data som ble sikkerhetskopiert til Google-kontoen din."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krypteringen ble avbrutt og kan ikke fullføres. Dette betyr at dataene på nettbrettet ditt ikke lenger er tilgjengelige.\n\nFor å fortsette å bruke nettbrettet, må du gjennomføre en tilbakestilling til fabrikkstandard. Når du konfigurerer nettbrettet etter tilbakestillingen, får du mulighet til å gjenopprette data som ble sikkerhetskopiert til Google-kontoen din."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krypteringen ble avbrutt og kan ikke fullføres. Dette betyr at dataene på telefonen din ikke lenger er tilgjengelige.\n\nFor å fortsette å bruke telefonen, må du gjennomføre en tilbakestilling til fabrikkstandard. Når du konfigurerer telefonen etter tilbakestillingen, får du mulighet til å gjenopprette data som ble sikkerhetskopiert til Google-kontoen din."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Bytt inndatametode"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Velg skjermlås"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Velg reservelås"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Endre PIN-koden for opplåsning"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Endre passord for opplåsning"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Passord må bestå av minst %d tegn"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koden må bestå av minst %d tegn"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-koden må bestå av minst %d tall"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Trykk på Fortsett når du er ferdig"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsett"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Passordet må inneholde færre enn <xliff:g id="NUMBER">%d</xliff:g> tegn."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som høyttalertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For musikk og medier"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Husk innstillinger"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Skjermer koblet sammen"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Tilgjengelige enheter"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Kobler til"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Tilkoblet"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Tilgjengelig"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"I bruk"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Skjerminnstillinger"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Vil du koble fra?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Dette avslutter tilkoblingen med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Alternativer for trådløs skjerm"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Glem"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Ferdig"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Navn"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"På"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Av"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Deaktivert"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tillat datautveksling når nettbrettet berører en annen enhet"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Tillat utveksling av data når telefonen berører en annen enhet"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Av"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Utilgjengelig fordi nærfeltskommunikasjon (NFC) er slått av"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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\nDu 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="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="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="8116564886303972764">"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_in_progress" msgid="2944576520214787628">"WPS har allerede startet, og det kan ta opptil to minutter før den fullføres"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Sikkerhetsinnstillingen (TKIP) for trådløse rutere støttes ikke"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentiseringsfeil. Prøv på nytt."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"En annen WPS-økt ble oppdaget. Prøv på nytt om noen minutter."</string>
     <string name="wifi_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>
@@ -564,6 +621,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\nVil 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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Lagre"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Kunne ikke lagre nettverket"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Avbryt"</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_skip_anyway" msgid="6965361454438011190">"Hopp over uansett"</string>
+    <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\nNettbrettkonfigureringen 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\nTelefonkonfigureringen kan kreve betydelig nettverksaktivitet."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Søker …"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Gi enheten nytt navn"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Motpartsenheter"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Lagrede grupper"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Kunne ikke koble til."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Kunne ikke gi enheten nytt navn."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Vil du koble fra?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Hvis du kobler fra, kommer tilkoblingen med <xliff:g id="PEER_NAME">%1$s</xliff:g> og <xliff:g id="PEER_COUNT">%2$s</xliff:g> andre enheter til å avsluttes."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Flyttbar trådløs sone"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vil du glemme denne gruppen?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Flyttbar Wi-Fi-sone"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Musikkeffekter"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringevolum"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer ved stille modus"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Standard varsel"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Standard varsellyd"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"La varsellampen pulsere"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringetone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Varsel"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Bruk volum for innkommende anrop også for varslinger"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Velg varslingsringetone"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Standard varsellyd"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Medier"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Volum for musikk og video"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivivitet"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Bakgrunnsbilde"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Velg bakgrunnsbilde fra"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Skjermpynt"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Starter ved dvalemodus hvis koblet til strømnettet"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Deaktivert"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Valgt pynt"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Aktiveringstidspunkt"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> i uvirksomhet"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Aldri"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Prøv den!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Starter også når i dokk"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Dagdrøm"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Når enheten er plassert i dokken eller under lading i hvilemodus"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Begge"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Under lading"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Når enheten er plassert i dokken"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Av"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Hvis du vil kontrollere hva som skjer når telefonen er plassert i dokken og/eller i hvilemodus, slår du på Dagdrømmer."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Når dagdrøm-modusen skal brukes"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Start nå"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Innstillinger"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Skriftstørrelse"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM-kode for PIN-kort"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Feil personlig kode"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"De personlige kodene samsvarer ikke"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Kan ikke endre personlig kode."\n"Muligens feil kode."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Kan ikke endre personlig kode.\nMuligens feil kode."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN-koden for SIM-kortet ble endret."</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Kan ikke endre SIM-kortlåsens tilstand."\n"Muligens feil personlig kode."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Kan ikke endre SIM-kortlåsens tilstand.\nMuligens feil personlig kode."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Avbryt"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status for nettbrettet"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Radioprogramvare"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kjerneversjon"</string>
     <string name="build_number" msgid="3075795840572241758">"Byggnummer"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Ikke tilgjengelig"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -733,12 +807,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">"Nettverkstype"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Operatørinformasjon"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Datatilgang"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Servicestatus"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-lagring"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Minnekort"</string>
     <string name="memory_available" msgid="5052397223077021181">"Tilgjengelig"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Tilgjengelig (skrivebeskyttet)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Total plass"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Beregner …"</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Apper (appdata og mediainnhold)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Bilder, videoer"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Lyd (musikk, ringetoner, podcaster osv.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Diverse"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Bufrede data"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Koble fra delt lagring"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Avmonter/løs ut minnekort"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Koble fra intern USB-lagring"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Slett SD-kort"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Sletter intern USB-lagring, som musikk og bilder"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Sletter alle data på SD-kortet, for eksempel musikk og bilder"</string>
-    <string name="read_only" msgid="6702420168629076340">" (skrivebeskyttet)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Vil du slette de bufrede dataene?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Dette sletter de bufrede dataene for alle appene."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP- eller PTP-funksjonen er aktiv"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Vil du koble fra USB-lagring?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Vil du koble fra SD-kortet?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Hvis du kobler fra USB-lagring, virker ikke lenger alle appene slik de skal, og de kan være utilgjengelige inntil du kobler til USB-lagring på nytt."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Gjør at du kan overføre bilder ved hjelp av kameraets programvare samt overføre alle slags filer på datamaskiner som ikke støtter MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installer filoverføringsverktøy"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Andre brukere"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batterinivå"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -817,11 +897,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrikkinnstillinger"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Sletter alle data på nettbrettet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Fjern alle data fra telefonen"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Dette kommer til å slette alle data fra nettbrettets "<b>"interne lagringsplass"</b>", herunder:"\n\n<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Dette vil slette alle data fra telefonens "<b>"interne lagringsplass"</b>", herunder:"\n\n<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er for øyeblikket pålogget følgende kontoer:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Dette kommer til å slette alle data fra nettbrettets "<b>"interne lagringsplass"</b>", herunder:\n\n"<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Dette vil slette alle data fra telefonens "<b>"interne lagringsplass"</b>", herunder:\n\n"<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er for øyeblikket pålogget følgende kontoer:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musikk"</li>\n<li>"Bilder"</li>\n<li>"Andre brukerdata"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"For å slette musikk, bilder og andre brukerdata må "<b>"USB-lageret"</b>" tømmes."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"For å slette musikk, bilder og andre brukerdata, må "<b>"SD-kortet"</b>" tømmes."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjelp"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobile nettverk"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Administrer mobilabonnement"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Ukjent SIM-operatør"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s har ikke noe kjent nettsted for identitetshåndtering"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sett inn SIM-kortet og start enheten på nytt"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Koble deg til Internett"</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>
@@ -909,14 +996,15 @@
     <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>
     <string name="about_settings_summary" msgid="3371517697156165959">"Vis juridisk informasjon, status og programvareversjon"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridisk informasjon"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Medvirkende"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Informasjon om forskrifter"</string>
     <string name="copyright_title" msgid="865906688917260647">"Opphavsrett"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Betingelser"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Endre PIN-kode for opplåsning"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bekreft lagret mønster"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Prøv på nytt:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Tegn et opplåsingsmønster"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Tegn et opplåsingsmønster:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Trykk menyknappen for hjelp."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Slipp fingeren når du er ferdig."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Tegn et mønster over minst <xliff:g id="NUMBER">%d</xliff:g> prikker. Prøv igjen:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Hvordan tegne et opplåsingsmønster"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"For mange gale forsøk!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Prøv igjen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Avbryt"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Neste"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Slik sikrer du nettbrettet"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Sikring av telefonen"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Beskytt nettbrettet mot uautorisert bruk ved å opprette et personlig skjermopplåsingsmønster. På neste side kan du dra fingeren fra prikk til prikk i en hvilken som helst rekkefølge. Du må binde sammen minst fire prikker."\n\n"Er du klar til å begynne? Trykk på Neste."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Beskytt telefonen mot uautorisert bruk ved å opprette et personlig skjermopplåsingsmønster. På neste skjermbilde drar du fingeren rundt for å danne et vilkårlig mønster mellom minst fire punkter. "\n\n"Når du er du klar til å begynne, trykker du på Neste."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Appen er ikke installert på telefonen din."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrer apper"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrer og fjern installerte apper"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Apper"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Tillat installasjon av apper fra ukjente kilder"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Nettbrettet og personopplysningene dine er mer sårbare for angrep fra apper fra ukjente kilder. Du godtar at du alene er ansvarlig for enhver skade på nettbrettet eller tap av data som kan oppstå fra bruk av disse appene."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefonen og personopplysninger er mer sårbare for angrep av apper fra ukjente kilder. Du godtar at du selv er ansvarlig for enhver skade på telefonen eller tap av data som kan skje ved å bruke disse appene."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Bekreft apper"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Forby eller advar før installasjon av apper som kan være skadelige"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Avanserte innstillinger"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktiver flere innstillingsalternativer"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Info om app"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-lagringsvolum for data"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kort"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Avinstaller"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Avinstaller for alle brukere"</string>
+    <string name="install_text" msgid="884360662922471113">"Installer"</string>
     <string name="disable_text" msgid="6544054052049395202">"Deaktiver"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktiver"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Fjern data"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Vis bufrede prosesser"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Tilbakestill app-innstillingene"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vil du tilbakestille app-innstillingene?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Dette tilbakestiller alle innstillingene for:"\n\n" "<li>"Deaktiverte apper"</li>\n" "<li>"Varsler for deaktiverte apper"</li>\n" "<li>"Standard apper for handlinger"</li>\n" "<li>"Bakgrunnsdatabegrensninger for apper"</li>\n\n" Du mister ingen appdata."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Dette tilbakestiller alle innstillingene for:\n\n "<li>"Deaktiverte apper"</li>\n" "<li>"Varsler for deaktiverte apper"</li>\n" "<li>"Standard apper for handlinger"</li>\n" "<li>"Bakgrunnsdatabegrensninger for apper"</li>\n\n" Du mister ingen appdata."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Tilbakestill apper"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Styr plass"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På minnekort"</string>
     <string name="disabled" msgid="9206776641295849915">"Deaktivert"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Ikke installert"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ingen apper."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Intern lagring"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-lagring"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> og <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Den appen kan belaste deg for penger:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Send premium-SMS"</string>
     <string name="computing_size" msgid="1599186977475211186">"Beregner fortsatt…"</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Kunne ikke beregne pakkestørrelsen."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Du har ikke installert noen tredjepartsapper."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Endre foretrukket plassering for installasjon av nye apper"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Deaktivere innebygd app?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Hvis du deaktiverer en innebygd app, kan andre apper oppføre seg på en uventet måte."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Vil du slette dataene og deaktivere appen?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Bruker:<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Brukeren ble fjernet"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> prosess og <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjeneste"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> prosesser og <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjenester"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> prosesser og <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjeneste"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Innstillinger for fysisk tastatur"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Trykk mellomromstasten to ganger for å skrive punktum"</string>
     <string name="show_password" msgid="3001113966880559611">"Gjør passord synlig"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Denne inndatametoden har tilgang til all tekst du skriver, blant annet personlige opplysninger som for eksempel passord og kredittkortnumre. Den kommer fra appen <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Vil du bruke denne inndatametoden?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Denne stavekontrollen kan være i stand til å samle all tekst du skriver, herunder personlige opplysninger som passord og kredittkortnumre. Den kommer fra appen <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Vil du bruke denne stavekontrollen?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Innstillinger"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Bytt ved å trykke på Ctrl+Mellomromstasten"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standard"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tastaturoppsett"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Ordliste"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personlig ordbok"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personlige ordbøker"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personlig ordliste"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Legg til"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Legg til ordliste"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skjermen blir aldri svart under lading"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktiver Bluetooth HCI snoop-logg"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Samle alle Bluetooth HCI-pakker i en fil"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Velg kjøretid"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Velg kjøretid"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Vil du starte på nytt for å endre kjøretiden fra <xliff:g id="OLD">%1$s</xliff:g> til <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Tillat simulert posisjon"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillat bruk av simulerte GPS-koordinater"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Sjekk appene som er installert via ADB/ADT for skadelig adferd."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Beskytt USB-lagring"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apper må be om tillatelse til å lese USB-lagring"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vil du beskytte USB-lagringen?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Når USB-lagring er beskyttet, må apper be om tillatelse til å lese data fra ekstern lagring."\n\n"Enkelte apper fungerer ikke før utviklerne har oppdatert dem."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Når USB-lagring er beskyttet, må apper be om tillatelse til å lese data fra ekstern lagring.\n\nEnkelte apper fungerer ikke før utviklerne har oppdatert dem."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Beskytt SD-kort"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apper må be om tillatelse til å lese SD-kort"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vil du beskytte SD-kortet?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Når SD-kortet er beskyttet, må apper be om tillatelse til å lese data fra ekstern lagring."\n\n"Enkelte apper fungerer ikke før utviklerne har oppdatert dem."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Når SD-kortet er beskyttet, må apper be om tillatelse til å lese data fra ekstern lagring.\n\nEnkelte apper fungerer ikke før utviklerne har oppdatert dem."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokal terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktiver terminalappen som gir lokal kommandolistetilgang"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Velg gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Velg skrivebordselement"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vil du opprette modulen og gi tilgang?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Tilgjengelighetsinnstillinger"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Tjenester"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Stor tekst"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Legg på med På-/Av-knapp"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Les inn passord"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Forsinkelse på trykk-og-hold-inne"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Forbedre tilgj. på nettet"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Forstørrelsesbevegelser"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Når denne funksjonen er aktivert, kan du zoome inn og ut ved å trykke tre ganger på skjermen.\n\nNår du har zoomet inn kan du:\n"<ul><li>"Panorere: Dra to eller flere fingre over skjermen."</li>\n<li>"Tilpasse innzoomingen: Knip sammen eller spre fra hverandre to eller flere fingre."</li></ul>\n\n"Du kan også mildertidig forstørre det som er under fingeren din ved å trykke tre ganger og holde fingeren nede. Mens du forstørrer på denne måten kan du dra fingeren rundt for å se på forskjellige deler av skjermen. Løft fingeren din for å gå tilbake til den forrige visningen.\n\nMerk: Å trykke tre ganger for å forstørre fungerer overalt unntatt på tastaturet og navigasjonsraden."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Snarvei for tilgjengelighet"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"På"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Av"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Når denne funksjonen er slått på, kan du raskt aktivere tilgjengelighetsfunksjoner i to trinn:\n\nTrinn 1: Trykk og hold inne av/på-knappen til du hører en lyd eller føler en vibrasjon.\n\nTrinn 2: Trykk og hold to fingre på skjermen til du hører en bekreftelse.\n\nHvis enheten har flere brukere, får du midlertidig aktivert tilgjengelighet til enheten låses opp."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Stor tekst"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Skjermforstørrelse"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automatisk oppdatering av skjermforstørrelsen"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Oppdater skjermforstørrelsen ved appbytter"</string>
+    <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_menu_item_settings" msgid="3344942964710773365">"Innstillinger"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"På"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"På"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Av"</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="print_settings" msgid="4742428530112487843">"Skriver ut"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Utskriftsinnstillinger"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Tjenester"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vil du bruke <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> kan motta dokumenter du skriver ut. Disse dokumentene kan inneholde private data."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Ingen tjenester er installert"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Innstillinger"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Legg til skrivere"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"På"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Av"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Hva som har brukt batteri"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Batteribruksdata ikke tilgj."</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Data mottatt"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Mobildata sendt"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobildata mottatt"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Wi-Fi-data sendt"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Wi-Fi-data mottatt"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Lyd"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tid på"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Stopp eller avinstaller appen"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Kontroller GPS manuelt for å forhindre at appen bruker den"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Appen kan ha innstillinger som kan redusere batteribruken"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Batteri brukt av brukeren"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden strømmen ble frakoblet"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Siste gang uten strøm i <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total bruk"</string>
@@ -1339,7 +1467,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>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Stemmeleie"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Endrer tonehøyden teksten sies med"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Språk"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Språk er ikke valgt"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Velger språkspesifikk stemme"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Lytt til et eksempel"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Spill en kort demonstrasjon av talesyntesen"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Lysstyrke <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatisk"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"full"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"halv"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"av"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Legitimasjonslager"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installer fra lagringsenhet"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,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="bugreport_title" msgid="1009498799922543551">"Utfør feilrapport"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Informasjon om den nåværende tilstanden til enheten din samles inn og sendes som en e-post. Det tar litt tid fra du starter feilrapporten til e-posten er klar, så vær tålmodig."</string>
-    <string name="report" msgid="302437572240018342">"Rapportér"</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>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nTrykk 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>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Fremhev hele vinduer når de oppdateres"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Vis GPU-visningsoppdateringer"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Fremhev visninger i vinduer når tegnet med GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Vis opp. for mask.varelag"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"La maskinvarelag blinke i grønt når oppdatert"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Feilsøk GPU-overtrekk"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Vis CPU-bruk"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Skjermoverlegg viser gjeldende CPU-bruk"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Tving GPU-gjengivelse"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulering av sekundærskjermer"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apper"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ikke behold aktiviteter"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Fjern hver aktivitet så fort brukeren forlater den"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Slå av bakgrunnsdata på mobilnettverk. Wi-Fi brukes hvis tilgj."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Hvis du ønsker å begrense bakgrunnsdata for denne appen, må du først angi en grense for bruk av mobildata."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Vil du begrense bruken av bakgrunnsdata?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Denne funksjonen kan gjøre at apper som er avhengig av bakgrunnsdata slutter å fungere når bare  mobilnettverk er tilgjengelige."\n\n"Du finner bedre egnede alternativer for databruk i appens innstillinger."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Denne funksjonen kan gjøre at apper som er avhengig av bakgrunnsdata slutter å fungere når bare  mobilnettverk er tilgjengelige.\n\nDu finner bedre egnede alternativer for databruk i appens innstillinger."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Du kan begrense bakgrunnsdata, men bare hvis du har angitt en grense for bruk av mobildata."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Vil du slå på auto-synkronisering?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Eventuelle endringer du gjør i kontoene dine på nettet kopieres automatisk til nettbrettet."\n\n"For noen kontoer kopieres også alle endringene du gjør på nettbrettet automatisk til nettet. Google-kontoer fungerer på denne måten."\n\n"For å velge hvilke typer informasjon du vil synkronisere innenfor hver konto, går du til Innstillinger &gt; Kontoer."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Eventuelle endringer du gjør i kontoene dine på nettet kopieres automatisk til telefonen din."\n\n"For noen kontoer kopieres også alle endringene du gjør på telefonen automatisk til nettet. Google-kontoer fungerer på denne måten."\n\n"For å velge hvilke typer informasjon du vil synkronisere innenfor hver konto, går du til Innstillinger &gt; Kontoer."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Eventuelle endringer du gjør i kontoene dine på nettet kopieres automatisk til nettbrettet.\n\nFor noen kontoer kopieres også alle endringene du gjør på nettbrettet automatisk til nettet. Google-kontoer fungerer på denne måten.\n\nFor å velge hvilke typer informasjon du vil synkronisere innenfor hver konto, går du til Innstillinger &gt; Kontoer."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Eventuelle endringer du gjør i kontoene dine på nettet kopieres automatisk til telefonen din.\n\nFor noen kontoer kopieres også alle endringene du gjør på telefonen automatisk til nettet. Google-kontoer fungerer på denne måten.\n\nFor å velge hvilke typer informasjon du vil synkronisere innenfor hver konto, går du til Innstillinger &gt; Kontoer."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Vil du slå av auto-synkronisering?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Dette bevarer data- og batteribruk, men du må synkronisere hver konto manuelt for å samle ny informasjon. Du kommer ikke til å motta varsler når det gjøres oppdateringer."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tilbakestillingsdato for brukssyklus"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Angi advarsel for databruk"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Angi grense for databruk"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Begrensning av databruk"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobildatatilkoblingen din blir deaktivert når angitt grense nås.\n\nEttersom 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\nEttersom 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" 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\nDenne 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\nDenne 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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Legg til VPN-profil"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Rediger profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Slett profil"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Alltid på-VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Velg en VPN-profil du vil forbli tilkoblet til. Nettverkstrafikk blir bare tillatt når du er tilkoblet denne VPN-en."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ingen"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Alltid på-VPN krever en IP-adresse for både tjener og DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Finner ingen nettverkstilkobling. Prøv på nytt senere."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Et sertifikat mangler. Rediger profilen."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Avbryt"</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">"Ytterligere systemoppdateringer"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Brukerrestriksjoner"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Brukere"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Legg til bruker"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Rediger detaljer"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Brukerinformasjon"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Navn"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Innholdsbegrensninger"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"PIN-kode kreves"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Innholdsvurdering"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"System-apper"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Installerte apper"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Forkast"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Slett brukeren"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Rakkerunge"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Deaktivert"</string>
+    <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_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="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\nNår du oppretter nye brukere, må de gå gjennom en konfigurasjonsprosess.\n\nAlle 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\nAlle 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_confirm_remove_message" msgid="5284111415714437285">"Er du sikker på at du vil slette brukeren og alle tilhørende data fra enheten?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Endre skriftstørrelse"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Begrensninger"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Fjern begrensningene"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Endre PIN-koden"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Vis varsler"</string>
     <string name="help_label" msgid="1107174367904110532">"Hjelp"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Konto for innhold"</string>
+    <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="6160672982086584261">"Angi appbegrensninger"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Kontrollert av <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Denne appen støttes ikke i begrensede profiler"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Denne appen har tilgang til kontoene dine"</string>
+    <string name="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 efda2d6..69abe1a 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,16 +218,127 @@
     <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="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"mediaknoppen"</item>
+    <item msgid="4547883971364273343">"audiofocus"</item>
+    <item msgid="2603878814882344450">"hoofdvolume"</item>
+    <item msgid="7136963238377062018">"stemvolume"</item>
+    <item msgid="4270236897655923007">"beltoonvolume"</item>
+    <item msgid="6325739889222559394">"mediavolume"</item>
+    <item msgid="5762123934816216821">"alarmvolume"</item>
+    <item msgid="785049718065337473">"meldingsvolume"</item>
+    <item msgid="6700305533746877052">"bluetooth-volume"</item>
+    <item msgid="2029227495214047094">"ingeschakeld houden"</item>
+    <item msgid="26109888160231211">"monitorlocatie"</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>
+    <item msgid="5753789168376302997">"Mediaknoppen"</item>
+    <item msgid="3265262911688671938">"Audiofocus"</item>
+    <item msgid="2098976479485046797">"Hoofdvolume"</item>
+    <item msgid="5660213838861789350">"Stemvolume"</item>
+    <item msgid="7983336752371254444">"Beltoonvolume"</item>
+    <item msgid="7878027809189330917">"Mediavolume"</item>
+    <item msgid="7260546305036218513">"Alarmvolume"</item>
+    <item msgid="9103719301075748925">"Meldingsvolume"</item>
+    <item msgid="7025966722295861512">"Bluetooth-volume"</item>
+    <item msgid="4665183401128289653">"Ingeschakeld houden"</item>
+    <item msgid="8584357129746649222">"Locatie"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Normaal"</item>
     <item msgid="2372711992605524591">"Lang"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (foutopsporing)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Dalvik gebruiken"</item>
+    <item msgid="5131846588686178907">"ART gebruiken"</item>
+    <item msgid="4530003713865319928">"ART-foutopsporingsbuild gebruiken"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nooit controleren"</item>
     <item msgid="6042769699089883931">"Alleen controleren op DRM-inhoud"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Animatieschaal 5x"</item>
     <item msgid="1069584980746680398">"Animatieschaal 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Geen"</item>
+    <item msgid="688482401508173818">"720 x 480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280 x 720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280 x 720 tvdpi en 1920 x 1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Geen"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Uit"</item>
+    <item msgid="7688197031296835369">"Gedeeltes met overbelasting weergeven"</item>
+    <item msgid="8332661909019981149">"Teller voor overbelasting weergeven"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standaardlimiet"</item>
     <item msgid="4071574792028999443">"Geen achtergrondprocessen"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Time-out"</item>
     <item msgid="7664124146786465092">"Mislukt"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Vragen"</item>
+    <item msgid="5077768429488260031">"Nooit toestaan"</item>
+    <item msgid="1417929597727989746">"Altijd toestaan"</item>
+  </string-array>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 542cc73..a4a78a8 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nee"</string>
     <string name="create" msgid="3578857613172647409">"Aanmaken"</string>
+    <string name="allow" msgid="3349662621170855910">"Toestaan"</string>
+    <string name="deny" msgid="6947806159746484865">"Weigeren"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Onbekend"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"U moet nog <xliff:g id="STEP_COUNT">%1$d</xliff:g> stap uitvoeren om ontwikkelaar te worden."</item>
+    <item quantity="other" msgid="6722953419953594148">"U moet nog <xliff:g id="STEP_COUNT">%1$d</xliff:g> stappen uitvoeren om ontwikkelaar te worden."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"U bent nu ontwikkelaar!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Niet nodig, u bent al ontwikkelaar."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"DRAADLOOS EN NETWERKEN"</string>
     <string name="header_category_device" msgid="5781174212691167553">"APPARAAT"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PERSOONLIJK"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Opladen"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Ontladen"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(draadloos)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Wordt niet opgeladen"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Wordt niet opgeladen"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Volledig"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Niet aangesloten"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"draadloos"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Onbekend"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Onbekend"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Onbekende fout"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Koud"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Kan worden gevonden"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Zichtbaar voor alle Bluetooth-apparaten in de buurt (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Zichtbaar voor alle Bluetooth-apparaten in de buurt"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Niet zichtbaar voor andere Bluetooth-apparaten"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Alleen zichtbaar voor gekoppelde apparaten"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Zorgen dat het apparaat kan worden gevonden"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Time-out voor zichtbaarheid"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Instellen hoe lang het apparaat vindbaar is"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Spraakkeuze vergrendelen"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Gebruik van de Bluetooth-dialer voorkomen wanneer het scherm is vergrendeld"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-apparaten"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Ontvangen bestanden weergeven"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth-apparaatkiezer"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Machtigingsverzoek voor Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Een app wil Bluetooth inschakelen. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Een app op uw tablet wil uw tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden vindbaar maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Een app op uw telefoon wil uw telefoon <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden vindbaar maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Een app op uw tablet wil uw tablet altijd vindbaar maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Een app op uw telefoon wil uw telefoon altijd vindbaar maken voor andere Bluetooth-apparaten. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Een app op uw tablet wil Bluetooth inschakelen en uw tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden vindbaar maken voor andere apparaten. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Een app op uw telefoon wil Bluetooth inschakelen en uw telefoon <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden vindbaar maken voor andere apparaten. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Een app op uw tablet wil Bluetooth inschakelen en uw tablet vindbaar maken voor andere apparaten. Wilt u dit toestaan?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Een app op uw telefoon wil Bluetooth inschakelen en uw telefoon vindbaar maken voor andere apparaten. Wilt u dit toestaan?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Een app wil Bluetooth inschakelen."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Een app wil uw tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar maken voor andere Bluetooth-apparaten."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Een app wil uw telefoon <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar maken voor andere Bluetooth-apparaten."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Een app wil uw tablet zichtbaar maken voor andere Bluetooth-apparaten. U kunt dit later wijzigen in de Bluetooth-instellingen."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Een app wil uw telefoon zichtbaar maken voor andere Bluetooth-apparaten. U kunt dit later wijzigen in de Bluetooth-instellingen."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Een app wil Bluetooth inschakelen en uw tablet <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar maken voor andere apparaten."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Een app wil Bluetooth inschakelen en uw telefoon <xliff:g id="TIMEOUT">%1$d</xliff:g> seconden zichtbaar maken voor andere apparaten."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Een app wil Bluetooth inschakelen en uw tablet zichtbaar maken voor andere apparaten. U kunt dit later wijzigen in de Bluetooth-instellingen."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Een app wil Bluetooth inschakelen en uw telefoon zichtbaar maken voor andere apparaten. U kunt dit later wijzigen in de Bluetooth-instellingen."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth inschakelen.."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth uitschakelen…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatisch verbinding maken"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"De HTTP-proxy wordt gebruikt door de browser, maar mag niet worden gebruikt door de andere apps."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Locatie:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naburige CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Celinfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Gegevenspogingen:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-service:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"De gegevensverbinding is verbroken, omdat u uw thuisnetwerk heeft verlaten terwijl gegevensroaming was uitgeschakeld."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Inschakelen"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Wanneer u gegevensroaming toestaat, kunnen er hoge roamingkosten in rekening worden gebracht."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Wanneer u gegevensroaming toestaat, kunnen er hoge roamingkosten in rekening worden gebracht.\n\nDeze instelling is van invloed op alle gebruikers van deze tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Wanneer u gegevensroaming toestaat, kunnen er hoge roamingkosten in rekening worden gebracht.\n\nDeze instelling is van invloed op alle gebruikers van deze telefoon."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Gegevensroaming toestaan?"</string>
     <string name="networks" msgid="6333316876545927039">"Operator selecteren"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Een mobiele provider kiezen"</string>
@@ -297,26 +307,30 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Eigenaarsgegevens"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"\'Mijn locatie\' instellen, scherm ontgrendelen, opslag van referenties vergrendelen"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Wachtwoorden"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encryptie"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tablet encrypten"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefoon coderen"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tablet versleutelen"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefoon versleutelen"</string>
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Een numerieke PIN-code of wachtwoord vereisen om uw tablet te decoderen wanneer u deze inschakelt"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Een numerieke PIN-code of wachtwoord vereisen om uw telefoon te decoderen wanneer u deze inschakelt"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Gecodeerd"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"U kunt uw account, instellingen, gedownloade apps en de bijbehorende gegevens, media en andere bestanden coderen. Zodra u uw tablet heeft gecodeerd, moet u telkens een pincode of wachtwoord opgeven om de tablet te decoderen wanneer u deze opstart. U kunt het coderen van uw tablet uitsluitend ongedaan maken door de fabrieksinstellingen te herstellen. Daarbij worden al uw gegevens gewist."\n\n"Het coderen kan een uur of langer duren. U moet beginnen met een volledig opgeladen accu en de tablet moet gedurende het coderen op de oplader zijn aangesloten. Als u het coderen onderbreekt, kunt u sommige of al uw gegevens kwijtraken."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"U kunt uw account, instellingen, gedownloade apps en de bijbehorende gegevens, media en andere bestanden coderen. Zodra u uw telefoon heeft gecodeerd, moet u telkens een pincode of wachtwoord opgeven om de telefoon te decoderen wanneer u deze opstart. U kunt het coderen van uw telefoon uitsluitend ongedaan maken door de fabrieksinstellingen te herstellen. Daarbij worden al uw gegevens gewist."\n\n"Het coderen kan een uur of langer duren. U moet beginnen met een volledig opgeladen accu en u moet de telefoon aansluiten op de oplader totdat het coderen is voltooid. Als u het coderen onderbreekt, kunt u sommige of al uw gegevens kwijtraken."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tablet coderen"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefoon coderen"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"U kunt uw account, instellingen, gedownloade apps en de bijbehorende gegevens, media en andere bestanden versleutelen. Zodra u uw tablet heeft versleuteld, moet u telkens een pincode of wachtwoord opgeven om de tablet te coderen wanneer u deze opstart. U kunt het versleutelen van uw tablet uitsluitend ongedaan maken door de fabrieksinstellingen te herstellen. Daarbij worden al uw gegevens gewist.\n\nHet versleutelen kan een uur of langer duren. U moet beginnen met een volledig opgeladen accu en de tablet moet gedurende het versleutelen op de oplader zijn aangesloten. Als u het versleutelen onderbreekt, kunt u sommige of al uw gegevens kwijtraken."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"U kunt uw account, instellingen, gedownloade apps en de bijbehorende gegevens, media en andere bestanden versleutelen. Zodra u uw telefoon heeft versleuteld, moet u telkens een pincode of wachtwoord opgeven om de telefoon te coderen wanneer u deze opstart. U kunt het versleutelen van uw telefoon uitsluitend ongedaan maken door de fabrieksinstellingen te herstellen. Daarbij worden al uw gegevens gewist.\n\nHet versleutelen kan een uur of langer duren. U moet beginnen met een volledig opgeladen accu en u moet de telefoon aansluiten op de oplader totdat het versleutelen is voltooid. Als u het versleutelen onderbreekt, kunt u sommige of al uw gegevens kwijtraken."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tablet versleutelen"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefoon versleutelen"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laad de accu op en probeer het opnieuw."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Sluit uw lader aan en probeer het opnieuw."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Geen PIN-code of wachtwoord voor schermvergrendeling"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"U moet een pincode of wachtwoord voor schermvergrendeling instellen voordat u de encryptie kunt starten."</string>
-    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Coderen?"</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Versleutelen?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"De coderingsbewerking kan niet ongedaan worden gemaakt en als u de bewerking onderbreekt, gaan er gegevens verloren. Het coderen duurt een uur of langer en de tablet wordt meerdere keren opnieuw opgestart."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"De coderingsbewerking kan niet ongedaan worden gemaakt en als u de bewerking onderbreekt, gaan er gegevens verloren. Het coderen duurt een uur of langer en de telefoon wordt meerdere keren opnieuw opgestart."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Coderen"</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Probeer het over <xliff:g id="DELAY">^1</xliff:g> seconden opnieuw."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Typ uw wachtwoord"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryptie mislukt"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Het coderen is onderbroken en kan niet worden voltooid. Als gevolg hiervan zijn de gegevens op uw tablet niet meer toegankelijk. "\n\n"Als u uw tablet weer wilt gebruiken, moet u de fabrieksinstellingen herstellen. Wanneer u de tablet instelt na het herstel, krijgt u de mogelijkheid gegevens waarvan u een back-up heeft gemaakt in uw Google-account, terug te zetten."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Het coderen is onderbroken en kan niet worden voltooid. Daardoor zijn de gegevens op uw telefoon niet meer toegankelijk. "\n\n"Als u uw telefoon weer wilt gebruiken, moet u de fabrieksinstellingen herstellen. Wanneer u de telefoon instelt na het herstel, krijgt u de mogelijkheid gegevens terug te zetten waarvan u een back-up heeft gemaakt in uw Google-account."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Het coderen is onderbroken en kan niet worden voltooid. Als gevolg hiervan zijn de gegevens op uw tablet niet meer toegankelijk. \n\nAls u uw tablet weer wilt gebruiken, moet u de fabrieksinstellingen herstellen. Wanneer u de tablet instelt na het herstel, krijgt u de mogelijkheid gegevens waarvan u een back-up heeft gemaakt in uw Google-account, terug te zetten."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Het coderen is onderbroken en kan niet worden voltooid. Daardoor zijn de gegevens op uw telefoon niet meer toegankelijk. \n\nAls u uw telefoon weer wilt gebruiken, moet u de fabrieksinstellingen herstellen. Wanneer u de telefoon instelt na het herstel, krijgt u de mogelijkheid gegevens terug te zetten waarvan u een back-up heeft gemaakt in uw Google-account."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Invoermethode schakelen"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Schermvergr. kiezen"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Back-upvergr. kiezen"</string>
@@ -334,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>
@@ -350,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>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"PIN-code voor ontgrendelen wijzigen"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ontgrendelingswachtwoord wijzigen"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Wachtwoord moet ten minste %d tekens lang zijn"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-code moet ten minste %d tekens lang zijn"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Pincode moet ten minste %d cijfers zijn"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Raak \'Doorgaan\' aan als u klaar bent"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Doorgaan"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Wachtwoord moet korter zijn dan <xliff:g id="NUMBER">%d</xliff:g> tekens."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Als luidsprekertelefoon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Voor muziek en media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Instellingen onthouden"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Gekoppelde displays"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Beschikbare apparaten"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Verbinding maken"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Verbonden"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Beschikbaar"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"In gebruik"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Weergave-instellingen"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Ontkoppelen?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Hierdoor wordt uw verbinding met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; verbroken"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Opties voor draadloze display"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Vergeten"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Gereed"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Naam"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Aan"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Uit"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Uitgeschakeld"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Gegevensuitwisseling toestaan wanneer de tablet een ander apparaat fysiek raakt"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Gegevensuitwisseling toestaan wanneer de telefoon een ander apparaat fysiek raakt"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Uit"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Niet beschikbaar omdat NFC is uitgeschakeld"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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\nHoud 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="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="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="8116564886303972764">"Geef de pincode <xliff:g id="NUMBER">%1$s</xliff:g> op uw wifi-router op. De configuratie kan twee minuten in beslag nemen."</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_in_progress" msgid="2944576520214787628">"WPS wordt al uitgevoerd; het kan twee minuten duren voordat dit proces is voltooid"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"De beveiligingsinstelling voor de draadloze router (TKIP) wordt niet ondersteund"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Authenticatie is mislukt. Probeer het opnieuw."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Er is een andere WPS-sessie gedetecteerd. Probeer het over een paar minuten opnieuw."</string>
     <string name="wifi_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>
@@ -564,6 +621,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\nDit 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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Opslaan"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Opslaan van netwerk is mislukt"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Annuleren"</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_skip_anyway" msgid="6965361454438011190">"Toch overslaan"</string>
+    <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\nHet 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\nHet instellen van de telefoon kan aanzienlijke netwerkactiviteit vereisen."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Zoeken…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Naam van apparaat wijzigen"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Peer-apparaten"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Onthouden groepen"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Kan geen verbinding maken."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Kan naam van apparaat niet wijzigen."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Ontkoppelen?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Als u de verbinding verbreekt, wordt uw verbinding met <xliff:g id="PEER_NAME">%1$s</xliff:g> en <xliff:g id="PEER_COUNT">%2$s</xliff:g> andere apparaten beëindigd."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Draagbare Wi-Fi-hotspot"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Deze groep vergeten?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Draagbare wifi-hotspot"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Muziekeffecten"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Belvolume"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Trillen indien stil"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Standaardmelding"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Standaardmeldingsgeluid"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Knipperen trackball"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Beltoon"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Melding"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Volume van inkomende oproepen gebruiken voor meldingen"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Beltoon voor meldingen kiezen"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Standaardmeldingsgeluid"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Media"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Volume voor muziek en video\'s instellen"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
@@ -634,11 +706,11 @@
     <string name="volume_media_description" msgid="7949355934788807863">"Muziek, video, games en andere media"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"Beltoon en meldingen"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"Meldingen"</string>
-    <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmen"</string>
+    <string name="volume_alarm_description" msgid="8322615148532654841">"Wekkers"</string>
     <string name="volume_ring_mute" msgid="3018992671608737202">"Beltoon en meldingen dempen"</string>
     <string name="volume_media_mute" msgid="3399059928695998166">"Muziek en andere media dempen"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Meldingen dempen"</string>
-    <string name="volume_alarm_mute" msgid="4452239420351035936">"Alarmen dempen"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Wekkers dempen"</string>
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Trillen bij bellen"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Docken"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Instellingen voor dockstation"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Achtergrond"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Achtergrond kiezen van"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Screen Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Wordt gestart bij activeren van slaapstand indien aangesloten op stroomvoorziening"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Uitgeschakeld"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Geselecteerde candy"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Wanneer activeren"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nooit"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Probeer het eens!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Ook starten indien gedockt"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Dagdromen"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Wanneer gedockt, in slaapstand of tijdens het opladen"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Maakt niet uit"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Tijdens het opladen"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Wanneer gedockt"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Uit"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Schakel Dagdromen in om te bepalen wat er gebeurt als de telefoon is gedockt en/of de slaapstand actief is."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Wanneer dagdromen"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Nu beginnen"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Instellingen"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische helderheid"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Lettergrootte"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Lettergrootte"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN-code"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Onjuiste pincode"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Pincodes komen niet overeen"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Kan pincode niet wijzigen."\n"Pincode mogelijk onjuist."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Kan pincode niet wijzigen.\nPincode mogelijk onjuist."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN-code gewijzigd"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Kan status van simkaartblokkering niet wijzigen."\n"Pincode mogelijk onjuist."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Kan status van simkaartblokkering niet wijzigen.\nPincode mogelijk onjuist."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annuleren"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tabletstatus"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Smalbandversie"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel-versie"</string>
     <string name="build_number" msgid="3075795840572241758">"Build-nummer"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Niet beschikbaar"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -733,12 +807,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">"Type mobiel netwerk"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Operatorinfo"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Status mobiel netwerk"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Servicestatus"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-opslag"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kaart"</string>
     <string name="memory_available" msgid="5052397223077021181">"Beschikbaar"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Beschikbaar (alleen-lezen)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Totale ruimte"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Berekenen…"</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Apps (app-gegevens en media-inhoud)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Foto\'s, video\'s"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (muziek, beltonen, podcasts, enzovoort)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Diversen"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Gegevens in het cachegeheugen"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Gedeelde opslag ontkoppelen"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-kaart ontkoppelen"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Interne USB-opslag ontkoppelen"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD-kaart wissen"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Wist alle gegevens in de interne USB-opslag, zoals muziek en foto\'s"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Hiermee worden alle gegevens op de SD-kaart gewist, zoals muziek en foto\'s"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Alleen-lezen)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Gegevens in het cachegeheugen wissen?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Hiermee worden gegevens in het cachegeheugen voor alle apps gewist."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP- of PTP-functie is actief"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"USB-opslag ontkoppelen?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"SD-kaart ontkoppelen?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Als u de USB-opslag ontkoppelt, worden bepaalde apps die u gebruikt, gestopt en komen deze mogelijk pas weer beschikbaar wanneer u de USB-opslag opnieuw koppelt."</string>
@@ -792,7 +871,8 @@
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Hiermee kunt u mediabestanden overzetten op Windows-computers, of de app Android File Transfer op Mac-computers (ga naar www.android.com/filetransfer)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"Camera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Hiermee kunt u foto\'s overzetten met camerasoftware en bestanden overzetten op computers die geen MTP ondersteunen"</string>
-    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Hulpprogramma\'s voor bestandsoverdracht installeren"</string>
+    <string name="usb_label_installer_cd" msgid="4331173824920630215">"Tools voor overdracht installeren"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Andere gebruikers"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Accustatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Accuniveau"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN\'s"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrieksinstellingen terug"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Alle gegevens op de tablet wissen"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Alle gegevens op de telefoon wissen"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw tablet gewist, waaronder:"\n\n<li>"Uw Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw telefoon gewist, waaronder:"\n\n<li>"Uw Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"U bent momenteel aangemeld bij de volgende accounts:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw tablet gewist, waaronder:\n\n"<li>"Uw Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw telefoon gewist, waaronder:\n\n"<li>"Uw Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"U bent momenteel aangemeld bij de volgende accounts:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muziek"</li>\n<li>"Foto\'s"</li>\n<li>"Andere gebruikersgegevens"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Als u muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"USB-opslag"</b>" worden gewist."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Als u muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"SD-kaart"</b>" worden gewist."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Tethering van <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt opgeheven."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiele netwerken"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Mobiel abonnement beheren"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Onbekende simprovider"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s heeft geen bekende website voor provisioning"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Plaats een simkaart en start het apparaat opnieuw"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Maak verbinding met internet"</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>
@@ -917,6 +1004,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Juridische info, status, softwareversie weergeven"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridische informatie"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Bijdragers"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Wettelijke informatie"</string>
     <string name="copyright_title" msgid="865906688917260647">"Auteursrecht"</string>
     <string name="license_title" msgid="1990487604356037871">"Licentie"</string>
     <string name="terms_title" msgid="7697580845616764642">"Algemene voorwaarden"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"PIN-code voor ontgrendelen wijzigen"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Opgeslagen patroon bevestigen"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Probeer het opnieuw:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Teken een ontgrendelingspatroon"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Teken een ontgrendelingspatroon:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Druk op \'Menu\' voor hulp."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Haal uw vinger van het scherm als u klaar bent."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Verbind minimaal <xliff:g id="NUMBER">%d</xliff:g> punten. Probeer het opnieuw:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"U tekent als volgt een ontgrendelingspatroon"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Te veel onjuiste pogingen!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Probeer het over <xliff:g id="NUMBER">%d</xliff:g> seconden opnieuw."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Annuleren"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Volgende"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Uw tablet beveiligen"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Uw telefoon beveiligen"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Beveilig uw tablet tegen ongeoorloofd gebruik door een persoonlijk schermontgrendelingspatroon in te stellen. Gebruik op het volgende scherm uw vinger om de punten met elkaar te verbinden. U moet minimaal vier punten met elkaar verbinden. "\n\n"Bent u er klaar voor? Raak \'Volgende\' aan."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Beveilig uw telefoon tegen ongeoorloofd gebruik door een persoonlijk schermontgrendelingspatroon in te stellen. Gebruik op het volgende scherm uw vinger om de punten met elkaar te verbinden. U moet minimaal vier punten met elkaar verbinden. "\n\n"Bent u er klaar voor? Raak \'Volgende\' aan."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Deze app is niet geïnstalleerd op uw telefoon."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Apps beheren"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Geïnstalleerde apps beheren en verwijderen"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Apps"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Toestaan dat apps uit onbekende bronnen worden geïnstalleerd"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Uw tablet en persoonlijke gegevens zijn gevoeliger voor aanvallen door apps van onbekende bronnen. U gaat ermee akkoord dat alleen u verantwoordelijk bent voor enige schade aan uw tablet of verlies van gegevens die voortkomen uit het gebruik van deze apps."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Uw telefoon en persoonlijke gegevens worden door apps van onbekende bronnen gevoeliger voor aanvallen. U gaat ermee akkoord dat alleen u verantwoordelijk bent voor enige schade aan uw telefoon of verlies van gegevens die voortkomen uit het gebruik van deze apps."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Apps verifiëren"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"De installatie van apps die schade kunnen veroorzaken, niet toestaan of eerst waarschuwen"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Geavanceerde instellingen"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Meer opties voor instellingen inschakelen"</string>
     <string name="application_info_label" msgid="5736524913065714880">"App-info"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-opslaggegevens"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kaart"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Verwijderen"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Verwijderen voor alle gebruikers"</string>
+    <string name="install_text" msgid="884360662922471113">"Installeren"</string>
     <string name="disable_text" msgid="6544054052049395202">"Uitschakelen"</string>
     <string name="enable_text" msgid="9217362512327828987">"Inschakelen"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Gegevens wissen"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Gecachte processen weerg."</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Appvoorkeuren herstellen"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Appvoorkeuren herstellen?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Hierdoor worden alle voorkeuren voor de volgende items opnieuw ingesteld:"\n\n" "<li>"Uitgeschakelde apps"</li>\n" "<li>"Meldingen van uitgeschakelde apps"</li>\n" "<li>"Standaardapps voor acties"</li>\n" "<li>"Beperkingen voor achtergrondgegevens van apps"</li>\n\n" Er gaan geen appgegevens verloren."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Hierdoor worden alle voorkeuren voor de volgende items opnieuw ingesteld:\n\n "<li>"Uitgeschakelde apps"</li>\n" "<li>"Meldingen van uitgeschakelde apps"</li>\n" "<li>"Standaardapps voor acties"</li>\n" "<li>"Beperkingen voor achtergrondgegevens van apps"</li>\n\n" Er gaan geen appgegevens verloren."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Apps herstellen"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Ruimte beheren"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Op SD-kaart"</string>
     <string name="disabled" msgid="9206776641295849915">"Uitgeschakeld"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Niet geïnstalleerd"</string>
     <string name="no_applications" msgid="7336588977497084921">"Geen apps."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interne opslag"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-opslag"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> en <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Deze app kan u kosten in rekening brengen:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Premium-sms verzenden"</string>
     <string name="computing_size" msgid="1599186977475211186">"Berekenen…"</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Kan pakketgrootte niet berekenen."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"U heeft geen apps van derden geïnstalleerd."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"De voorkeursinstallatielocatie voor nieuwe apps wijzigen"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Ingebouwde app uitschakelen?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Als u een ingebouwde app uitschakelt, kunnen andere apps onverwacht gedrag vertonen."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Gegevens verwijderen en app uitschakelen?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Gebruiker: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Verwijderde gebruiker"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces en <xliff:g id="NUMSERVICES">%2$d</xliff:g> service"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces en <xliff:g id="NUMSERVICES">%2$d</xliff:g> services"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processen en <xliff:g id="NUMSERVICES">%2$d</xliff:g> service"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Instellingen voor vast toetsenbord"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Druk twee keer op de spatiebalk om een punt (.) in te voegen"</string>
     <string name="show_password" msgid="3001113966880559611">"Wachtwoorden zichtbaar maken"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Deze invoermethode verzamelt mogelijk alle tekst die u typt, inclusief persoonlijke gegevens zoals wachtwoorden en creditcardnummers. De methode is afkomstig uit de app <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Deze invoermethode inschakelen?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Deze spellingcontrole verzamelt mogelijk alle tekst die u typt, inclusief persoonlijke gegevens zoals wachtwoorden en creditcardnummers. De service is afkomstig uit de app <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Wilt u deze spellingcontrole gebruiken?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Instellingen"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Druk op Ctrl-spatiebalk om te schakelen"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standaard"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Toetsenbordindelingen"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Gebruikerswoordenboek"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Persoonlijk woordenboek"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Persoonlijke woordenboeken"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Persoonlijk woordenboek"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Toevoegen"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Toevoegen aan woordenboek"</string>
@@ -1157,10 +1252,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Scherm gaat nooit uit tijdens het opladen"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Snoop-logbestand voor Bluetooth-HCI inschakelen"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Alle Bluetooth-HCI-pakketten tot één bestand samenvoegen"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Runtime selecteren"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Runtime selecteren"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Opnieuw opstarten om runtime te wijzigen van <xliff:g id="OLD">%1$s</xliff:g> in <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Neplocaties toestaan"</string>
     <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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Apps die zijn geïnstalleerd via ADB/ADT, controleren op schadelijk gedrag."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USB-opslag beveiligen"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apps moeten toestemming vragen om de USB-opslag te lezen"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"USB-opslag beveiligen?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wanneer de USB-opslag is beveiligd, moeten apps toestemming vragen om gegevens op externe opslagmedia te lezen."\n\n"Sommige apps werken mogelijk pas nadat ze zijn bijgewerkt door hun ontwikkelaars."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wanneer de USB-opslag is beveiligd, moeten apps toestemming vragen om gegevens op externe opslagmedia te lezen.\n\nSommige apps werken mogelijk pas nadat ze zijn bijgewerkt door hun ontwikkelaars."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SD-kaart beveiligen"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apps moeten toestemming vragen om de SD-kaart te lezen"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SD-kaart beveiligen?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wanneer de SD-kaart is beveiligd, moeten apps toestemming vragen om gegevens op externe opslagmedia te lezen."\n\n"Sommige apps werken mogelijk pas nadat ze zijn bijgewerkt door hun ontwikkelaars."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wanneer de SD-kaart is beveiligd, moeten apps toestemming vragen om gegevens op externe opslagmedia te lezen.\n\nSommige apps werken mogelijk pas nadat ze zijn bijgewerkt door hun ontwikkelaars."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokale terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Terminal-app inschakelen die lokale shell-toegang biedt"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Gadget kiezen"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Widget kiezen"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widget maken en toegang toestaan?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Instellingen voor toegankelijkheid"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Services"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Systeem"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Grote tekst"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Aan/uit-knop beëindigt oproep"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Wachtwoorden voorlezen"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Vertraging voor blijven aanraken"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Webtoegankelijkheid verbeteren"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Vergrotingsgebaren"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Wanneer deze functie is ingeschakeld, kunt u in- en uitzoomen door drie keer op het scherm te tikken.\n\nWanneer u bent ingezoomd, kunt u:\n"<ul><li>"Pannen: sleep twee of meer vingers over het scherm."</li>\n<li>"Zoomniveau aanpassen: knijp twee of meer vingers samen of spreid deze."</li></ul>\n\n"U kunt ook de inhoud onder uw vinger tijdelijk vergroten door drie keer te tikken en vast te houden. In deze vergrote staat kunt u slepen met uw vinger om verschillende gedeelten van het scherm te verkennen. Til uw vinger op om terug te keren naar de vorige staat.\n\nOpmerking: drie keer tikken voor vergroting werkt overal, behalve voor het toetsenbord en de navigatiebalk."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Snelkoppeling voor toegankelijkheid"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Aan"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Uit"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Wanneer deze functie is ingeschakeld, kunt u de toegankelijkheidsfuncties inschakelen in twee snelle stappen:\n\nStap 1: Houd de aan/uit-knop ingedrukt totdat u een geluid hoort of een trilling voelt.\n\nStap 2: Blijf het scherm met twee vingers aanraken totdat u een audiobevestiging hoort.\n\nAls het apparaat meerdere gebruikers heeft, wordt toegankelijkheid tijdelijk ingeschakeld met deze snelkoppeling op het vergrendelingsscherm totdat het apparaat wordt ontgrendeld."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Grote tekst"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Schermvergroting"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Schermvergroting automatisch bijwerken"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Schermvergroting bijwerken bij app-overgangen"</string>
+    <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_menu_item_settings" msgid="3344942964710773365">"Instellingen"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Aan"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"Aan"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Uit"</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="print_settings" msgid="4742428530112487843">"Afdrukken"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Afdrukinstellingen"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Services"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> gebruiken?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> kan documenten ontvangen die u afdrukt. Dergelijke documenten kunnen gevoelige gegevens bevatten."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Geen services geïnstalleerd"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Instellingen"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Printers toevoegen"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Aan"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Uit"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Accu"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Waarvoor de accu is gebruikt"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Accugebruikgegevens niet beschikbaar."</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Gegevens ontvangen"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Mobiele gegevens verzonden"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobiele gegevens ontvangen"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Wifi-gegevens verzonden"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Wifi-gegevens ontvangen"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tijd actief"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"De app stoppen of verwijderen"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"GPS handmatig beheren om te voorkomen dat de app dit gebruikt"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"De app kan instellingen aanbieden om het accugebruik te beperken"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Accu gebruikt door gebruiker"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sinds losgekoppeld"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Sinds laatst losgekoppeld voor <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Gebruikstotalen"</string>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Hoogte"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Is van invloed op de toon van de gesproken tekst"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Taal"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Taal niet geselecteerd"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"De taalspecifieke stem voor de gesproken tekst instellen"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Luisteren naar een voorbeeld"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Een korte demonstratie van spraaksynthese afspelen"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Helderheid <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatisch"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"volledig"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"half"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"uit"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Opslag van referenties"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installeren vanuit opslag"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"In een back-up opgeslagen instellingen of andere gegevens herstellen bij het opnieuw installeren van een app"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Foutenrapport genereren"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Hiermee worden gegevens over de huidige status van uw apparaat verzameld en als e-mail verzonden. Wanneer u een foutenrapport start, duurt het even voordat het kan worden verzonden. Even geduld alstublieft."</string>
-    <string name="report" msgid="302437572240018342">"Rapport maken"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Wachtwoord desktopback-up"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Volledige back-ups naar desktops zijn momenteel niet beveiligd"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Raak dit aan om het wachtwoord voor volledige back-ups naar desktops te wijzigen of te verwijderen"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nRaak "<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>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Agenda"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Contacten"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welkom bij Google Sync!"</font>" "\n"Een benadering van Google voor de synchronisatie van gegevens, zodat u altijd en overal toegang heeft tot uw contacten, afspraken en nog veel meer."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welkom bij Google Sync!"</font>" \nEen benadering van Google voor de synchronisatie van gegevens, zodat u altijd en overal toegang heeft tot uw contacten, afspraken en nog veel meer."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Synchronisatie-instellingen van de app"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Gegevens en synchronisatie"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Wachtwoord wijzigen"</string>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Volledige vensteroppervlakken flashen bij updates"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU-weergave-updates weergeven"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash-weergaven in vensters indien getekend met de GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Updaten hardwarelgn wrgvn"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Hardwarelagen knipperen groen bij updates"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Foutopsporing GPU-overbelasting"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU-gebruik weergeven"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Schermoverlay met huidig CPU-gebruik"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU-rendering afdwingen"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Secundaire displays simuleren"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Activiteiten niet opslaan"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Activiteit wissen zodra de gebruiker deze verlaat"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Achtergrondgegevens in mobiele netwerken uitschakelen. Zo mogelijk worden niet-mobiele netwerken gebruikt."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Als u achtergrondgegevens wilt beperken voor deze app, moet u eerst een mobiele gegevenslimiet instellen."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Achtergrondgegevens beperken?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Deze functie kan ervoor zorgen dat een app die afhankelijk is van achtergrondgegevens, stopt als er alleen mobiele netwerken beschikbaar zijn."\n\n"U kunt meer geschikte besturingselementen voor gegevensgebruik vinden in de instellingen van de app."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Deze functie kan ervoor zorgen dat een app die afhankelijk is van achtergrondgegevens, stopt als er alleen mobiele netwerken beschikbaar zijn.\n\nU kunt meer geschikte besturingselementen voor gegevensgebruik vinden in de instellingen van de app."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"U kunt achtergrondgegevens alleen beperken als u een mobiele gegevenslimiet heeft ingesteld."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Auto-sync gegevens inschakelen?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Wijzigingen die u aanbrengt in uw accounts op internet worden automatisch naar uw tablet gekopieerd."\n\n"Sommige accounts kunnen de wijzigingen die u op uw telefoon aanbrengt ook automatisch naar het account op internet kopiëren. Een Google-account werkt op deze manier."\n\n"Ga naar \'Instellingen\' &gt; \'Accounts\' om te selecteren welke typen gegevens u met elk account wilt synchroniseren."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Wijzigingen die u aanbrengt in uw accounts op internet worden automatisch naar uw telefoon gekopieerd."\n\n"Sommige accounts kunnen de wijzigingen die u op uw telefoon aanbrengt ook automatisch naar het account op internet kopiëren. Een Google-account werkt op deze manier."\n\n"Ga naar \'Instellingen\' &gt; \'Accounts\' om te selecteren welke typen gegevens u met elk account wilt synchroniseren."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Wijzigingen die u aanbrengt in uw accounts op internet worden automatisch naar uw tablet gekopieerd.\n\nSommige accounts kunnen de wijzigingen die u op uw telefoon aanbrengt ook automatisch naar het account op internet kopiëren. Een Google-account werkt op deze manier.\n\nGa naar \'Instellingen\' &gt; \'Accounts\' om te selecteren welke typen gegevens u met elk account wilt synchroniseren."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Wijzigingen die u aanbrengt in uw accounts op internet worden automatisch naar uw telefoon gekopieerd.\n\nSommige accounts kunnen de wijzigingen die u op uw telefoon aanbrengt ook automatisch naar het account op internet kopiëren. Een Google-account werkt op deze manier.\n\nGa naar \'Instellingen\' &gt; \'Accounts\' om te selecteren welke typen gegevens u met elk account wilt synchroniseren."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Auto-sync gegevens uitschakelen?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Hiermee beperkt u gegevens- en accugebruik. U moet elk account echter handmatig synchroniseren om recente informatie te verzamelen. U ontvangt geen meldingen wanneer er updates zijn."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Herzieningsdatum voor gebruikscyclus"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Waarschuwing voor gegevensverbruik instellen"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Limiet voor gegevensverbruik instellen"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Gegevensgebruik beperken"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Uw mobiele gegevensverbinding wordt uitgeschakeld wanneer de gespecificeerde limiet is bereikt.\n\nAangezien 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\nAangezien 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" 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\nDeze 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\nDeze 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Verwijderde apps en gebruikers"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> ontvangen, <xliff:g id="SENT">%2$s</xliff:g> verzonden"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> gebruikt."</string>
     <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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"VPN-profiel toevoegen"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Profiel bewerken"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Profiel verwijderen"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Always-on VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecteer een VPN-profiel waarmee u altijd verbonden wilt blijven. Netwerkverkeer wordt alleen toegestaan bij verbinding met dit VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Geen"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Voor Always-on VPN is een IP-adres voor zowel de server als DNS vereist."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Er is geen netwerkverbinding. Probeer het later opnieuw."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Er ontbreekt een certificaat. Bewerk het profiel."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Systeem"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annuleren"</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">"Aanvullende systeemupdates"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Gebruikers en beperkingen"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Gebruikers"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Gebruiker toevoegen"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Details bewerken"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Gebruikersgegevens"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Naam"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Inhoudsbeperkingen"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Pincode vereisen"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Inhoudsbeoordeling"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Systeemapps"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Geïnstalleerde apps"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Verwijderen"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Gebruiker verwijderen"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Vervelend kind"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Disabled (Uitgeschakeld)"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive (Tolerant)"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing (Wordt afgedwongen)"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Gebruikers"</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="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\nNadat u een nieuwe gebruiker heeft gemaakt, moet die persoon een configuratieproces volgen.\n\nElke 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\nElke 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_confirm_remove_message" msgid="5284111415714437285">"Weet u zeker dat u de gebruiker en alle bijbehorende gegevens wilt verwijderen van het apparaat?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Lettergrootte wijzigen"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Beperkingen"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Beperkingen verwijderen"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Pincode wijzigen"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Meldingen weergeven"</string>
     <string name="help_label" msgid="1107174367904110532">"Help"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Account voor inhoud"</string>
+    <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="6160672982086584261">"App-beperkingen instellen"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Beheerd door <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Deze app wordt niet ondersteund voor beperkte profielen"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Deze app heeft toegang tot uw accounts"</string>
+    <string name="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 6de5d4a..8180172 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,16 +218,127 @@
     <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="886742181977884584">"Multimedia"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"przyciski multimediów"</item>
+    <item msgid="4547883971364273343">"aktywność audio"</item>
+    <item msgid="2603878814882344450">"głośność główna"</item>
+    <item msgid="7136963238377062018">"głośność mowy"</item>
+    <item msgid="4270236897655923007">"głośność dzwonka"</item>
+    <item msgid="6325739889222559394">"głośność multimediów"</item>
+    <item msgid="5762123934816216821">"głośność alarmu"</item>
+    <item msgid="785049718065337473">"głośność powiadomień"</item>
+    <item msgid="6700305533746877052">"głośność Bluetooth"</item>
+    <item msgid="2029227495214047094">"utrzymanie aktywności"</item>
+    <item msgid="26109888160231211">"monitorowanie lokalizacji"</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>
+    <item msgid="5753789168376302997">"Przyciski multimediów"</item>
+    <item msgid="3265262911688671938">"Aktywność audio"</item>
+    <item msgid="2098976479485046797">"Głośność główna"</item>
+    <item msgid="5660213838861789350">"Głośność mowy"</item>
+    <item msgid="7983336752371254444">"Głośność dzwonka"</item>
+    <item msgid="7878027809189330917">"Głośność multimediów"</item>
+    <item msgid="7260546305036218513">"Głośność alarmu"</item>
+    <item msgid="9103719301075748925">"Głośność powiadomień"</item>
+    <item msgid="7025966722295861512">"Głośność Bluetooth"</item>
+    <item msgid="4665183401128289653">"Utrzymanie aktywności"</item>
+    <item msgid="8584357129746649222">"Lokalizacja"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krótkie"</item>
     <item msgid="2560532955514699713">"Średnie"</item>
     <item msgid="2372711992605524591">"Długie"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (debugowanie)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Użyj Dalvik"</item>
+    <item msgid="5131846588686178907">"Użyj ART"</item>
+    <item msgid="4530003713865319928">"Użyj komplikacji debugowania ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nigdy nie sprawdzaj"</item>
     <item msgid="6042769699089883931">"Sprawdzaj tylko w przypadku treści chronionych DRM"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Skala animacji 5x"</item>
     <item msgid="1069584980746680398">"Skala animacji 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Brak"</item>
+    <item msgid="688482401508173818">"720 x 480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280 x 720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280 x 720 tvdpi oraz 1920 x 1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Brak"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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łączone"</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łączone"</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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Wył."</item>
+    <item msgid="7688197031296835369">"Pokaż przerysowywane obszary"</item>
+    <item msgid="8332661909019981149">"Pokaż licznik przerysowań"</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>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Przekroczono czas oczekiwania"</item>
     <item msgid="7664124146786465092">"Niepowodzenie"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Zapytaj"</item>
+    <item msgid="5077768429488260031">"Nigdy nie zezwalaj"</item>
+    <item msgid="1417929597727989746">"Zawsze zezwalaj"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e5799f8..d088142 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Tak"</string>
     <string name="no" msgid="6731231425810196216">"Nie"</string>
     <string name="create" msgid="3578857613172647409">"Utwórz"</string>
+    <string name="allow" msgid="3349662621170855910">"Zezwól"</string>
+    <string name="deny" msgid="6947806159746484865">"Odmów"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nieznany"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Od zostania programistą dzieli Cię już tylko <xliff:g id="STEP_COUNT">%1$d</xliff:g> krok."</item>
+    <item quantity="other" msgid="6722953419953594148">"Od zostania programistą dzieli Cię już tylko tyle kroków: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Jesteś teraz programistą!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"W porządku, już jesteś programistą."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"SIECI ZWYKŁE I BEZPRZEWODOWE"</string>
     <string name="header_category_device" msgid="5781174212691167553">"URZĄDZENIE"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"OSOBISTE"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Ładowanie"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"rozładowywanie"</string>
-    <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nie ładuje"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(bezprzewodowo)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Nie podłączony"</string>
+    <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nie podłączony"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Pełna"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Odłączone"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"Zasilacz"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"bezprzewodowo"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"Zasilacz i USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Nieznane"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Nieznane"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Nieznany błąd"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Zimna"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Wykrywalny"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Widoczne dla wszystkich urządzeń Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Widoczne dla wszystkich urządzeń Bluetooth"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Niewidoczne dla innych urządzeń Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Widoczne tylko dla urządzeń sparowanych"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Zezwalaj na wykrywanie urządzenia"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Czas widoczności"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Ustaw czas, przez jaki urządzenie będzie wykrywalne"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Zablokuj wybieranie głosowe"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zapobiegaj używaniu wybierania Bluetooth, gdy ekran jest zablokowany"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Lista urządzeń"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Pokaż odebrane pliki"</string>
     <string name="device_picker" msgid="8398232791303186677">"Wybór urządzenia Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Prośba o pozwolenie na włączenie modułu Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Aplikacja chce włączyć moduł Bluetooth. Zezwolić?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Aplikacja na tablecie chce go ustawić jako wykrywalny dla innych urządzeń Bluetooth przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Zezwolić?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Aplikacja na telefonie chce go ustawić jako wykrywalny dla innych urządzeń Bluetooth przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Zezwolić?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Aplikacja na tablecie chce go ustawić jako zawsze wykrywalny dla innych urządzeń Bluetooth. Zezwolić?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Aplikacja na telefonie chce go ustawić jako zawsze wykrywalny dla innych urządzeń Bluetooth. Zezwolić?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Aplikacja na tablecie chce włączyć moduł Bluetooth i ustawić tablet jako wykrywalny dla innych urządzeń przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Zezwolić?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Aplikacja na telefonie chce włączyć moduł Bluetooth i ustawić telefon jako wykrywalny dla innych urządzeń przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Zezwolić?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Aplikacja na tablecie chce włączyć moduł Bluetooth i ustawić tablet jako wykrywalny dla innych urządzeń. Zezwolić?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Aplikacja na telefonie chce włączyć moduł Bluetooth i ustawić telefon jako wykrywalny dla innych urządzeń. Zezwolić?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikacja chce włączyć Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikacja chce ustawić Twój tablet jako wykrywalny dla innych urządzeń Bluetooth przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikacja chce ustawić Twój telefon jako wykrywalny dla innych urządzeń Bluetooth przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikacja chce ustawić Twój tablet jako wykrywalny dla innych urządzeń Bluetooth. Później możesz to zmienić w ustawieniach Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Aplikacja chce ustawić Twój telefon jako wykrywalny dla innych urządzeń Bluetooth. Później możesz to zmienić w ustawieniach Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Aplikacja chce włączyć Bluetooth i ustawić tablet jako wykrywalny dla innych urządzeń przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Aplikacja chce włączyć Bluetooth i ustawić telefon jako wykrywalny dla innych urządzeń przez <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Aplikacja chce włączyć Bluetooth i ustawić Twój tablet jako wykrywalny dla innych urządzeń. Później możesz to zmienić w ustawieniach Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Aplikacja chce włączyć Bluetooth i ustawić Twój telefon jako wykrywalny dla innych urządzeń. Później możesz to zmienić w ustawieniach Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Włączanie Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Wyłączanie Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Połącz automatycznie"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Serwer proxy HTTP jest używany przez przeglądarkę, ale inne aplikacje mogą go nie używać."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokalizacja:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Sąsiadujący CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informacje:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Próby danych:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Usługa GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Włącz"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Z zezwoleniem na roaming danych mogą się wiązać wysokie opłaty roamingowe."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Po zezwoleniu na przesyłanie danych w roamingu mogą zostać naliczone znaczne opłaty za roaming.\n\nTo ustawienie obowiązuje wszystkich użytkowników tego tabletu."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Po zezwoleniu na przesyłanie danych w roamingu mogą zostać naliczone znaczne opłaty za roaming.\n\nTo ustawienie obowiązuje wszystkich użytkowników tego telefonu."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Zezwalać na roaming danych?"</string>
     <string name="networks" msgid="6333316876545927039">"Wybór operatora"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Wybierz operatora sieci."</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Informacje o właścicielu"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Wymagaj podania kodu PIN lub hasła w celu odszyfrowania tabletu przy każdym uruchomieniu"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Wymagaj podania kodu PIN lub hasła w celu odszyfrowania telefonu przy każdym uruchomieniu"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Zaszyfrowane"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje i ich dane, multimedia oraz inne pliki. Po zaszyfrowaniu tabletu musisz wpisać numeryczny kod PIN lub hasło do odszyfrowania po każdym włączeniu urządzenia. Tablet można odszyfrować jedynie przez przywrócenie danych fabrycznych i usunięcie wszystkich swoich danych."\n\n"Szyfrowanie może potrwać godzinę lub dłużej. Rozpocznij, gdy bateria jest w pełni naładowana i nie odłączaj tabletu od zasilania do chwili ukończenia szyfrowania. Jeśli proces zostanie przerwany, utracisz część lub nawet wszystkie swoje dane."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje i ich dane, multimedia oraz inne pliki. Po zaszyfrowaniu telefonu musisz wpisać numeryczny kod PIN lub hasło do odszyfrowania po każdym włączeniu urządzenia. Telefon można odszyfrować jedynie przez przywrócenie danych fabrycznych i usunięcie wszystkich swoich danych."\n\n"Szyfrowanie może potrwać godzinę lub dłużej. Rozpocznij, gdy bateria jest w pełni naładowana i nie odłączaj telefonu od zasilania do chwili ukończenia szyfrowania. Jeśli proces zostanie przerwany, utracisz część lub nawet wszystkie swoje dane."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje i ich dane, multimedia oraz inne pliki. Po zaszyfrowaniu tabletu musisz wpisać numeryczny kod PIN lub hasło do odszyfrowania po każdym włączeniu urządzenia. Tablet można odszyfrować jedynie przez przywrócenie danych fabrycznych i usunięcie wszystkich swoich danych.\n\nSzyfrowanie może potrwać godzinę lub dłużej. Rozpocznij, gdy bateria jest w pełni naładowana i nie odłączaj tabletu od zasilania do chwili ukończenia szyfrowania. Jeśli proces zostanie przerwany, utracisz część lub nawet wszystkie swoje dane."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje i ich dane, multimedia oraz inne pliki. Po zaszyfrowaniu telefonu musisz wpisać numeryczny kod PIN lub hasło do odszyfrowania po każdym włączeniu urządzenia. Telefon można odszyfrować jedynie przez przywrócenie danych fabrycznych i usunięcie wszystkich swoich danych.\n\nSzyfrowanie może potrwać godzinę lub dłużej. Rozpocznij, gdy bateria jest w pełni naładowana i nie odłączaj telefonu od zasilania do chwili ukończenia szyfrowania. Jeśli proces zostanie przerwany, utracisz część lub nawet wszystkie swoje dane."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Zaszyfruj tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Zaszyfruj telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Naładuj baterię i spróbuj ponownie."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Spróbuj ponownie za <xliff:g id="DELAY">^1</xliff:g> s."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Wpisz swoje hasło."</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Szyfrowanie zakończone niepowodzeniem"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Szyfrowanie zostało przerwane i nie można go dokończyć. Z tego powodu dane znajdujące się w tablecie nie są już dostępne. "\n\n"Aby dalej używać tabletu, musisz przywrócić dane fabryczne. Podczas konfigurowania po zresetowaniu będziesz mieć możliwość przywrócenia wszelkich danych, których kopia zapasowa została utworzona na koncie Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Szyfrowanie zostało przerwane i nie można go dokończyć. Z tego powodu dane znajdujące się w telefonie nie są już dostępne. "\n\n"Aby dalej używać telefonu, musisz przywrócić dane fabryczne. Podczas konfigurowania po zresetowaniu będziesz mieć możliwość przywrócenia wszelkich danych, których kopia zapasowa została utworzona na koncie Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Szyfrowanie zostało przerwane i nie można go dokończyć. Z tego powodu dane znajdujące się w tablecie nie są już dostępne. \n\nAby dalej używać tabletu, musisz przywrócić dane fabryczne. Podczas konfigurowania po zresetowaniu będziesz mieć możliwość przywrócenia wszelkich danych, których kopia zapasowa została utworzona na koncie Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Szyfrowanie zostało przerwane i nie można go dokończyć. Z tego powodu dane znajdujące się w telefonie nie są już dostępne. \n\nAby dalej używać telefonu, musisz przywrócić dane fabryczne. Podczas konfigurowania po zresetowaniu będziesz mieć możliwość przywrócenia wszelkich danych, których kopia zapasowa została utworzona na koncie Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Przełącz metodę wprowadzania"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Wybierz blokadę ekranu"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Wybierz blokadę zapasową"</string>
@@ -334,12 +348,12 @@
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Zmień blokadę ekranu"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Zmień lub wyłącz zabezpieczenie ekranu (wzór, PIN lub hasło)"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Wybierz sposób blokowania ekranu"</string>
-    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Wybierz sposób odblokowania w przypadku, gdy Face Unlock Cię nie rozpozna."</string>
+    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Wybierz sposób odblokowania w przypadku, gdy Rozpoznanie twarzy nie zadziała."</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Brak"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Przesunięcie palcem"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Bez zabezpieczeń"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</string>
+    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Rozpoznanie twarzy"</string>
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Niski poziom zabezpieczeń, eksperymentalny"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Wzór"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Średni poziom zabezpieczeń"</string>
@@ -350,7 +364,7 @@
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Wyłączone przez administratora lub ze względu na zasady szyfrowania albo magazyn danych logowania"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Brak"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Przesunięcie palcem"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
+    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Rozpoznanie twarzy"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Wzór"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"Kod PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Hasło"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Zmień kod PIN odblokowania"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Zmień hasło odblokowania"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Liczba znaków w haśle musi wynosić co najmniej %d"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN musi mieć co najmniej %d znaki"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN musi mieć co najmniej %d cyfr"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Gdy skończysz, wybierz Kontynuuj"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Kontynuuj"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Hasło musi mieć mniej znaków niż <xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -406,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>
@@ -480,64 +503,98 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Jako telefon w trybie głośnika"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Dla muzyki i multimediów"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamiętaj ustawienia"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Sparowane wyświetlacze"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dostępne urządzenia"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Łączenie"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Połączony"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Dostępny"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"W użyciu"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Ustawienia wyświetlacza"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Rozłączyć?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Spowoduje to zakończenie połączenia z:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Opcje wyświetlacza bezprzewodowego"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Zapomnij"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Gotowe"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Nazwa"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Wł."</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Wył."</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Wyłączona"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"Komunikacja NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Zezwalaj na wymianę danych, gdy tablet dotyka innego urządzenia"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Zezwalaj na wymianę danych, gdy telefon dotyka innego urządzenia."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Gotowy do przesyłania treści aplikacji przez NFC"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Gotowy do przesyłania danych między aplikacjami przez NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Wyłączona"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Niedostępne przy wyłączonym NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Po włączeniu tej funkcji możesz przesyłać dane między urządzeniami z funkcją NFC, zbliżając oba aparaty do siebie. Możliwe jest na przykład przesłanie stron z przeglądarki, filmów z YouTube, kontaktów z telefonu itp."\n\n"Wystarczy zetknąć urządzenia ze sobą i dotknąć ekranu. Aplikacja automatycznie określi, jakie dane chcesz przesłać."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Po włączeniu tej funkcji możesz przesyłać dane między urządzeniami z funkcją NFC, zbliżając oba aparaty do siebie. Możliwe jest na przykład przesłanie stron z przeglądarki, filmów z YouTube, kontaktów z telefonu itp.\n\nWystarczy zetknąć urządzenia ze sobą 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="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="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="8116564886303972764">"Wpisz <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_in_progress" msgid="2944576520214787628">"Konfigurowanie WPS już trwa i może potrwać nawet dwie minuty"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Ustawienie zabezpieczeń routera bezprzewodowego (TKIP) nie jest obsługiwane"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Błąd uwierzytelniania. Spróbuj ponownie."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Wykryto inną sesję WPS. Spróbuj ponownie za kilka minut."</string>
     <string name="wifi_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>
@@ -564,6 +621,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\nZezwolić 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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Zapisz"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nie udało się zapisać sieci"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Anuluj"</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_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\nKonfiguracja 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\nKonfiguracja 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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Wyszukiwanie…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Zmień nazwę urządzenia"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Urządzenia Peer"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Zapamiętane grupy"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Nie udało się połączyć."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Zmiana nazwy urządzenia nie powiodła się."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Rozłączyć?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Po rozłączeniu Twoje połączenie z <xliff:g id="PEER_NAME">%1$s</xliff:g> i <xliff:g id="PEER_COUNT">%2$s</xliff:g> innymi urządzeniami zostanie zakończone."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Przenośny punkt Wi-Fi"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Zapomnieć o tej grupie?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Przenośny hotspot Wi-Fi"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Efekty muzyczne"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Głośność dzwonka"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Wibracje po wyciszeniu"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Powiadomienie domyślne"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Domyślny dźwięk powiadomienia"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsująca dioda"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Dzwonek"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Powiadomienie"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Użyj głośności połączeń przychodzących dla powiadomień"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Wybierz dzwonek powiadomienia"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Domyślny dźwięk powiadomienia"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Multimedia"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Ustaw głośność muzyki oraz filmów wideo"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Wybierz tapetę z..."</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Upiększanie ekranu"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"W trybie uśpienia, jeśli jest podłączone zasilanie."</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Wyłączone"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Wybrane upiększenia"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Włączenie wygaszacza"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nigdy"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Wypróbuj"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Także, gdy zadokowany."</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Wygaszacz ekranu"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Podczas zadokowania lub uśpienia i ładowania"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Zadokowany lub ładowany"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Podczas ładowania"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Podczas zadokowania"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Wył."</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Aby kontrolować to, co dzieje się, gdy telefon jest zadokowany i/lub w trybie uśpienia, włącz Wygaszacz ekranu."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Ustawienia wygaszacza"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Zacznij teraz"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Ustawienia"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatyczna"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Rozmiar czcionki"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Rozmiar czcionki"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"Kod PIN do karty SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Błędny kod PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Kody PIN nie są identyczne."</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Nie można zmienić kodu PIN."\n"Wpisany kod PIN może być błędny."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Nie można zmienić kodu PIN.\nWpisany kod PIN może być błędny."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Kod PIN do karty SIM został pomyślnie zmieniony"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Nie można zmienić stanu blokady karty SIM."\n"Wpisany kod PIN może być błędny."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Nie można zmienić stanu blokady karty SIM.\nWpisany kod PIN może być błędny."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Anuluj"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stan tabletu"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Wersja pasma podstawowego"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Wersja jądra"</string>
     <string name="build_number" msgid="3075795840572241758">"Numer kompilacji"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Stan SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Niedostępna"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Informacje o telefonie"</string>
     <string name="device_status" msgid="607405385799807324">"Informacje o telefonie"</string>
@@ -733,12 +807,13 @@
     <string name="status_meid_number" msgid="1751442889111731088">"Numer MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Typ sieci komórkowej"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Informacje o operatorze"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Stan sieci komórkowej"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Stan usługi"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Nośnik USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Karta SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"Wolne"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Dostępne (tylko do odczytu)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Całkowita pojemność"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Obliczanie..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikacje (dane aplikacji i multimedia)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Zdjęcia, filmy"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Dźwięk (muzyka, dzwonki, podcasty itp.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Różne"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Dane w pamięci podręcznej"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Odłącz pamięć współdzieloną"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Odłącz kartę SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Odłącz wewnętrzny nośnik USB"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Wyczyść kartę SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Wymazuje wszystkie dane z wewnętrznego nośnika USB, np. pliki muzyczne i zdjęcia"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Wymazuje z karty SD telefonu wszystkie dane, takie jak muzyka czy zdjęcia"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Tylko do odczytu)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Wyczyścić dane z pamięci podręcznej?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Spowoduje to wyczyszczenie danych z pamięci podręcznej wszystkich aplikacji."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Funkcja MTP lub PTP jest aktywna"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Odłączyć nośnik USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Odłączyć kartę SD?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Jeśli odłączysz nośnik USB, niektóre używane aplikacje zostaną zatrzymane i mogą być niedostępne do chwili jego ponownego podłączenia."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Aparat (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Umożliwia przesyłanie zdjęć za pomocą oprogramowania aparatu, a także przesyłanie dowolnych plików na komputerach, które nie obsługują urządzeń MTP."</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instaluj narzędzia do transferu plików"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Inni użytkownicy"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stan baterii"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Poziom naładowania baterii"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Nazwy APN"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Ustawienia fabryczne"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Wymazuje wszystkie dane z tabletu"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Wymazuje wszystkie dane w telefonie"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" tabletu, w tym:"\n\n<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" telefonu, w tym:"\n\n<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Zalogowano się na konta:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" tabletu, w tym:\n\n"<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" telefonu, w tym:\n\n"<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Zalogowano się na konta:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzyka"</li>\n<li>"Zdjęcia"</li>\n<li>"Inne dane użytkownika"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"nośnik USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"kartę SD"</b>"."</string>
@@ -870,7 +952,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>
@@ -897,16 +979,21 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Powiązanie z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie anulowane."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoc"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Sieci komórkowe"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Zarządzaj abonamentem komórkowym"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Nieznany operator karty SIM"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s nie ma znanej witryny obsługi"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Włóż kartę SIM i zrestartuj urządzenie"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Połącz się z internetem"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokalizacja"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"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 w przybliżeniu 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_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="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>
     <string name="assisted_gps" msgid="4649317129586736885">"Użyj wspomaganego systemu GPS"</string>
-    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Użyj serwera do wspomagania systemu GPS (usuń zaznaczenie, aby zmniejszyć ruch sieciowy)"</string>
-    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Użyj serwera do wspomagania systemu GPS (usuń zaznaczenie, aby zwiększyć wydajność systemu GPS)"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"Użyj serwera do wspomagania systemu GPS (odznacz, aby zmniejszyć ruch sieciowy)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"Użyj serwera do wspomagania systemu GPS (odznacz, aby zwiększyć wydajność systemu GPS)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"Lokalizacja w sieci"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Zezwalaj Google na użycie danych o mojej lokalizacji, aby poprawić wyszukiwanie i inne usługi"</string>
     <string name="location_access_title" msgid="7064108942964081243">"Dostęp do mojej lokalizacji"</string>
@@ -917,6 +1004,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Wyświetl informacje prawne, stan, wersję oprogramowania"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informacje prawne"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Współautorzy"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Informacje prawne"</string>
     <string name="copyright_title" msgid="865906688917260647">"Prawa autorskie"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencja"</string>
     <string name="terms_title" msgid="7697580845616764642">"Warunki i zasady korzystania"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Zmień kod PIN odblokowania"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potwierdź zapisany wzór"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Spróbuj ponownie:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Narysuj wzór odblokowania"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Narysuj wzór odblokowania:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Naciśnij Menu, aby uzyskać pomoc."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Puść palec, gdy gotowe."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Połącz co najmniej <xliff:g id="NUMBER">%d</xliff:g> kropki. Spróbuj jeszcze raz:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Jak narysować wzór odblokowania"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Zbyt wiele nieudanych prób!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Spróbuj ponownie za <xliff:g id="NUMBER">%d</xliff:g> sekund."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Anuluj"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Dalej"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Zabezpieczanie tabletu"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Zabezpieczanie telefonu"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Chroń swój tablet przed nieautoryzowanym użyciem, tworząc osobisty wzór odblokowania ekranu. Na następnym ekranie połącz palcem co najmniej cztery kropki w dowolnej kolejności. "\n\n"Wszystko gotowe? Wybierz Dalej."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Chroń swój telefon przed nieautoryzowanym użyciem, tworząc osobisty wzór odblokowania ekranu. Na następnym ekranie połącz palcem co najmniej cztery kropki w dowolnej kolejności. "\n\n"Wszystko gotowe? Wybierz Dalej."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Aplikacja nie jest zainstalowana na telefonie."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Zarządzaj aplikacjami"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Zarządzaj zainstalowanymi aplikacjami i usuwaj je."</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplikacje"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Zezwalaj na instalowanie aplikacji z nieznanych źródeł"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Twój tablet i dane osobiste są bardziej narażone na ataki aplikacji z nieznanych źródeł. Akceptujesz fakt, że ponosisz wyłączną odpowiedzialność za wszelkie możliwe szkody w tablecie i utratę danych w wyniku korzystania z tych aplikacji."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Twój telefon i dane osobiste są bardziej narażone na ataki aplikacji z nieznanych źródeł. Akceptujesz fakt, że ponosisz wyłączną odpowiedzialność za wszelkie możliwe szkody w telefonie i utratę danych w wyniku korzystania z tych aplikacji."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Weryfikuj aplikacje"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Zablokuj instalowanie potencjalnie szkodliwych aplikacji lub wyświetl ostrzeżenie przed instalacją"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Ustawienia zaawansowane"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Włącz więcej opcji ustawień."</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informacje o aplikacji"</string>
@@ -1001,7 +1086,9 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dane w pamięci USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Karta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Odinstaluj"</string>
-    <string name="disable_text" msgid="6544054052049395202">"Dezaktywuj"</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">"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>
@@ -1019,17 +1106,19 @@
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na karcie SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Wyłączone"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Nie zainstalowano"</string>
     <string name="no_applications" msgid="7336588977497084921">"Brak aplikacji"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Pamięć wewnętrzna"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Nośnik USB"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> i <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"W aplikacji mogą być pobierane opłaty:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Wyślij droższego SMS-a"</string>
     <string name="computing_size" msgid="1599186977475211186">"Przetwarzanie..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Nie udało się obliczyć rozmiaru pakietu."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Nie masz zainstalowanych żadnych aplikacji firm zewnętrznych."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Zmień preferowaną lokalizację instalacji nowych aplikacji."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Wyłączyć wbudowaną aplikację?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Jeśli wyłączysz wbudowaną aplikację, inne aplikacje mogą działać nieprawidłowo."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Usunąć dane i wyłączyć aplikację?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <string name="memory" msgid="6609961111091483458">"Pamięć RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Użytkownik: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Użytkownik usunięty"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces, <xliff:g id="NUMSERVICES">%2$d</xliff:g> usługa"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces, <xliff:g id="NUMSERVICES">%2$d</xliff:g> usługi"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesy, <xliff:g id="NUMSERVICES">%2$d</xliff:g> usługa"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Ustawienia klawiatury fizycznej"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Naciśnij dwukrotnie klawisz spacji, aby wstawić kropkę"</string>
     <string name="show_password" msgid="3001113966880559611">"Hasła są widoczne"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Ta metoda wprowadzania może gromadzić cały wpisywany tekst, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Pochodzi ona z aplikacji <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Użyć jej?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Ten moduł sprawdzania pisowni może gromadzić cały wpisywany tekst, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Pochodzi on z aplikacji <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Użyć go?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Ustawienia"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Control-spacja, by przełączyć"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Domyślna"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Układy klawiatury"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Słownik użytkownika"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Słownik osobisty"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osobiste słowniki"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Słownik osobisty"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Dodaj"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Dodaj do słownika"</string>
@@ -1157,6 +1252,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>
@@ -1168,7 +1265,7 @@
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Informacje o telefonie"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Informacje o baterii"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Szybkie uruchamianie"</string>
-    <string name="quick_launch_summary" msgid="8101133819188001190">"Ustaw skróty klawiaturowe, aby uruchamiać aplikacje."</string>
+    <string name="quick_launch_summary" msgid="8101133819188001190">"Ustaw skróty klawiszowe, aby uruchamiać aplikacje."</string>
     <string name="quick_launch_assign_application" msgid="6240064079456617501">"Przypisz aplikację"</string>
     <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Brak skrótu"</string>
     <string name="quick_launch_shortcut" msgid="5090405067413522300">"Szukaj + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
@@ -1197,24 +1294,38 @@
     <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="keep_screen_on" msgid="1146389631208760344">"Zostaw włączony"</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">"Pozostaw ekran włączony"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekran nie będzie gaszony podczas ładowania telefonu"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Włącz dziennik analizatora snoop Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Przechwyć wszystkie pakiety Bluetooth HCI do pliku"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Wybierz czas wykonywania"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Wybierz czas wykonywania"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Uruchomić ponownie, by zmienić czas wykonywania z <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</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="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>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Gdy nośnik USB jest chroniony, aplikacje muszą prosić o pozwolenie na odczyt danych z tego nośnika zewnętrznego."\n\n"Niektóre aplikacje mogą przestać działać i wymagać aktualizacji przez programistę."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Gdy nośnik USB jest chroniony, aplikacje muszą prosić o pozwolenie na odczyt danych z tego nośnika zewnętrznego.\n\nNiektóre aplikacje mogą przestać działać i wymagać aktualizacji przez programistę."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Chroń kartę SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikacje muszą prosić o pozwolenie na odczyt karty SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Włączyć ochronę karty SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Gdy karta SD jest chroniona, aplikacje muszą prosić o pozwolenie na odczyt danych z tego nośnika zewnętrznego."\n\n"Niektóre aplikacje mogą przestać działać i wymagać aktualizacji przez programistę."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Gdy karta SD jest chroniona, aplikacje muszą prosić o pozwolenie na odczyt danych z tego nośnika zewnętrznego.\n\nNiektóre aplikacje mogą przestać działać i wymagać aktualizacji przez programistę."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal lokalny"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Włącz terminal, który umożliwia dostęp do powłoki lokalnej"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Wybierz gadżet"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Wybierz widżet"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Utworzyć widżet i zezwolić na dostęp?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Ustawienia ułatwień dostępu"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Usługi"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Duży tekst"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Przycisk kończy rozmowę"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Wypowiadaj hasła na głos"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Czas dotknięcia i przytrzymania"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Zwiększenie dostępności stron"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gesty powiększania"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kiedy ta funkcja jest włączona, możesz powiększyć i pomniejszyć obraz, trzykrotnie klikając ekran.\n\nW trybie powiększenia możesz:\n"<ul><li>"Przesuwać: przeciągnij palcami po ekranie."</li>\n<li>"Regulować powiększenie: ściągnij lub rozsuń palce."</li></ul>\n\n"Możesz też tymczasowo powiększyć miejsce pod palcem, klikając trzykrotnie i przytrzymując palec na ekranie. W takim widoku „lupy” możesz przesuwać palcem po ekranie i powiększać różne miejsca. Podniesienie palca spowoduje powrót do poprzedniego widoku.\n\nUwaga: trzykrotne kliknięcie powiększające działa wszędzie poza klawiaturą i paskiem nawigacji."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Skrót ułatwień dostępu"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Wł."</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Wył."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kiedy ta funkcja jest aktywna, możesz szybko włączyć ułatwienia dostępu w dwóch krokach:\n\nKrok 1: naciśnij i przytrzymaj przycisk zasilania, aż usłyszysz sygnał lub poczujesz wibracje.\n\nKrok 2: naciśnij i przytrzymaj ekran dwoma palcami, aż usłyszysz potwierdzenie dźwiękowe.\n\nJeśli z tego urządzenia korzysta kilka osób, użycie tego skrótu na zablokowanym ekranie spowoduje tymczasowe włączenie ułatwień dostępu do momentu zablokowania urządzenia."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Duży tekst"</string>
+    <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 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_menu_item_settings" msgid="3344942964710773365">"Ustawienia"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Włączone"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Wyłączone"</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="accessibility_feature_state_on" msgid="2864292320042673806">"Wł."</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Wył."</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="print_settings" msgid="4742428530112487843">"Drukowanie"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Ustawienia drukowania"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Usługi"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Użyć usługi <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> może odbierać drukowane przez Ciebie dokumenty, które mogą zawierać poufne dane."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Brak zainstalowanych usług"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Ustawienia"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Dodaj drukarki"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Włączone"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Wyłączone"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Gdzie wykorzystywana jest bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Brak danych o zużyciu baterii"</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Dane odebrane"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Dane komórkowe zostały wysłane"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Dane komórkowe zostały odebrane"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Dane Wi‑Fi zostały wysłane"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Dane Wi‑Fi zostały odebrane"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Dźwięk"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Wideo"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Czas włączenia"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Zatrzymaj lub odinstaluj aplikację."</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Włączaj i wyłączaj GPS ręcznie, aby kontrolować jego użycie w aplikacjach."</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplikacja może oferować ustawienia pozwalające zmniejszyć użycie baterii."</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Użycie baterii przez użytkownika"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odłączenia"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ostatnio odłączony na <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Łączne użycie"</string>
@@ -1350,17 +1478,19 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tony"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Określa ton czytanego tekstu"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Język"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nie wybrano języka"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ustawia zależny od języka głos dla czytanych tekstów"</string>
     <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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Jasność <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatyczna"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"pełna"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"do połowy"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"wyłączona"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Magazyn danych logowania"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Zainstaluj z nośnika"</string>
@@ -1390,6 +1534,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>
@@ -1411,22 +1558,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="bugreport_title" msgid="1009498799922543551">"Zgłoś błąd"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Informacje o bieżącym stanie urządzenia zostaną zebrane i wysłane e-mailem. Przygotowanie zgłoszenia błędu do wysłania chwilę potrwa, więc zachowaj cierpliwość."</string>
-    <string name="report" msgid="302437572240018342">"Zgłoś"</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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nKliknij "<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>
@@ -1482,7 +1626,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">"Autosynchronizuj 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>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalendarz"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kontakty"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Google Sync – witamy!"</font>" "\n"Synchronizacja danych daje Ci dostęp do kontaktów, wydarzeń i innych ważnych informacji z dowolnego miejsca."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Google Sync – witamy!"</font>" \nSynchronizacja danych daje Ci dostęp do kontaktów, wydarzeń i innych ważnych informacji z dowolnego miejsca."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Ustawienia synchronizacji aplikacji"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dane i synchronizacja"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Zmień hasło"</string>
@@ -1534,50 +1678,55 @@
     <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="debug_input_category" msgid="1811069939601180246">"Wprowadzanie"</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>
     <string name="pointer_location" msgid="6084434787496938001">"Lokalizacja wskaźnika"</string>
-    <string name="pointer_location_summary" msgid="840819275172753713">"Nakładka na ekranie pokazująca dane o dotyku"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Nakładka pokazująca dane o dotknięciach ekranu"</string>
     <string name="show_touches" msgid="1356420386500834339">"Pokaż dotknięcia"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Potwierdzenia wizualne po dotknięciu"</string>
     <string name="show_screen_updates" msgid="5470814345876056420">"Pokaż zmiany powierzchni"</string>
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Podświetlaj całe aktualizowane powierzchnie okien"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Pokaż zmiany widoku z GPU"</string>
-    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Podświetlaj widoki w oknach rysowane przez GPU"</string>
+    <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Podświetlaj elementy w oknach jeśli są rysowane przez GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Pokaż zmiany warstw sprzęt."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Oznaczaj aktualizowane warstwy sprzętowe na zielono"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Debuguj przerysowania GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Pokaż użycie procesora"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Nakładka na ekranie pokazująca użycie procesora"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Renderowanie na GPU"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Symuluj ekrany dodatkowe"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikacje"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Nie zachowuj działań"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Przerwij każde działanie, gdy użytkownik je porzuci"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Wyłącz dane w tle w sieciach komórkowych (nadal używaj w innych sieci)."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Transmisję danych w tle możesz ograniczyć po ustawieniu limitu."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Ograniczyć dane w tle?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Gdy będą dostępne tylko sieci komórkowe, funkcja ta może zakłócić działanie aplikacji, które korzystają z przesyłu danych w tle."\n\n"Szczegółowe ustawienia transmisji danych są zazwyczaj dostępne bezpośrednio w poszczególnych aplikacjach."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Gdy będą dostępne tylko sieci komórkowe, funkcja ta może zakłócić działanie aplikacji, które korzystają z przesyłu danych w tle.\n\nSzczegółowe ustawienia transmisji danych są zazwyczaj dostępne bezpośrednio w poszczególnych aplikacjach."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Ograniczenie transmisji danych w tle jest możliwe tylko po ustawieniu limitu komórkowej transmisji danych."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Włączyć autosynchronizację?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Wszystkie zmiany, które wprowadzisz na swoich kontach w sieci, będą automatycznie kopiowane na Twój tablet."\n\n"Niektóre konta mogą też kopiować do sieci wszystkie zmiany, które wprowadzisz na tablecie. W ten sposób działa konto Google."\n\n"Aby wybrać informacje synchronizowane przez poszczególne konta, wyświetl Ustawienia &gt; Konta."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Wszystkie zmiany, które wprowadzisz na swoich kontach w sieci, będą automatycznie kopiowane na Twój telefon."\n\n"Niektóre konta mogą też kopiować do sieci wszystkie zmiany, które wprowadzisz na telefonie. W ten sposób działa konto Google."\n\n"Aby wybrać informacje synchronizowane przez poszczególne konta, wyświetl Ustawienia &gt; Konta."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Wszystkie zmiany, które wprowadzisz na swoich kontach w sieci, będą automatycznie kopiowane na Twój tablet.\n\nNiektóre konta mogą też kopiować do sieci wszystkie zmiany, które wprowadzisz na tablecie. W ten sposób działa konto Google.\n\nAby wybrać informacje synchronizowane przez poszczególne konta, wyświetl Ustawienia &gt; Konta."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Wszystkie zmiany, które wprowadzisz na swoich kontach w sieci, będą automatycznie kopiowane na Twój telefon.\n\nNiektóre konta mogą też kopiować do sieci wszystkie zmiany, które wprowadzisz na telefonie. W ten sposób działa konto Google.\n\nAby wybrać informacje synchronizowane przez poszczególne konta, wyświetl Ustawienia &gt; Konta."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Wyłączyć autosynchronizację?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Powoduje przesyłanie mniejszej ilości danych oraz zmniejsza użycie baterii, ale pobranie najnowszych informacji będzie wymagało ręcznej synchronizacji każdego konta. Poza tym nie będziesz otrzymywać powiadomień o aktualizacjach."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data resetowania cyklu transmisji danych"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Ustaw ostrzeżenie o transmisji danych"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Ustaw limit danych"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograniczanie transmisji danych"</string>
-    <string name="data_usage_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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Komórkowe połączenie transmisji danych zostanie wyłączone po wyczerpaniu limitu.\n\nIlość 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\nIlość 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" 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\nUstawienie 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\nUstawienie 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Usunięte aplikacje i użytkownicy"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"Odebrano: <xliff:g id="RECEIVED">%1$s</xliff:g>, wysłano: <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>: wykorzystane <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>: 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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Dodaj profil VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Edytuj profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Usuń profil"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Zawsze włączona sieć VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Wybierz profil VPN, który będzie zawsze podłączony. Ruch w sieci będzie dopuszczalny tylko podczas połączenia z tą siecią VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Brak"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"W przypadku zawsze włączonej sieci VPN wymagany jest adres IP zarówno dla serwera, jak i dla DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Brak połączenia sieciowego. Spróbuj ponownie później."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Brak certyfikatu. Edytuj profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Anuluj"</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">"Dodatkowe aktualizacje systemu"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Użytkownicy i ograniczenia"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Użytkownicy"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj użytkownika"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Edytuj szczegóły"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Informacje o użytkowniku"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Nazwa"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Ograniczenia treści"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Wymagaj PIN-u"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Ocena treści"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Aplikacje systemowe"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Zainstalowane aplikacje"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Odrzuć"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Usuń użytkownika"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Nieznośny dzieciak"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Wyłączony"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Pobłażliwy"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Restrykcyjny"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Użytkownicy"</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="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\nPo utworzeniu nowego użytkownika musi on przejść przez proces konfiguracji.\n\nKaż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\nKaż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_confirm_remove_message" msgid="5284111415714437285">"Czy na pewno chcesz usunąć użytkownika i wszystkie związane z nim dane z urządzenia?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Zmień rozmiar czcionki"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Ograniczenia"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Usuń ograniczenia"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Zmień PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Pokaż powiadomienia"</string>
     <string name="help_label" msgid="1107174367904110532">"Pomoc"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Konto na materiały"</string>
+    <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="6160672982086584261">"Ustaw ograniczenia aplikacji"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Kontrolowane przez <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ta aplikacja nie jest obsługiwana w profilach z ograniczeniami"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ta aplikacja może uzyskać dostęp do Twoich kont"</string>
+    <string name="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 5a41861..5a1b002 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,16 +218,127 @@
     <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="886742181977884584">"Multimédia"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"botões multimédia"</item>
+    <item msgid="4547883971364273343">"orientação do áudio"</item>
+    <item msgid="2603878814882344450">"volume principal"</item>
+    <item msgid="7136963238377062018">"volume de voz"</item>
+    <item msgid="4270236897655923007">"volume de toque"</item>
+    <item msgid="6325739889222559394">"volume de multimédia"</item>
+    <item msgid="5762123934816216821">"volume de alarme"</item>
+    <item msgid="785049718065337473">"volume de notificação"</item>
+    <item msgid="6700305533746877052">"volume de Bluetooth"</item>
+    <item msgid="2029227495214047094">"Manter ativo"</item>
+    <item msgid="26109888160231211">"monitorizar localização"</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>
+    <item msgid="5753789168376302997">"Botões multimédia"</item>
+    <item msgid="3265262911688671938">"Orientação do áudio"</item>
+    <item msgid="2098976479485046797">"Volume principal"</item>
+    <item msgid="5660213838861789350">"Volume da voz"</item>
+    <item msgid="7983336752371254444">"Volume do toque"</item>
+    <item msgid="7878027809189330917">"Volume de multimédia"</item>
+    <item msgid="7260546305036218513">"Volume do alarme"</item>
+    <item msgid="9103719301075748925">"Volume de notificações"</item>
+    <item msgid="7025966722295861512">"Volume de Bluetooth"</item>
+    <item msgid="4665183401128289653">"Manter ativo"</item>
+    <item msgid="8584357129746649222">"Localização"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curta"</item>
     <item msgid="2560532955514699713">"Média"</item>
     <item msgid="2372711992605524591">"Longa"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (depurar)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Utilizar Dalvik"</item>
+    <item msgid="5131846588686178907">"Utilizar ART"</item>
+    <item msgid="4530003713865319928">"Utilizar compilação de depuração ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nunca verificar"</item>
     <item msgid="6042769699089883931">"Verificar apenas conteúdo DRM"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Escala de animação 5x"</item>
     <item msgid="1069584980746680398">"Escala de animação 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Nenhuma"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi e 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Nada"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Desativado"</item>
+    <item msgid="7688197031296835369">"Mostrar áreas de sobreposição"</item>
+    <item msgid="8332661909019981149">"Mostrar contador de sobreposições"</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>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Tempo limite"</item>
     <item msgid="7664124146786465092">"Sem êxito"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Perguntar"</item>
+    <item msgid="5077768429488260031">"Nunca permitir"</item>
+    <item msgid="1417929597727989746">"Permitir sempre"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 07139bc..c860b4f 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Sim"</string>
     <string name="no" msgid="6731231425810196216">"Não"</string>
     <string name="create" msgid="3578857613172647409">"Criar"</string>
+    <string name="allow" msgid="3349662621170855910">"Permitir"</string>
+    <string name="deny" msgid="6947806159746484865">"Recusar"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Está agora a <xliff:g id="STEP_COUNT">%1$d</xliff:g> passos de se tornar um programador"</item>
+    <item quantity="other" msgid="6722953419953594148">"Está agora a <xliff:g id="STEP_COUNT">%1$d</xliff:g> passos de se tornar um programador."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Agora é um programador!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Não é necessário, já é um programador."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"REDES SEM FIOS E OUTRAS"</string>
     <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIVO"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PESSOAL"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"A carregar"</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_discharging" msgid="6222697503392774475">"A descarregar"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(sem fios)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Não está a carregar"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Não está a carregar"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Completo"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Desligado"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"sem fios"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"CA+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Desconhecido"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Desconhecido"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Erro desconhecido"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Frio"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectável"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visível p/ tds aparelhos Bluetooth próximos (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visível para tds os aparelhos Bluetooth nas prox."</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Não visível a outros aparelhos Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Visível apenas para aparelhos sincronizados"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Tornar o dispositivo detectável"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tempo limite de visibilidade"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Definir durante quanto tempo ficará o dispositivo detectável"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear marcação por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Evitar a utilização do telefone Bluetooth quando o ecrã está bloqueado"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivos Bluetooth"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar ficheiros recebidos"</string>
     <string name="device_picker" msgid="8398232791303186677">"Selecionador de aparelho Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Pedido de emparelhamento de Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Uma aplicação pretende ativar o Bluetooth. Permitir?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Uma aplicação do tablet pretende que outros aparelhos Bluetooth possam detetar o seu tablet durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Permitir?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Uma aplicação do telemóvel pretende que outros aparelhos Bluetooth possam detetar o seu telemóvel durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Permitir?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Uma aplicação do tablet pretende que o tablet possa “sempre ser detetado” por outros aparelhos Bluetooth. Permitir?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Uma aplicação do telemóvel pretende que o telemóvel possa \"sempre ser detetado\" por outros aparelhos Bluetooth. Permitir?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Uma aplicação do tablet pretende ativar o Bluetooth para que o tablet possa ser detetado por outros aparelhos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Permitir?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Uma aplicação do telemóvel pretende ativar o Bluetooth para que o telemóvel possa ser detetado por outros aparelhos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Permitir?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Uma aplicação do tablet pretende ativar o Bluetooth para que o tablet possa ser detetado por outros aparelhos. Permitir?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Uma aplicação do telemóvel pretende ativar o Bluetooth para que o telemóvel possa ser detetado por outros aparelhos. Permitir?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Uma aplicação pretende ativar o Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Uma aplicação pretende tornar o seu tablet visível para outros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Uma aplicação pretende tornar o seu telemóvel visível para outros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Uma aplicação pretende tornar o seu tablet visível para outros dispositivos Bluetooth. Pode alterar esta opção mais tarde nas definições de Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Uma aplicação pretende tornar o seu telemóvel visível para outros dispositivos Bluetooth. Pode alterar esta opção mais tarde nas definições de Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Uma aplicação pretende ativar o Bluetooth e tornar o seu tablet visível para outros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Uma aplicação pretende ativar o Bluetooth e tornar o seu telemóvel visível para outros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Uma aplicação pretende ativar o Bluetooth e tornar o seu tablet visível para outros dispositivos. Pode alterar esta opção mais tarde nas definições de Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Uma aplicação pretende ativar o Bluetooth e tornar o seu telemóvel visível para outros dispositivos. Pode alterar esta opção mais tarde nas definições de Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"A ligar o Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Desativar o Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Ligação automática"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"O proxy HTTP é utilizado pelo navegador, mas não pode ser utilizado por outras aplicações."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Local:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vizinho"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentativas de dados:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Serviço GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -215,8 +223,8 @@
     <string name="radio_info_http_client_test" msgid="5733604021077701555">"Teste de cliente HTTP:"</string>
     <string name="ping_test_label" msgid="7255376471490860631">"Executar teste de ping"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
-    <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Actualizar"</string>
-    <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"Actualizar"</string>
+    <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"Atualizar"</string>
+    <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"Atualizar"</string>
     <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"Comutar verificação de DNS"</string>
     <string name="oem_radio_info_label" msgid="6163141792477958941">"Informações/definições específicas de OEM"</string>
     <string name="band_mode_title" msgid="954174198903776205">"Definir banda GSM/UMTS"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"A ligação de dados foi perdida porque saiu do alcance da sua rede e o roaming de dados estava desactivado."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Ligar"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Ao permitir o roaming de dados, poderão ser cobrados custos de roaming significativos!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Ao permitir o roaming de dados, podem ser cobradas tarifas de roaming significativas!\n\nEsta definição afeta todos os utilizadores deste tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Ao permitir o roaming de dados, podem ser cobradas tarifas de roaming significativas!\n\nEsta definição afeta todos os utilizadores deste telemóvel."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Permitir roaming de dados?"</string>
     <string name="networks" msgid="6333316876545927039">"Selecção da operadora"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Escolher um operador de rede"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info do proprietário"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necessita de um PIN numérico ou de palavra-passe para desencriptar o tablet sempre que o ligar"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Necessita de um PIN numérico ou de palavra-passe para desencriptar o telefone sempre que o ligar"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Pode encriptar contas, definições, aplicações e dados transferidos, ficheiros multimédia e outros ficheiros. Após encriptar o tablet, é necessário introduzir um PIN numérico ou uma palavra-passe para o desencriptar sempre que o ligar. Não é possível desencriptar o tablet, exceto através da realização de uma reposição de dados de fábrica, apagando todos os seus dados."\n\n"A encriptação demora uma hora ou mais. Deve iniciar com uma bateria carregada e manter o tablet ligado até a encriptação estar concluída. Se interromper o processo de encriptação, irá perder alguns ou todos os seus dados."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Pode encriptar contas, definições, aplicações e dados transferidos, ficheiros multimédia e outros ficheiros. Após encriptar o telemóvel, é necessário introduzir um PIN numérico ou uma palavra-passe para o desencriptar sempre que o ligar. Não é possível desencriptar o telemóvel, exceto através da realização de uma reposição de dados de fábrica, apagando todos os seus dados."\n" "\n"A encriptação demora uma hora ou mais. Deve iniciar com uma bateria carregada e manter o telemóvel ligado até a encriptação estar concluída. Se interromper o processo de encriptação, irá perder alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Pode encriptar contas, definições, aplicações e dados transferidos, ficheiros multimédia e outros ficheiros. Após encriptar o tablet, é necessário introduzir um PIN numérico ou uma palavra-passe para o desencriptar sempre que o ligar. Não é possível desencriptar o tablet, exceto através da realização de uma reposição de dados de fábrica, apagando todos os seus dados.\n\nA encriptação demora uma hora ou mais. Deve iniciar com uma bateria carregada e manter o tablet ligado até a encriptação estar concluída. Se interromper o processo de encriptação, irá perder alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Pode encriptar contas, definições, aplicações e dados transferidos, ficheiros multimédia e outros ficheiros. Após encriptar o telemóvel, é necessário introduzir um PIN numérico ou uma palavra-passe para o desencriptar sempre que o ligar. Não é possível desencriptar o telemóvel, exceto através da realização de uma reposição de dados de fábrica, apagando todos os seus dados.\n \nA encriptação demora uma hora ou mais. Deve iniciar com uma bateria carregada e manter o telemóvel ligado até a encriptação estar concluída. Se interromper o processo de encriptação, irá perder alguns ou todos os seus dados."</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 telefone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carregue a bateria e tente novamente."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Tente novamente dentro de <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Introduza a palavra-passe"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encriptação sem êxito"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"A encriptação foi interrompida e não é possível concluí-la. Como resultado, os dados no tablet já não estão acessíveis. "\n\n"Para voltar a utilizar o tablet, é necessário efetuar uma reposição para os valores de fábrica. Quando configurar o tablet após a reposição, poderá restaurar todos os dados dos quais tenha cópias de segurança na Conta Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"A encriptação foi interrompida e não é possível concluí-la. Como resultado, os dados no seu telemóvel já não estão acessíveis. "\n\n"Para voltar a utilizar o telemóvel, é necessário efetuar uma reposição para os valores de fábrica. Quando configurar o telemóvel após a reposição, poderá restaurar todos os dados dos quais tenha cópias de segurança na sua Conta Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"A encriptação foi interrompida e não é possível concluí-la. Como resultado, os dados no tablet já não estão acessíveis. \n\nPara voltar a utilizar o tablet, é necessário efetuar uma reposição para os valores de fábrica. Quando configurar o tablet após a reposição, poderá restaurar todos os dados dos quais tenha cópias de segurança na Conta Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"A encriptação foi interrompida e não é possível concluí-la. Como resultado, os dados no seu telemóvel já não estão acessíveis. \n\nPara voltar a utilizar o telemóvel, é necessário efetuar uma reposição para os valores de fábrica. Quando configurar o telemóvel após a reposição, poderá restaurar todos os dados dos quais tenha cópias de segurança na sua Conta Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Alternar o método de introdução"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Selec. bloq. do ecrã"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Escolher bloq. cópia seg."</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Alterar PIN de desbloqueio"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Alterar palavra-passe de desbloqueio"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"A palavra-passe tem de ter no mínimo %d caracteres"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"O PIN tem de ter no mínimo %d caracteres"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"O PIN tem de ter, pelo menos, %d dígitos"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Toque em Continuar quando terminar"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"A palavra-passe tem de ter menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
@@ -397,7 +411,7 @@
     <item quantity="one" msgid="4594051152085925921">"A palavra-passe tem de incluir, pelo menos, 1 carácter que não seja uma letra."</item>
     <item quantity="other" msgid="3952508584649046404">"A palavra-passe tem de incluir, pelo menos, %d caracteres que não sejam letras."</item>
   </plurals>
-    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"O administrador do aparelho não permite a utilização de uma palavra-passe recente."</string>
+    <string name="lockpassword_password_recently_used" msgid="6098087796784262081">"O administrador do dispositivo não permite a utilização de uma palavra-passe recente."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Cancelar"</string>
@@ -405,7 +419,16 @@
     <string name="lock_setup" msgid="3355847066343753943">"A configuração está concluída."</string>
     <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 desactivar administradores do aparelho"</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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como telefone com altifalante"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Memorizar definições"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Ecrãs sincronizados"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dispositivos disponíveis"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"A ligar"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Ligado"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponível"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Em utilização"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Definições de visualização"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Desligar?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Isto terminará a sua ligação com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Opções de visualização sem fios"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Esquecer"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Concluído"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Ligado"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Desligado"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Desativado"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir a troca de dados quando o tablet toca noutro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir a troca de dados quando o telefone toca outro aparelho"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desativado"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Não disponível, porque o NFC está desativado"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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\nBasta 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="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="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="8116564886303972764">"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_in_progress" msgid="2944576520214787628">"O WPS já está em curso e pode demorar até dois minutos a ser concluído"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"A definição de segurança do router sem fios (TKIP) não é suportada"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Falha na autenticação. Tente novamente."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Foi detetada outra sessão do WPS. Tente novamente dentro de alguns minutos."</string>
     <string name="wifi_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>
@@ -564,6 +621,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\nPermitir 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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Guardar"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Não foi possível guardar a rede"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
-    <string name="wifi_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_skip_anyway" msgid="6965361454438011190">"Ignorar de qualquer maneira"</string>
+    <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\nA 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\nA 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="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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"A pesquisar..."</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Mudar o nome do aparelho"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Aparelhos P2P"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Grupos memorizados"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Não foi possível ligar."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Falha ao renomear o dispositivo."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Desligar?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Se desligar, a ligação com <xliff:g id="PEER_NAME">%1$s</xliff:g> e <xliff:g id="PEER_COUNT">%2$s</xliff:g> outros aparelhos será terminada."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portátil"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Esquecer este grupo?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Zona Wi-Fi portátil"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Efeitos musicais"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume da campainha"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar quando estiver em silêncio"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Notificação predefinida"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Som de notificação predefinido"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Sinalizar luz de notificação"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Toque"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificação"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilizar volume de chamadas recebidas para notificações"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Escolher toque de notificação"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Som de notificação predefinido"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Multimédia"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Definir volume para música e vídeos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarme"</string>
@@ -659,7 +731,7 @@
     <string name="account_settings" msgid="6403589284618783461">"Contas"</string>
     <string name="search_settings" msgid="1910951467596035063">"Pesquisar"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gerir definições e histórico de pesquisa"</string>
-    <string name="display_settings" msgid="7965901687241669598">"Visualização"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Ecrã"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rodar ecrã automaticamente"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Mudar orientação automaticamente ao rodar o tablet"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Mudar orientação automaticamente ao rodar o telefone"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagem de fundo"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Escolher imagem de fundo de"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Proteção de Ecrã"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Será iniciado ao suspender, se estiver ligado à alimentação"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Desativado"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Proteção de Ecrã selecionada"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Quando ativar"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inativo"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nunca"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Experimente!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Também iniciar quando ancorado"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Quando ancorado ou em suspensão e a carregar"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ou"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Enquanto está a carregar"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Enquanto ancorado"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desligado"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Para controlar o que acontece quando o telemóvel está ancorado e/ou em suspensão, ative o modo Daydream."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quando iniciar o Daydream"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Iniciar agora"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Definições"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho do tipo de letra"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamanho do tipo de letra"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN do SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN incorreto"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Os PINs não correspondem"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Não é possível alterar o PIN."\n"PIN possivelmente incorreto."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Não é possível alterar o PIN.\nPIN possivelmente incorreto."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN do SIM mudado com sucesso"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Não é possível alterar o estado de bloqueio do cartão SIM. "\n"PIN possivelmente incorreto."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Não é possível alterar o estado de bloqueio do cartão SIM. \nPIN possivelmente incorreto."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estado do tablet"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versão de banda base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versão do kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Número de compilação"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Estado SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Não disponível"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
@@ -733,12 +807,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">"Tipo de rede móvel"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Informações do operador"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Estado da rede móvel"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Estado do serviço"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Armazenamento USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Cartão SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"Disponível"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Disponível (só de leitura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espaço total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"A calcular..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicações (dados das aplic. e cont. multimédia)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imagens, vídeos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Áudio (música, toques, podcasts, etc.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Diversos"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Dados em cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desmont. arm. partilhado"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmontar cartão SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desmontar armaz. USB interno"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Apagar cartão SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Apaga todos os dados do armazenamento USB interno, como músicas e fotografias"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Apaga todos os dados do cartão SD, tais como música e fotografias"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Só de leitura)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Limpar dados em cache?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Irá limpar os dados em cache de todas as aplic."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"A função MTP ou PTP está ativa"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Desmontar mem. arm. USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Desmontar cartão SD?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Se desmontar a memória de armazenamento USB, algumas das aplicações em utilização serão interrompidas e poderão ficar indisponíveis até voltar a montar a memória de armazenamento USB."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Câmara (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Permite transferir fotografias utilizando o software da câmara e quaisquer ficheiros em computadores que não suportem MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalar ferramentas de transferência de ficheiros"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Outros utilizadores"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado da bateria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nível da bateria"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Reposição dos dados de fábrica"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Apaga todos os dados do tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Apaga todos os dados do telefone"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do tablet, incluindo:"\n\n<li>"A conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do telemóvel, incluindo:"\n\n<li>"A conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente, tem sessão iniciada nas seguintes contas:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do tablet, incluindo:\n\n"<li>"A conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do telemóvel, incluindo:\n\n"<li>"A conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente, tem sessão iniciada nas seguintes contas:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotografias"</li>\n<li>"Outros dados do utilizador"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para limpar músicas, imagens e outros dados do utilizador, é necessário apagar a "<b>"memória de armazenamento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para limpar também músicas, imagens e outros dados do utilizador, é necessário apagar o "<b>"cartão SD"</b>"."</string>
@@ -875,7 +957,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>
@@ -897,26 +979,32 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móveis"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Gerir tarifário de telemóvel"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operador de cartão SIM desconhecido"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"A %1$s não possui um Website de gestão conhecido"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insira o cartão SIM e reinicie"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Ligue-se à Internet"</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 de telemó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>
     <string name="about_settings_summary" msgid="3371517697156165959">"Ver informações jurídicas, estado, versão de software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contribuintes"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Inform. Regulamentares"</string>
     <string name="copyright_title" msgid="865906688917260647">"Direitos de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licença"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e condições"</string>
@@ -935,7 +1023,7 @@
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmar PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"As palavras-passe não correspondem"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"Os PINs não correspondem"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Selecção de desbloqueio"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Seleção de desbloqueio"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"A palavra-passe foi definida"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"O PIN foi definido"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"O padrão foi definido"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Alterar PIN de desbloqueio"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar padrão guardado"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Tente novamente:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Desenhar um padrão de desbloqueio"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Desenhar uma sequência de desbloqueio:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Prima Menu para obter ajuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Retirar dedo quando concluído."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Ligue pelo menos <xliff:g id="NUMBER">%d</xliff:g> pontos. Tente novamente:"</string>
@@ -960,18 +1048,13 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"É necessário desenhar padrão para desbloquear ecrã"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Visualizar sequência de desbloqueio"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrar ao tocar"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Bloq. c/ botão liga/desliga"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Bloq. c/ botão ligar/desligar"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Definir padrão de desbloqueio"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Mudar padrão de desbloqueio"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Como desenhar um padrão de desbloqueio"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Demasiadas tentativas incorrectas!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Tente novamente dentro de <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Cancelar"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Seguinte"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Manter a segurança do tablet"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Manter o telefone seguro"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Proteja o tablet contra a utilização não autorizada, criando uma sequência pessoal de desbloqueio do ecrã. Deslize lentamente o dedo para ligar os pontos por qualquer ordem no ecrã seguinte. É necessário ligar, pelo menos, quatro pontos. "\n\n"Pronto para começar? Toque em Seguinte."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Proteja o telemóvel contra a utilização não autorizada, criando uma sequência de desbloqueio do ecrã pessoal. Deslize lentamente o dedo para ligar, pelo menos, quatro pontos por qualquer ordem no ecrã seguinte. "\n\n"Pronto para começar? Toque em Seguinte."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"A aplicação não está instalada no telemóvel."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gerir aplicações"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gerir e remover aplicações instaladas"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplicações"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Permitir a instalação de aplicações a partir de fontes desconhecidas"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"O tablet e os dados pessoais estão mais vulneráveis ​​a ataques de aplicações de fontes desconhecidas. O utilizador concorda que é o único responsável por qualquer dano causado ao tablet ou perda de dados que possam resultar da utilização destas aplicações."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"O telemóvel e os dados pessoais estão mais vulneráveis ​​a ataques de aplicações de fontes desconhecidas. O utilizador concorda que é o único responsável por qualquer dano causado ao telemóvel ou perda de dados que possam resultar da utilização dessas aplicações."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Verificar aplicações"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Proibir ou avisar antes da instalação de aplicações que possam causar danos"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Definições avançadas"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Ativar mais opções de definições"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informações da aplicação"</string>
@@ -1001,8 +1086,10 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dados de armazenamento USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Cartão SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalar"</string>
-    <string name="disable_text" msgid="6544054052049395202">"Desactivar"</string>
-    <string name="enable_text" msgid="9217362512327828987">"Activar"</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">"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>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Optou por iniciar esta aplicação por predefinição para algumas ações."</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar proc. em cache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Repor pref. de aplic."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Repor pref. de aplic.?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Esta ação irá repor todas as preferências para:"\n\n" "<li>"Aplicações desativadas"</li>\n" "<li>"Notificações de aplicações desativadas"</li>\n" "<li>"Aplicações predefinidas para ações"</li>\n" "<li>"Restrições de dados em segundo plano para aplicações"</li>\n\n" Não perderá quaisquer dados de aplicações."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Esta ação irá repor todas as preferências para:\n\n "<li>"Aplicações desativadas"</li>\n" "<li>"Notificações de aplicações desativadas"</li>\n" "<li>"Aplicações predefinidas para ações"</li>\n" "<li>"Restrições de dados em segundo plano para aplicações"</li>\n\n" Não perderá quaisquer dados de aplicações."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Repor aplicações"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gerir espaço"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"No cartão SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Desativada"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Não instalada"</string>
     <string name="no_applications" msgid="7336588977497084921">"Sem aplicações."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Armaz. interno"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Armaz. USB"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> e <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Esta aplicação poderá implicar custos:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Enviar SMS premium"</string>
     <string name="computing_size" msgid="1599186977475211186">"A calcular..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Não foi possível calcular o tamanho do pacote."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Não tem nenhuma aplicação de terceiros instalada."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Alterar a localização de instalação preferida para novas aplicações"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Desativar aplicação incorporada?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Se desativar uma aplicação incorporada, o funcionamento de outras aplicações poderá ser afetado."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Eliminar dados e desativar aplicação?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Utilizador: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Utilizador removido"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processo e <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviço"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processo e <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviços"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processos e <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviço"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Definições do teclado físico"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Premir duas vezes a tecla Espaço para inserir \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Visualizar palavras-passe"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Este método de introdução pode permitir a recolha de todo o texto que digitar, incluindo dados pessoais como, por exemplo, palavras-passe e números de cartões de crédito. Decorre da aplicação <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Utilizar este método de introdução?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Este corretor ortográfico pode permitir a recolha de todo o texto que introduzir, incluindo dados pessoais, como palavras-passe e números de cartões de crédito. Decorre da aplicação <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Utilizar este corretor ortográfico?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Definições"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para alternar, prima Ctrl-Bar. esp."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predefinição"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Esquemas de teclado"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicionário do utilizador"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dicionário pessoal"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Dicionários pessoais"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Dicionário pessoal"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Adicionar"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Adicionar ao dicionário"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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="keep_screen_on" msgid="1146389631208760344">"Manter activo"</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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"O ecrã nunca entrará em suspensão durante o carregamento"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ativar registo de monitorização Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos os pacotes Bluetooth HCI num ficheiro"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Selecionar tempo exec."</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Selecionar tempo exec."</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Reiniciar para alterar o tempo de execução de <xliff:g id="OLD">%1$s</xliff:g> para <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Verificar as aplicações instaladas via ADB/ADT para detetar comportamento perigoso."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Proteger memória USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"As aplicações têm de pedir permissão para ler a memória USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Proteger memória USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Quando o armazenamento USB estiver protegido, as aplicações têm de pedir permissão para ler os dados do armazenamento externo."\n\n"Algumas aplicações podem não funcionar até serem atualizadas pelos respetivos programadores."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Quando o armazenamento USB estiver protegido, as aplicações têm de pedir permissão para ler os dados do armazenamento externo.\n\nAlgumas aplicações podem não funcionar até serem atualizadas pelos respetivos programadores."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Proteger cartão SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"As aplicações têm de pedir permissão para ler o cartão SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Proteger cartão SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Quando o cartão SD estiver protegido, as aplicações têm de pedir permissão para ler os dados do armazenamento externo."\n\n"Algumas aplicações podem não funcionar até serem atualizadas pelos respetivos programadores."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Quando o cartão SD estiver protegido, as aplicações têm de pedir permissão para ler os dados do armazenamento externo.\n\nAlgumas aplicações podem não funcionar até serem atualizadas pelos respetivos programadores."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal local"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Ativar aplicação terminal que oferece acesso local à shell"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Escolher miniaplicação"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Escolher widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Criar widget e permitir o acesso?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Definições de acessibilidade"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"serviços"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"SISTEMA"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Texto grande"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"O botão ligar/desl.termina a chm"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Dizer palavras-passe"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Atraso ao manter premida a tecla"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Melhorar a acessibilidade à Web"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gestos de ampliação"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Quando esta funcionalidade está ativada, pode aumentar ou diminuir o zoom ao tocar três vezes no ecrã.\n\nEnquanto estiver a aumentar o zoom, pode:\n"<ul><li>"Deslocar: arraste dois ou mais dedos no ecrã."</li>\n<li>"Ajustar o nível de zoom: junte dois ou mais dedos ou afaste-os."</li></ul>\n\n"Também pode aumentar temporariamente o que estiver por baixo do seu dedo ao tocar três vezes sem soltar. Neste estado aumentado, pode arrastar o dedo para explorar diferentes partes do ecrã. Levante o dedo para voltar ao estado anterior.\n\nNota: O toque triplo para aumentar funciona em todo o lado, exceto no teclado e na barra de navegação."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Atalho de acessibilidade"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Ativado"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desligado"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Quando esta funcionalidade está ativada, pode rapidamente ativar funcionalidades de acessibilidade executando dois passos:\n\nPasso 1: prima sem soltar o botão \"ligar/desligar\" até ouvir um som ou sentir uma vibração.\n\nPasso 2: toque sem soltar com dois dedos até ouvir uma confirmação.\n\nSe o dispositivo tiver vários utilizadores, a utilização deste atalho no ecrã de bloqueio ativa temporariamente a acessibilidade até que o dispositivo seja desbloqueado."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Texto grande"</string>
+    <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. 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_menu_item_settings" msgid="3344942964710773365">"Configurações"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Em"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Desligado"</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="accessibility_feature_state_on" msgid="2864292320042673806">"Ativado"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"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="print_settings" msgid="4742428530112487843">"Imprimir"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Definições de impressão"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Serviços"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utilizar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> pode receber documentos impressos. Tais documentos podem conter dados confidenciais."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nenhum serviço instalado"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Definições"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Adicionar impressoras"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Ativado"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Desativado"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"O que tem estado a utilizar a bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Dados utiliz. bater. não disp."</string>
@@ -1267,15 +1392,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Dados recebidos"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Dados móveis enviados"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Dados móveis recebidos"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Dados Wi-Fi enviados"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Dados Wi-Fi 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">"Hora activada"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,10 +1451,11 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Parar ou desinstalar a aplicação"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Controlar manualmente o GPS para impedir que a aplicação o utilize"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"A aplicação pode sugerir definições para reduzir a utilização da bateria"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Bateria usada pelo utilizador"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que foi desligado"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Desde a última vez que foi desligado por <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Totais de utilização"</string>
-    <string name="menu_stats_refresh" msgid="1676215433344981075">"Actualizar"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"Atualizar"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"SO Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Entrada e saída de voz"</string>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonalidade"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta o tom do texto falado"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Idioma não selecionado"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Define a voz do idioma específico para o texto lido"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Ouvir um exemplo"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproduzir uma breve demonstração de síntese de voz"</string>
@@ -1361,9 +1490,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>
@@ -1378,8 +1508,22 @@
     <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">"Actualizar definição de Wi-Fi"</string>
-    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Actualizar a definição do Bluetooth"</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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Brilho <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>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"metade"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"desativado"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Armazenamento de credenciais"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar do armazenamento"</string>
@@ -1390,6 +1534,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>
@@ -1402,7 +1549,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Ao reinstalar uma aplicação, restaurar definições e dados da cópia de segurança"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Criar um relatório de erro"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Isto irá recolher informações sobre o estado atual do seu dispositivo para enviar através de uma mensagem de email. Demorará um pouco desde o início do relatório de erro até que este se encontre pronto para ser enviado. Aguarde um pouco."</string>
-    <string name="report" msgid="302437572240018342">"Relatório"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Pal.-passe cópia do comp"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"As cópias de segurança completas no ambiente de trabalho não estão atualmente protegidas"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toque para alterar ou remover a palavra-passe para cópias de segurança completas no ambiente de trabalho"</string>
@@ -1426,14 +1570,14 @@
     <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">"Activar administrador do dispositivo?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Activar"</string>
+    <string name="add_device_admin_msg" msgid="6246742476064507965">"Ativar administrador do dispositivo?"</string>
+    <string name="add_device_admin" msgid="7133327675884827091">"Ativar"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrador do dispositivo"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"A ativação deste administrador permitirá à aplicação <xliff:g id="APP_NAME">%1$s</xliff:g> efetuar as seguintes operações:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Este administrador está ativo e permite que a aplicação <xliff:g id="APP_NAME">%1$s</xliff:g> efetue as seguintes operações:"</string>
@@ -1442,14 +1586,14 @@
     <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>
-    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Actualizar lista"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Atualizar lista"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Ignorar"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Seguinte"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"Anterior"</string>
@@ -1467,9 +1611,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\nToque 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>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Calendário"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Contactos"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Bem-vindo ao Google Sync!"</font>" "\n"Uma abordagem da Google à sincronização de dados, que permite aceder aos contactos, compromissos e outros itens a partir de qualquer local onde se encontre."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Bem-vindo ao Google Sync!"</font>" \nUma abordagem da Google à sincronização de dados, que permite aceder aos contactos, compromissos e outros itens a partir de qualquer local onde se encontre."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Definições de sincronização da aplicação"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dados e sincronização"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Alterar palavra-passe"</string>
@@ -1537,47 +1681,52 @@
     <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>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Camadas de hard. flash verdes quando estão atuali."</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Depurar sobreposição GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar utilização da CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Sobrep. de ecrã que mostra a utiliz. atual da CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forçar composição GPU"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simular apresentações secundárias"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplicações"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Não manter atividades"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destruir atividades assim que o utilizador sair"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Desativar dados em segundo plano em redes móveis. Serão utilizadas redes não móveis, se estiverem disponíveis."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Para restringir os dados de segundo plano para esta aplicação, comece por definir um limite de dados móveis."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Restringir dados em segundo plano?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Esta funcionalidade pode fazer com que uma aplicação que dependa de dados em segundo plano deixe de funcionar quando estiverem disponíveis apenas redes móveis."\n\n"Poderá encontrar controlos de utilização de dados mais adequados nas definições disponíveis dentro da aplicação."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Esta funcionalidade pode fazer com que uma aplicação que dependa de dados em segundo plano deixe de funcionar quando estiverem disponíveis apenas redes móveis.\n\nPoderá encontrar controlos de utilização de dados mais adequados nas definições disponíveis dentro da aplicação."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"A restrição de dados de segundo plano só é possível se tiver definido um limite de dados móveis."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Ativar sinc. auto. de dados?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Qualquer alteração que efetue nas contas a partir da Web será copiada automaticamente para o tablet."\n\n"Algumas contas também podem copiar automaticamente para a Web qualquer alteração que efetue no tablet. Uma Conta do Google funciona desta forma."\n\n"Para selecionar os tipos de informações a sincronizar em cada conta, aceda a Definições &gt; Contas."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Qualquer alteração que efetue nas contas a partir da Web será copiada automaticamente para o telemóvel."\n\n"Algumas contas também podem copiar automaticamente para a Web qualquer alteração que efetue no telemóvel. Uma Conta Google funciona desta forma."\n\n"Para selecionar os tipos de informações a sincronizar em cada conta, aceda a Definições &gt; Contas."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Qualquer alteração que efetue nas contas a partir da Web será copiada automaticamente para o tablet.\n\nAlgumas contas também podem copiar automaticamente para a Web qualquer alteração que efetue no tablet. Uma Conta do Google funciona desta forma.\n\nPara selecionar os tipos de informações a sincronizar em cada conta, aceda a Definições &gt; Contas."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Qualquer alteração que efetue nas contas a partir da Web será copiada automaticamente para o telemóvel.\n\nAlgumas contas também podem copiar automaticamente para a Web qualquer alteração que efetue no telemóvel. Uma Conta Google funciona desta forma.\n\nPara selecionar os tipos de informações a sincronizar em cada conta, aceda a Definições &gt; Contas."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Desativar sinc. auto. de dados?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Esta ação irá conservar a utilização de dados e bateria, mas é necessário sincronizar manualmente cada conta para recolher informações recentes. Não irá receber notificações quando ocorrerem atualizações."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de reposição de ciclo de utilização"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Definir aviso de utilização de dados"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Definir limite de utilização de dados"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitar utilização de dados"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"A ligação móvel de dados será desativada quando for atingido o limite especificado.\n\nUma 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\nUma 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" 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\nEsta 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\nEsta 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Aplicações e utilizadores removidos"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> recebidos, <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>: cerca de <xliff:g id="TOTAL">%1$s</xliff:g> utilizado(s)."</string>
     <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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Adicionar perfil VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Editar perfil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Eliminar perfil"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN sempre ativa"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecione um perfil de VPN para permanecer sempre ligado. O tráfego de rede só será permitido quando ligado a esta VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Nenhuma"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"A VPN sempre ativa requer um endereço IP de servidor e DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Não existe ligação à rede. Tente novamente mais tarde."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Falta um certificado. Editar o perfil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</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">"Atualizações adicionais do sistema"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Utilizadores e restrições"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Utilizadores"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Adicionar utilizador"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Editar detalhes"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Informações do utilizador"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Nome"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Restrições de conteúdo"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Solicitar PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Classificação de conteúdo"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Aplicações do sistema"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Aplicações instaladas"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Rejeitar"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Remover utilizador"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Criança traquina"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Desativado"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissivo"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Forçador"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Utilizadores"</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="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\nDepois de criar um novo utilizador, essa pessoa necessita de passar por um processo de configuração.\n\nQualquer 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\nQualquer 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_confirm_remove_message" msgid="5284111415714437285">"Tem a certeza de que pretende remover o utilizador e todos os dados associados do dispositivo?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Alterar tamanho da letra"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Restrições"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Remover restrições"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Alterar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificações"</string>
     <string name="help_label" msgid="1107174367904110532">"Ajuda"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Conta para conteúdo"</string>
+    <string name="user_picture_title" msgid="7297782792000291692">"ID da fotografia"</string>
     <string name="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="6160672982086584261">"Definir restrições da aplicação"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controlado por <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Esta aplicação não é suportada nos perfis restritos"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Esta aplicação pode aceder às suas contas"</string>
+    <string name="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 0a137c4..0a29fd8 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,16 +218,127 @@
     <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="886742181977884584">"Mídia"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"botões de mídia"</item>
+    <item msgid="4547883971364273343">"foco de áudio"</item>
+    <item msgid="2603878814882344450">"volume mestre"</item>
+    <item msgid="7136963238377062018">"volume da voz"</item>
+    <item msgid="4270236897655923007">"volume do toque"</item>
+    <item msgid="6325739889222559394">"volume da mídia"</item>
+    <item msgid="5762123934816216821">"volume do alarme"</item>
+    <item msgid="785049718065337473">"volume da notificação"</item>
+    <item msgid="6700305533746877052">"volume do Bluetooth"</item>
+    <item msgid="2029227495214047094">"permanecer ativo"</item>
+    <item msgid="26109888160231211">"monitorar local"</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>
+    <item msgid="5753789168376302997">"Botões de mídia"</item>
+    <item msgid="3265262911688671938">"Foco de áudio"</item>
+    <item msgid="2098976479485046797">"Volume mestre"</item>
+    <item msgid="5660213838861789350">"Volume da voz"</item>
+    <item msgid="7983336752371254444">"Volume do toque"</item>
+    <item msgid="7878027809189330917">"Volume da mídia"</item>
+    <item msgid="7260546305036218513">"Volume do alarme"</item>
+    <item msgid="9103719301075748925">"Volume da notificação"</item>
+    <item msgid="7025966722295861512">"Volume do Bluetooth"</item>
+    <item msgid="4665183401128289653">"Permanecer ativo"</item>
+    <item msgid="8584357129746649222">"Local"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curto"</item>
     <item msgid="2560532955514699713">"Médio"</item>
     <item msgid="2372711992605524591">"Longo"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (depuração)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Usar Dalvik"</item>
+    <item msgid="5131846588686178907">"Usar ART"</item>
+    <item msgid="4530003713865319928">"Usar compilação de depuração do ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nunca verificar"</item>
     <item msgid="6042769699089883931">"Verificar somente conteúdo DRM"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Escala de animação 5x"</item>
     <item msgid="1069584980746680398">"Escala de animação 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Nenhum"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi e 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Nenhum"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Desativado"</item>
+    <item msgid="7688197031296835369">"Mostrar áreas de overdraw"</item>
+    <item msgid="8332661909019981149">"Mostrar contador de overdraw"</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>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Tempo limite"</item>
     <item msgid="7664124146786465092">"Malsucedida"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Perguntar"</item>
+    <item msgid="5077768429488260031">"Nunca permitir"</item>
+    <item msgid="1417929597727989746">"Sempre permitir"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index af3e925..96a5264 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Sim"</string>
     <string name="no" msgid="6731231425810196216">"Não"</string>
     <string name="create" msgid="3578857613172647409">"Criar"</string>
+    <string name="allow" msgid="3349662621170855910">"Permitir"</string>
+    <string name="deny" msgid="6947806159746484865">"Recusar"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Falta <xliff:g id="STEP_COUNT">%1$d</xliff:g> etapa para você se tornar um desenvolvedor."</item>
+    <item quantity="other" msgid="6722953419953594148">"Faltam <xliff:g id="STEP_COUNT">%1$d</xliff:g> etapas para você se tornar um desenvolvedor."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Você agora é um desenvolvedor!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Não é necessário. Você já é um desenvolvedor."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"REDES SEM FIO E OUTRAS"</string>
     <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIVO"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PESSOAL"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Carregando"</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_discharging" msgid="6222697503392774475">"Descarregando"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(sem fio)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Não está carregando"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Não está carregando"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Cheio"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Desconectado"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"sem fio"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"CA+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Desconhecido"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Desconhecido"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Erro desconhecido"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Menos vistos"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectável"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Visível para todos os disp. Bluetooth próx. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visível para todos os dispos. Bluetooth próximos"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Não visível para outros dispositivos Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Visível somente para dispositivos pareados"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Tornar o dispositivo detectável"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tempo limite de visibilidade"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Definir por quanto tempo o aparelho ficará detectável"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear discagem por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedir o uso do discador Bluetooth quando a tela estiver bloqueada."</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivos Bluetooth"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar arquivos recebidos"</string>
     <string name="device_picker" msgid="8398232791303186677">"Seletor de dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitação de permissão para Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Um aplicativo quer ativar o Bluetooth. Permitir?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Um aplicativo em seu tablet quer torná-lo detectável por outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Permitir?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Um aplicativo em seu telefone quer torná-lo detectável por outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Permitir?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Um aplicativo em seu tablet quer tornar seu tablet \"sempre detectável\" por outros dispositivos Bluetooth. Permitir?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Um aplicativo em seu telefone quer tornar seu telefone \"sempre detectável\" por outros dispositivos Bluetooth. Permitir?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Um aplicativo em seu tablet quer ativar o Bluetooth e tornar seu tablet detectável por outros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Permitir?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Um aplicativo em seu telefone quer ativar o Bluetooth e tornar seu telefone detectável por outros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos. Permitir?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Um aplicativo no seu tablet quer ativar o Bluetooth e tornar seu tablet detectável por outros dispositivos. Permitir?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Um aplicativo em seu telefone quer ativar o Bluetooth e tornar o telefone detectável por outros dispositivos. Permitir?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Um aplicativo quer ativar o Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Um aplicativo quer tornar seu tablet visível para outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Um aplicativo quer tornar seu telefone visível para outros dispositivos Bluetooth por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Um aplicativo quer tornar seu tablet visível para outros dispositivos Bluetooth. Você pode alterar esta opção a qualquer momento nas configurações do Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Um aplicativo quer tornar seu telefone visível para outros dispositivos Bluetooth. Você pode alterar esta opção a qualquer momento nas configurações do Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Um aplicativo quer ativar o Bluetooth e tornar seu tablet visível para outros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Um aplicativo quer ativar o Bluetooth e tornar seu telefone visível para outros dispositivos por <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Um aplicativo quer ativar o Bluetooth e tornar seu tablet visível para outros dispositivos. Você pode alterar esta opção a qualquer momento nas configurações do Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Um aplicativo quer ativar o Bluetooth e tornar seu telefone visível para outros dispositivos. Você pode alterar esta opção a qualquer momento nas configurações do Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Ativando Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Desligar o Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conexão automática"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"O proxy HTTP é usado pelo navegador, mas não pode ser usado por outros aplicativos."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Localização:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vizinho:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentativas de dados:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Serviço GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -257,16 +265,18 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Você perdeu a conectividade de dados porque deixou o roaming de dados da sua rede doméstica desativado."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Ativar"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Quando você permite o roaming de dados, poderão ser cobradas taxas significativas de roaming!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Ao permitir o roaming de dados, você poderá receber cobranças significativas de roaming.\n\nEsta configuração afeta todos os usuários do tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Ao permitir o roaming de dados, você poderá receber cobranças significativas de roaming.\n\nEsta configuração afeta todos os usuários do telefone."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Permitir roaming de dados?"</string>
     <string name="networks" msgid="6333316876545927039">"Seleção de operador"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Selecione um operador de rede"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info do proprietário"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -305,11 +319,11 @@
     <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>
+    <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\nA criptografia leva um hora ou mais. Você deve iniciar com a bateria carregada e manter seu tablet conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="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\nA 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>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Criptografar tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Criptografar telefone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carregue sua bateria e tente novamente."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Tente novamente em <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Digite sua senha"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Falha na criptografia"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu tablet não podem ser acessados. "\n\n" Para continuar usando seu tablet, é necessário restaurar as configurações originais. Quando você configurar seu tablet após a restauração, poderá recuperar todos os dados que foram salvos em backup em sua Conta do Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu telefone não podem mais ser acessados. "\n\n"Para continuar usando seu telefone, é necessário restaurar as configurações originais. Quando você configurar seu telefone após a restauração, poderá recuperar todos os dados que foram salvos em backup em sua Conta do Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu tablet não podem ser acessados. \n\n Para continuar usando seu tablet, é necessário restaurar as configurações originais. Quando você configurar seu tablet após a restauração, poderá recuperar todos os dados que foram salvos em backup em sua Conta do Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu telefone não podem mais ser acessados. \n\nPara continuar usando seu telefone, é necessário restaurar as configurações originais. Quando você configurar seu telefone após a restauração, poderá recuperar todos os dados que foram salvos em backup em sua Conta do Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Alterar o método de entrada"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Escolher bloq. de tela"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Selec. o bloq. de backup"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Alterar PIN de desbloqueio"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Alterar senha de desbloqueio"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"A senha deve ter no mínimo %d caracteres"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"O PIN deve ter no mínimo %d caracteres."</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"O PIN deve ter no mínimo %d caracteres"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Toque em Continuar quando terminar"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"A senha deve ter menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como viva-voz"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e mídia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Lembrar configurações"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Displays pareados"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dispositivos disponíveis"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Conectando"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Conectado"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponível"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Em uso"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Configurações do display"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Desconectar?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Isso encerrará sua conexão com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Opções de Display sem fio"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Esquecer"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Concluído"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Ligado"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Desligado"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Desativado"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir troca de dados quando o tablet tocar em outro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir troca de dados quando o telefone tocar em  outro dispositivo"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desativado"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponível porque o NFC está desativado"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Quando este recurso está ativado, você pode arrastar o conteúdo do aplicativo para outro dispositivo compatível com NFC, mantendo os dispositivos próximos. Por exemplo, você pode arrastar 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 é arrastado."</string>
+    <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\nBasta 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="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="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="8116564886303972764">"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_in_progress" msgid="2944576520214787628">"A WPS já está em andamento e pode levar até dois minutos para ser concluída"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"A configuração de segurança do roteador sem fio (TKIP) não é suportada"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Falha na autenticação. Tente novamente."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Outra sessão WPS foi detectada. Tente novamente em alguns minutos."</string>
     <string name="wifi_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>
@@ -558,12 +615,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\nPermitir 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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Salvar"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Falha ao salvar a rede"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</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_skip_anyway" msgid="6965361454438011190">"Ignorar mesmo assim"</string>
+    <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\nA 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\nA configuração do telefone pode exigir atividade de rede significativa."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Pesquisando…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Renomear dispositivo"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Dispositivos pareados"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Grupos lembrados"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Não foi possível conectar."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Falha ao renomear dispositivo."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Desconectar?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Se você se desconectar, sua conexão com <xliff:g id="PEER_NAME">%1$s</xliff:g> e <xliff:g id="PEER_COUNT">%2$s</xliff:g> outros dispositivos serão encerrados."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Wi-Fi portátil"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Esquecer este grupo?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Ponto de acesso Wi-Fi portátil"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Efeitos sonoros"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume da campainha"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar no modo silencioso"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Notificação padrão"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Som de notificação padrão"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsar luz de notificação"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Toque"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificação"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Usar volume de chamada recebida para notificações"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Selecione o toque de notificação"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Som de notificação padrão"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Mídia"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Definir o volume para música e vídeos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarme"</string>
@@ -643,19 +715,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>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Plano de fundo"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecionar plano de fundo de"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Screen Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Começará no modo de espera se estiver conectado à energia"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Desativada"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Candy selecionado"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Quando ativar"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inativo"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nunca"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Teste-o!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Começar também quando estiver encaixado"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Quando encaixado ou suspenso e carregando"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ambos"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Ao carregar"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Quando encaixado"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desativado"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Para controlar o que acontece quando o telefone está encaixado e/ou suspenso, ative o Daydream."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Quando iniciar Daydreams"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Começar agora"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Configurações"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Tamanho da fonte"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN do SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN incorreto"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Os PINs não correspondem"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Não é possível alterar o PIN."\n"PIN possivelmente incorreto."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Não é possível alterar o PIN.\nPIN possivelmente incorreto."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN do SIM alterado"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Não é possível alterar o estado de bloqueio do cartão SIM."\n"PIN possivelmente incorreto."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Não é possível alterar o estado de bloqueio do cartão SIM.\nPIN possivelmente incorreto."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status do tablet"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versão da banda de base"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versão do kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Número da versão"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Status do SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Não disponível"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -733,12 +807,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">"Tipo de rede móvel"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Informações da operadora"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Estado da rede móvel"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Estado do serviço"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Armaz. USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Cartão SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"Disponível"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Disponível (somente leitura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espaço total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicativos (dados de aplic. e conteúdo de mídia)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imagens, vídeos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Áudio (música, toques, podcasts etc.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Diversos"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Dados em cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desconectar armaz. comp."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Desmontar cartão SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desconectar armaz. USB interno"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Apagar cartão SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Apaga todos os dados do armazenamento USB interno, como músicas e fotos"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Apaga todos os dados do cartão SD, como músicas e fotos"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Somente leitura)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Limpar os dados em cache?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Limpará dados em cache de todos os aplicativos."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"A função MTP ou PTP está ativa"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Desconectar armazenamento USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Desconectar cartão SD?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Se você desconectar o armazenamento USB, alguns aplicativos que estão em uso serão interrompidos e podem não estar disponíveis até você conectar o armazenamento USB novamente."</string>
@@ -789,10 +868,11 @@
     <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>
+    <string name="storage_other_users" msgid="808708845102611856">"Outros usuários"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Status da bateria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nível da bateria"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Configuração original"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Apaga todos os dados no tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Apaga todos os dados no telefone"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:"\n\n<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos aplicativos"</li>\n<li>"Aplicativos transferidos"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" de seu telefone, incluindo:"\n\n<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos aplicativos"</li>\n<li>"Aplicativos baixados"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"No momento você está conectado às seguintes contas:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos aplicativos"</li>\n<li>"Aplicativos transferidos"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" de seu telefone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos aplicativos"</li>\n<li>"Aplicativos baixados"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"No momento você está conectado às seguintes contas:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para limpar músicas, fotos e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para limpar músicas, imagens e outros dados de usuário, o conteúdo do "<b>"cartão SD"</b>" precisa ser apagado."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será vinculado."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móveis"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Gerenciar plano de celular"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operadora do SIM desconhecida"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s sem website de aprovisionamento conhecido"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insira o cartão SIM e reinicie"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conecte-se à Internet"</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>
@@ -909,14 +996,15 @@
     <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>
     <string name="about_settings_summary" msgid="3371517697156165959">"Ver informações legais, status, versão do software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboradores"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Informação regulamentar"</string>
     <string name="copyright_title" msgid="865906688917260647">"Direitos autorais"</string>
     <string name="license_title" msgid="1990487604356037871">"Licença"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termos e Condições"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Alterar PIN de desbloqueio"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmar padrão salvo"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Tente novamente:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Desenhe um padrão de desbloqueio"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Desenhar um padrão de desbloqueio:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pressione Menu para obter ajuda."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Solte o dedo quando terminar."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Conectar no mínimo <xliff:g id="NUMBER">%d</xliff:g> pontos. Tente novamente:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Como desenhar um padrão de desbloqueio"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Muitas tentativas incorretas!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Tente novamente em <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Cancelar"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Avançar"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Como proteger seu tablet"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Proteção do seu telefone"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Proteja seu tablet contra uso não autorizado criando um padrão de desbloqueio de tela pessoal. Deslize o dedo para ligar os pontos em qualquer ordem na próxima tela. Será necessário que você conecte pelo menos quatro pontos. "\n\n"Pronto para começar? Toque em \"Avançar\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Proteja seu telefone contra uso não autorizado criando uma sequência de desbloqueio de tela pessoal. Deslize o dedo para ligar pelo menos quatro pontos em qualquer ordem na próxima tela. "\n\n"Pronto para começar? Toque em Avançar."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"O aplicativo não está instalado no telefone."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gerenciar aplicativos"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gerenciar e remover aplicativos instalados"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplicativos"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Permitir a instalação de aplicativos de fontes desconhecidas"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Seu tablet e seus dados pessoais são mais vulneráveis ​​a ataques de aplicativos de fontes desconhecidas. Você concorda que é o único responsável por qualquer dano a seu tablet ou perda de dados decorrentes do uso desses aplicativos."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Seu telefone e seus dados pessoais são mais vulneráveis ​​a ataques de aplicativos de fontes desconhecidas. Você concorda que é o único responsável por qualquer dano ao seu telefone ou perda de dados decorrentes do uso desses aplicativos."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Verificar aplicativos"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Proibir ou avisar antes da instalação de aplicativos que podem causar danos"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configurações avançadas"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Ativa mais opções de configuração"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informações do aplicativo"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dados de armazenamento USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Cartão SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalar"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Desinstalar para todos os usuários"</string>
+    <string name="install_text" msgid="884360662922471113">"Instalar"</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>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar processo em cache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Redefinir preferências"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Redefinir preferências?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Isso redefinirá todas as preferências para:"\n\n" "<li>"aplicativos desativados"</li>\n" "<li>"notificações de aplicativos desativados"</li>\n" "<li>"aplicativos padrão para ações"</li>\n" "<li>"restrições de dados em segundo plano para aplicativos"</li>\n\n" Os dados dos aplicativos não serão perdidos."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Isso redefinirá todas as preferências para:\n\n "<li>"aplicativos desativados"</li>\n" "<li>"notificações de aplicativos desativados"</li>\n" "<li>"aplicativos padrão para ações"</li>\n" "<li>"restrições de dados em segundo plano para aplicativos"</li>\n\n" Os dados dos aplicativos não serão perdidos."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Redefinir aplicativos"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gerenciar espaço"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Cartão SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Desativado"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Não instalado"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nenhum aplicativo."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Armaz. interno"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Armaz. USB"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> e <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Este aplicativo pode cobrar dinheiro:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Enviar SMS premium"</string>
     <string name="computing_size" msgid="1599186977475211186">"Calculando…"</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Não foi possível calcular o tamanho do pacote."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Você não tem aplicativos de terceiros instalados."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Alterar o local de instalação preferido para novos aplicativos"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Desativar aplicat. integrado?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Se você desativar um aplicativo integrado, outros aplicativos podem apresentar mau funcionamento."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Excluir os dados e desativar o aplicativo?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Usuário: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Usuário removido"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processo e <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviço"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processo e <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviços"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processos e <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviço"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Configurações de teclado físico"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Pressione a tecla de Espaço duas vezes para inserir \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Tornar as senhas visíveis"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Este método de entrada pode coletar todo o texto que você digita, incluindo dados pessoais, como senhas e números de cartão de crédito. É um método do aplicativo <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Usar este método de entrada?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Este corretor ortográfico pode coletar todo o texto que você digita, incluindo dados pessoais, como senhas e números de cartão de crédito. É um corretor do aplicativo <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Utilizar este corretor ortográfico?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Configurações"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para alterar, pressione Ctrl+espaço"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Padrão"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Layouts de teclado"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicionário do usuário"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dicionário pessoal"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Dicionários pessoais"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Dicionário pessoal"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Adicionar"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Adicionar ao dicionário"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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="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>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ativar registro de rastreamento Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos os pacotes Bluetooth HCI em um arquivo"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Selecionar tempo de execução"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Selecionar tempo de execução"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Reiniciar para mudar tempo de execução de <xliff:g id="OLD">%1$s</xliff:g> para <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Verificar comportamento nocivo em aplicativos instalados via ADB/ADT."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Proteger o armazenamento USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplicativos precisam de permissão para ler o armazenamento USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Proteger o armazenamento USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Quando o armazenamento USB está protegido, os aplicativos devem solicitar permissão para ler dados de armazenamento externo."\n\n"Alguns aplicativos podem não funcionar até que sejam atualizados por seus desenvolvedores."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Quando o armazenamento USB está protegido, os aplicativos devem solicitar permissão para ler dados de armazenamento externo.\n\nAlguns aplicativos podem não funcionar até que sejam atualizados por seus desenvolvedores."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Proteger o cartão SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplicativos precisam de permissão para ler o cartão SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Proteger o cartão SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Quando o cartão SD está protegido, os aplicativos devem solicitar permissão para ler dados de armazenamento externo."\n\n"Alguns aplicativos podem não funcionar até que sejam atualizados por seus desenvolvedores."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Quando o cartão SD está protegido, os aplicativos devem solicitar permissão para ler dados de armazenamento externo.\n\nAlguns aplicativos podem não funcionar até que sejam atualizados por seus desenvolvedores."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal local"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Ativar o aplicativo terminal que oferece acesso ao shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Escolher o gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Escolher widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Criar widget e permitir acesso?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configurações de acessibilidade"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Serviços"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Texto grande"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Botão de ligar encerra a chamada"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Falar senhas"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Atraso ao tocar e pressionar"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Melhorar a acessibilidade na web"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gestos de ampliação"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Quando este recurso está ativado, você pode aumentar e diminuir o zoom com um toque triplo na tela.\n\nQuando o zoom é aplicado, você pode:\n"<ul><li>"Deslocar: arraste dois ou mais dedos pela tela."</li>\n<li>"Ajustar o nível de zoom: use o gesto de pinçagem ou expanda usando dois ou mais dedos."</li></ul>\n\n"Você também pode ampliar temporariamente o que estiver sob seu dedo dando um toque triplo e segurando. No estado ampliado, arraste o dedo para explorar as diferentes partes da tela. Levante o dedo para voltar ao estado anterior.\n\nObservação: o toque triplo para ampliar funciona em qualquer parte da tela, exceto no teclado e na barra de navegação."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Atalho de acessibilidade"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Ligado"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desativado"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Quando este recurso está ativado, você pode ativar rapidamente os recursos de acessibilidade em duas etapas:\n\nEtapa 1: pressione e segure o botão liga/desliga até ouvir um som ou sentir uma vibração.\n\nEtapa 2: toque e segure com dois dedos até ouvir a confirmação de áudio.\n\nCaso o dispositivo tenha vários usuários, este atalho na tela de bloqueio pode ativar temporariamente a acessibilidade até que o dispositivo seja desbloqueado."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Texto grande"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ampliação da tela"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Atual. autom. da ampliação da tela"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Atualiz. ampliação da tela em transições de aplic."</string>
+    <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_menu_item_settings" msgid="3344942964710773365">"Configurações"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Ativado"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"Ativado"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desativado"</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="print_settings" msgid="4742428530112487843">"Impressão"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Config. de impressão"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Serviços"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> pode receber os documentos que você imprimir. Esses documentos podem conter dados confidenciais."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nenhum serviço instalado"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Configurações"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Adicionar impressoras"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Ativado"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Desativado"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"O que está consumindo a bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Dados de uso da bat. indisp."</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,30 +1418,32 @@
     <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_data_send" msgid="3875198715268918671">"Dados móveis enviados"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Dados móveis recebidos"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Dados Wi-Fi enviados"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Dados Wi-Fi 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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Parar ou desinstalar o aplicativo"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Controlar o GPS manualmente para evitar sua utilização pelo aplicativo"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"O aplicativo pode oferecer configurações para reduzir o uso da bateria"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Bateria utilizada pelo usuário"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que foi desconectado"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Quando foi desconectado pela última vez para <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total de uso"</string>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Frequência do som"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afeta o tom do texto falado"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Idioma não selecionado"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Define a voz específica do idioma para o texto falado"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Ouça um exemplo"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproduzir uma rápida demonstração da voz sintetizada"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Brilho <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">"máximo"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"médio"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"desativado"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Armazenamento de credenciais"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar do armazenamento"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Ao reinstalar um aplicativo, restaura as configurações de backup e dados"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Obter relatório de bugs"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Isto coletará informações sobre o estado atual do dispositivo para enviá-las em uma mensagem de e-mail. Após iniciar o relatório de bugs, será necessário aguardar algum tempo até que esteja pronto para ser enviado. Tenha paciência."</string>
-    <string name="report" msgid="302437572240018342">"Gerar relatório"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Senha do backup local"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Os backups completos do computador não estão protegidos no momento"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Toque para alterar ou remover a senha de backups completos do desktop"</string>
@@ -1426,7 +1570,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>
@@ -1435,17 +1579,17 @@
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Ativar o administrador do dispositivo?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"Ativar"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Administrador do dispositivo"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"A ativação deste administrador permitirá que o aplicativo <xliff:g id="APP_NAME">%1$s</xliff:g> execute as seguintes operações:"</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"A ativação deste administrador permitirá que o aplicativo <xliff:g id="APP_NAME">%1$s</xliff:g>:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Este administrador está ativo e permite que o aplicativo <xliff:g id="APP_NAME">%1$s</xliff:g> execute as seguintes operações:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Sem título"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Geral"</string>
     <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>
@@ -1467,9 +1611,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\nToque 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>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Agenda"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Contatos"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Bem-vindo ao Google Sync!"</font>" "\n"Um método do Google para sincronizar dados a fim de permitir acesso aos seus contatos, compromissos e muito mais, onde quer que você esteja."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Bem-vindo ao Google Sync!"</font>" \nUm método do Google para sincronizar dados a fim de permitir acesso aos seus contatos, compromissos e muito mais, onde quer que você esteja."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Configurações de sincronização do aplicativo"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dados e sincronização"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Alterar senha"</string>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Piscar superfícies de toda a janela ao atualizar"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Mostrar atualiz. da GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Piscar visualizações em janelas ao desenhar c/GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Atual. camad. de hardware"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Piscar camadas de hardware em verde ao atualizar"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Depurar overdraw da GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar o uso da CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Sobreposição de tela que mostra o uso da CPU atual"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forçar renderização GPU"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simular displays secund."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplicativos"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Não manter atividades"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Destruir todas as atividades quando o usuário sair"</string>
-    <string name="app_process_limit_title" msgid="4280600650253107163">"Limite do proc. 2o plano"</string>
+    <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 2o plano"</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 segundo plano"</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>
@@ -1591,8 +1740,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>
@@ -1605,13 +1754,13 @@
     <string name="data_usage_app_settings" msgid="8430240158135453271">"Ver configurações do aplicativo"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Restringir dados de 2º plano"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Desat. dados de seg. plano em redes móveis. Usar outras redes se disp."</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Definir um limite de dados para restringir dados em 2o plano"</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Definir um limite de dados para restringir dados em 2º plano"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Restringir dados de segundo plano?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Este recurso pode fazer com que um aplicativo que depende de dados de segundo plano pare de funcionar quando somente redes de acesso limitado estiverem disponíveis."\n\n"Você pode encontrar controles de uso de dados mais apropriados nas configurações disponíveis no aplicativo."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Este recurso pode fazer com que um aplicativo que depende de dados de segundo plano pare de funcionar quando somente redes de acesso limitado estiverem disponíveis.\n\nVocê pode encontrar controles de uso de dados mais apropriados nas configurações disponíveis no aplicativo."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Restringir dados de segundo plano só é possível quando você define um limite de dados móveis."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Ativar sincronização automática?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"As alterações feitas em suas contas na web serão automaticamente copiadas para o tablet."\n\n"Algumas contas, como Contas do Google, também poderão copiar automaticamente as alterações feitas no tablet para a web."\n" "\n"Para determinar as informações a sincronizar em cada conta, acesse Configurações &gt; Contas."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"As alterações feitas em suas contas na web serão automaticamente copiadas para o telefone."\n\n"Algumas contas, como Contas do Google, também poderão copiar automaticamente as alterações feitas no telefone para a web."\n" "\n"Para determinar as informações a sincronizar em cada conta, acesse Configurações &gt; Contas."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"As alterações feitas em suas contas na web serão automaticamente copiadas para o tablet.\n\nAlgumas contas, como Contas do Google, também poderão copiar automaticamente as alterações feitas no tablet para a web.\n \nPara determinar as informações a sincronizar em cada conta, acesse Configurações &gt; Contas."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"As alterações feitas em suas contas na web serão automaticamente copiadas para o telefone.\n\nAlgumas contas, como Contas do Google, também poderão copiar automaticamente as alterações feitas no telefone para a web.\n \nPara determinar as informações a sincronizar em cada conta, acesse Configurações &gt; Contas."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Desativar sincroniz. automática?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Isto preservará o uso de dados e da bateria, mas será necessário sincronizar manualmente cada conta para obter as informações mais recentes, e você não será informado de novas atualizações."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de redefinição do ciclo de uso"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Definir aviso de uso de dados"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Definir limite do uso de dados"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitando uso de dados"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Sua conexão de dados móveis será desativada quando o limite especificado for atingido.\n\nComo 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\nComo 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" 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\nEsta 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\nEsta 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Aplicativos e usuários removidos"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> recebido, <xliff:g id="SENT">%2$s</xliff:g> enviado"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: aproximadamente <xliff:g id="TOTAL">%1$s</xliff:g> utilizados."</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: aprox. <xliff:g id="TOTAL">%1$s</xliff:g> 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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Adicionar perfil de VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Editar perfil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Excluir perfil"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN sempre ativa"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selecione um perfil de VPN para permanecer sempre conectado. O tráfego de rede somente será permitido quando conectado a esta VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Nenhuma"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"A VPN sempre ativa requer um endereço IP para o servidor e o DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Nenhuma conexão de rede. Tente novamente mais tarde."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Falta um certificado. Edite o perfil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</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">"Atualizações adicionais do sistema"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Usuários e restrições"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Usuários"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Adicionar usuário"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Editar detalhes"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Informações do usuário"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Nome"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Restrições de conteúdo"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Solicitar PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Classificação do conteúdo"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Aplicativos do sistema"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Aplicativos instalados"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Descartar"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Remover usuário"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Criança travessa"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Desativado"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissivo"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Impondo"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Usuários"</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="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\nDepois que você cria um novo usuário, essa pessoa deve concluir o processo de configuração.\n\nQualquer 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\nQualquer 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_confirm_remove_message" msgid="5284111415714437285">"Tem certeza que deseja remover o usuário e todos os dados associados do dispositivo?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Alterar tamanho da fonte"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Restrições"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Remover restrições"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Alterar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificações"</string>
     <string name="help_label" msgid="1107174367904110532">"Ajuda"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Conta para conteúdo"</string>
+    <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="6160672982086584261">"Definir restrições 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 2aec04b..0b0b1c7 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,14 +146,113 @@
     <!-- 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 (886742181977884584) -->
+    <!-- no translation found for app_ops_categories:4 (7924928667052300589) -->
+    <!-- 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_summaries:31 (5124443975763747838) -->
+    <!-- no translation found for app_ops_summaries:32 (4547883971364273343) -->
+    <!-- no translation found for app_ops_summaries:33 (2603878814882344450) -->
+    <!-- no translation found for app_ops_summaries:34 (7136963238377062018) -->
+    <!-- no translation found for app_ops_summaries:35 (4270236897655923007) -->
+    <!-- no translation found for app_ops_summaries:36 (6325739889222559394) -->
+    <!-- no translation found for app_ops_summaries:37 (5762123934816216821) -->
+    <!-- no translation found for app_ops_summaries:38 (785049718065337473) -->
+    <!-- no translation found for app_ops_summaries:39 (6700305533746877052) -->
+    <!-- no translation found for app_ops_summaries:40 (2029227495214047094) -->
+    <!-- no translation found for app_ops_summaries:41 (26109888160231211) -->
+    <!-- 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 app_ops_labels:31 (5753789168376302997) -->
+    <!-- no translation found for app_ops_labels:32 (3265262911688671938) -->
+    <!-- no translation found for app_ops_labels:33 (2098976479485046797) -->
+    <!-- no translation found for app_ops_labels:34 (5660213838861789350) -->
+    <!-- no translation found for app_ops_labels:35 (7983336752371254444) -->
+    <!-- no translation found for app_ops_labels:36 (7878027809189330917) -->
+    <!-- no translation found for app_ops_labels:37 (7260546305036218513) -->
+    <!-- no translation found for app_ops_labels:38 (9103719301075748925) -->
+    <!-- no translation found for app_ops_labels:39 (7025966722295861512) -->
+    <!-- no translation found for app_ops_labels:40 (4665183401128289653) -->
+    <!-- no translation found for app_ops_labels:41 (8584357129746649222) -->
     <!-- 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) -->
+    <!-- no translation found for select_runtime_titles:0 (3574453009229338122) -->
+    <!-- no translation found for select_runtime_titles:1 (8978402910750533864) -->
+    <!-- no translation found for select_runtime_titles:2 (7839859333977894115) -->
+    <!-- no translation found for select_runtime_summaries:0 (6412880178297884701) -->
+    <!-- no translation found for select_runtime_summaries:1 (5131846588686178907) -->
+    <!-- no translation found for select_runtime_summaries:2 (4530003713865319928) -->
     <!-- no translation found for hdcp_checking_titles:0 (441827799230089869) -->
     <!-- no translation found for hdcp_checking_titles:1 (6042769699089883931) -->
     <!-- no translation found for hdcp_checking_titles:2 (9174900380056846820) -->
@@ -177,6 +280,25 @@
     <!-- no translation found for animator_duration_scale_entries:4 (3334024790739189573) -->
     <!-- no translation found for animator_duration_scale_entries:5 (3170120558236848008) -->
     <!-- no translation found for animator_duration_scale_entries:6 (1069584980746680398) -->
+    <!-- no translation found for overlay_display_devices_entries:0 (1606809880904982133) -->
+    <!-- no translation found for overlay_display_devices_entries:1 (688482401508173818) -->
+    <!-- no translation found for overlay_display_devices_entries:2 (1725473474827398815) -->
+    <!-- no translation found for overlay_display_devices_entries:3 (6813511923592083251) -->
+    <!-- no translation found for overlay_display_devices_entries:4 (3646519549495410112) -->
+    <!-- no translation found for enable_opengl_traces_entries:0 (3191973083884253830) -->
+    <!-- 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 debug_hw_overdraw_entries:0 (8190572633763871652) -->
+    <!-- no translation found for debug_hw_overdraw_entries:1 (7688197031296835369) -->
+    <!-- no translation found for debug_hw_overdraw_entries:2 (8332661909019981149) -->
     <!-- 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) -->
@@ -195,4 +317,7 @@
     <!-- no translation found for vpn_states:3 (4039737283841672166) -->
     <!-- no translation found for vpn_states:4 (4042143101664725090) -->
     <!-- no translation found for vpn_states:5 (7664124146786465092) -->
+    <!-- no translation found for security_settings_premium_sms_values:0 (7389829271787670252) -->
+    <!-- no translation found for security_settings_premium_sms_values:1 (5077768429488260031) -->
+    <!-- no translation found for security_settings_premium_sms_values:2 (1417929597727989746) -->
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 650bf49..f5d3bc1 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -20,7 +20,17 @@
     <string name="no" msgid="6731231425810196216">"Na"</string>
     <!-- no translation found for create (3578857613172647409) -->
     <skip />
+    <!-- no translation found for allow (3349662621170855910) -->
+    <skip />
+    <!-- no translation found for deny (6947806159746484865) -->
+    <skip />
     <string name="device_info_default" msgid="7847265875578739287">"Nunenconuschent"</string>
+    <!-- no translation found for show_dev_countdown:one (5295687242294085452) -->
+    <!-- no translation found for show_dev_countdown:other (6722953419953594148) -->
+    <!-- no translation found for show_dev_on (1110711554982716293) -->
+    <skip />
+    <!-- no translation found for show_dev_already (2151632240145446227) -->
+    <skip />
     <!-- no translation found for header_category_wireless_networks (4944823405420438623) -->
     <skip />
     <!-- no translation found for header_category_device (5781174212691167553) -->
@@ -99,12 +109,17 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Vegn chargià"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Stgargiada"</string>
+    <!-- no translation found for battery_info_status_charging_wireless (1822125795446772771) -->
+    <skip />
+    <!-- no translation found for battery_info_status_discharging (310932812698268588) -->
+    <skip />
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Na vegn betg chargià"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Plain"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Betg connectà"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <!-- no translation found for battery_info_power_wireless (6819163295739305097) -->
+    <skip />
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Nunenconuschent"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Nunenconuschent"</string>
@@ -116,7 +131,6 @@
     <!-- no translation found for battery_info_health_cold (3835692786176707318) -->
     <skip />
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Visibel"</string>
     <!-- no translation found for bluetooth_is_discoverable (8373421452106840526) -->
     <skip />
     <!-- no translation found for bluetooth_is_discoverable_always (2849387702249327748) -->
@@ -125,11 +139,8 @@
     <skip />
     <!-- no translation found for bluetooth_only_visible_to_paired_devices (2049983392373296028) -->
     <skip />
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Far daventar visibel l\'apparat"</string>
     <!-- no translation found for bluetooth_visibility_timeout (8002247464357005429) -->
     <skip />
-    <!-- no translation found for bluetooth_visibility_timeout_summary (6483353842671501585) -->
-    <skip />
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloccar la cumposiziun vocala"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedir l\'utilisaziun dal dialer bluetooth sch\'il visur è bloccà"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Apparats Bluetooth"</string>
@@ -181,23 +192,23 @@
     <!-- no translation found for device_picker (8398232791303186677) -->
     <skip />
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Dumonda d\'autorisaziun Bluetooth"</string>
-    <!-- no translation found for bluetooth_ask_enablement (5279027758886569301) -->
+    <!-- no translation found for bluetooth_ask_enablement (637355677176904990) -->
     <skip />
-    <!-- no translation found for bluetooth_ask_discovery (4420151924834278808) -->
+    <!-- no translation found for bluetooth_ask_discovery (786921566047356213) -->
     <skip />
-    <!-- no translation found for bluetooth_ask_discovery (4478906085771274647) -->
+    <!-- no translation found for bluetooth_ask_discovery (5510358858113713272) -->
     <skip />
-    <!-- no translation found for bluetooth_ask_lasting_discovery (8737516188038252313) -->
+    <!-- no translation found for bluetooth_ask_lasting_discovery (8863617309580598607) -->
     <skip />
-    <!-- no translation found for bluetooth_ask_lasting_discovery (7751530664834149084) -->
+    <!-- no translation found for bluetooth_ask_lasting_discovery (6487606808683607975) -->
     <skip />
-    <!-- no translation found for bluetooth_ask_enablement_and_discovery (8504403125440086020) -->
+    <!-- no translation found for bluetooth_ask_enablement_and_discovery (3346529092809011149) -->
     <skip />
-    <!-- no translation found for bluetooth_ask_enablement_and_discovery (3040361003987241057) -->
+    <!-- no translation found for bluetooth_ask_enablement_and_discovery (4724094889807196118) -->
     <skip />
-    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (7254712987802497615) -->
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (989613204829097159) -->
     <skip />
-    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (3947789545028519103) -->
+    <!-- no translation found for bluetooth_ask_enablement_and_lasting_discovery (6671615712909139801) -->
     <skip />
     <!-- no translation found for bluetooth_turning_on (4850574877288036646) -->
     <skip />
@@ -261,6 +272,8 @@
     <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Posiziun:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vischin:"</string>
+    <!-- no translation found for radio_info_cellinfo_label (1300937728020622362) -->
+    <skip />
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Emprovas datas:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Servetsch GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -351,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>
@@ -359,6 +373,10 @@
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Activar"</string>
     <!-- no translation found for roaming_warning (7625933694709170887) -->
     <skip />
+    <!-- no translation found for roaming_warning_multiuser (6458990250829214777) -->
+    <skip />
+    <!-- no translation found for roaming_warning_multiuser (6368421100292355440) -->
+    <skip />
     <!-- no translation found for roaming_reenable_title (6068100976707316772) -->
     <skip />
     <string name="networks" msgid="6333316876545927039">"Tscherner in purschider da rait"</string>
@@ -411,6 +429,14 @@
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <!-- no translation found for owner_info_settings_edit_text_hint (4608681417960923911) -->
     <skip />
+    <!-- no translation found for show_user_info_on_lockscreen_label (8408914624925608365) -->
+    <skip />
+    <!-- no translation found for user_info_settings_title (1195015434996724736) -->
+    <skip />
+    <!-- no translation found for show_profile_info_on_lockscreen_label (2741208907263877990) -->
+    <skip />
+    <!-- no translation found for profile_info_settings_title (3518603215935346604) -->
+    <skip />
     <!-- no translation found for location_settings_title (4483843407328665068) -->
     <skip />
     <!-- no translation found for security_settings_title (7945465324818485460) -->
@@ -525,7 +551,8 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Midar il PIN da debloccaziun"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Midar il pled-clav da debloccaziun"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Il pled-clav sto cuntegnair almain %d caracters."</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Il PIN sto cuntegnair almain %d caracters."</string>
+    <!-- no translation found for lockpassword_pin_too_short (1677649103470518953) -->
+    <skip />
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Smatgai sin Vinavant sche Vus essas a fin."</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Vinavant"</string>
     <!-- no translation found for lockpassword_password_too_long (7016906583950201704) -->
@@ -572,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) -->
@@ -688,6 +727,50 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sco telefon ad autpledader"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per musica e multimedia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Memorisar ils parameters"</string>
+    <!-- no translation found for wifi_display_settings_title (564299108014609382) -->
+    <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 (1336244693183075466) -->
+    <skip />
+    <!-- no translation found for wifi_display_search_for_devices (5065526281193354502) -->
+    <skip />
+    <!-- no translation found for wifi_display_searching_for_devices (5172373825348672137) -->
+    <skip />
+    <!-- no translation found for wifi_display_no_devices_found (8180582698282377626) -->
+    <skip />
+    <!-- no translation found for wifi_display_paired_devices (7395326840730024303) -->
+    <skip />
+    <!-- no translation found for wifi_display_available_devices (4558314642853513487) -->
+    <skip />
+    <!-- no translation found for wifi_display_status_connecting (5688608834000748607) -->
+    <skip />
+    <!-- no translation found for wifi_display_status_connected (8364125226376985558) -->
+    <skip />
+    <!-- no translation found for wifi_display_status_available (1924167525172207067) -->
+    <skip />
+    <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
+    <skip />
+    <!-- no translation found for wifi_display_details (7791118209992162698) -->
+    <skip />
+    <!-- no translation found for wifi_display_disconnect_title (1543715924639003599) -->
+    <skip />
+    <!-- no translation found for wifi_display_disconnect_text (4824860802264489088) -->
+    <skip />
+    <!-- no translation found for wifi_display_options_title (5740656401635054838) -->
+    <skip />
+    <!-- no translation found for wifi_display_options_forget (9119048225398894580) -->
+    <skip />
+    <!-- no translation found for wifi_display_options_done (5703116500357822557) -->
+    <skip />
+    <!-- no translation found for wifi_display_options_name (4756080222307467898) -->
+    <skip />
+    <!-- no translation found for wifi_display_summary_on (3695429596604962531) -->
+    <skip />
+    <!-- no translation found for wifi_display_summary_off (2445210133184740611) -->
+    <skip />
+    <!-- no translation found for wifi_display_summary_disabled (5318394806146587849) -->
+    <skip />
     <!-- no translation found for nfc_quick_toggle_title (6769159366307299004) -->
     <skip />
     <!-- no translation found for nfc_quick_toggle_summary (8302974395787498915) -->
@@ -710,19 +793,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) -->
@@ -733,29 +819,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 (1220174276403689487) -->
+    <skip />
+    <!-- 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 />
@@ -763,21 +870,23 @@
     <skip />
     <!-- no translation found for wifi_setup_wps (8128702488486283957) -->
     <skip />
+    <!-- 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 (8116564886303972764) -->
+    <!-- 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 (2944576520214787628) -->
+    <!-- no translation found for wifi_wps_in_progress (3372311348221357944) -->
     <skip />
     <!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
     <skip />
@@ -790,6 +899,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>
@@ -827,6 +938,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 />
@@ -837,9 +954,25 @@
     <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
     <skip />
     <string name="wifi_cancel" msgid="6763568902542968964">"Interrumper"</string>
-    <!-- no translation found for wifi_advanced_titlebar (1627063574532930090) -->
+    <!-- no translation found for wifi_skip_anyway (6965361454438011190) -->
     <skip />
-    <!-- no translation found for wifi_setting_frequency_band_title (7493768705046080060) -->
+    <!-- no translation found for wifi_dont_skip (7350341524881124808) -->
+    <skip />
+    <!-- no translation found for wifi_skipped_message (3335132188969450252) -->
+    <skip />
+    <!-- no translation found for wifi_skipped_message (1192848364146401759) -->
+    <skip />
+    <!-- no translation found for wifi_and_mobile_skipped_message (6161024589991810940) -->
+    <skip />
+    <!-- no translation found for wifi_and_mobile_skipped_message (3773473163264984767) -->
+    <skip />
+    <!-- no translation found for wifi_connect_failed_message (4474691090681670156) -->
+    <skip />
+    <!-- no translation found for wifi_connect_failed_message (2185803140161396572) -->
+    <skip />
+    <!-- no translation found for wifi_advanced_titlebar (4485841401774142908) -->
+    <skip />
+    <!-- no translation found for wifi_setting_frequency_band_title (3655327399028584656) -->
     <skip />
     <!-- no translation found for wifi_setting_frequency_band_summary (3250740757118009784) -->
     <skip />
@@ -864,7 +997,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 />
@@ -878,6 +1011,8 @@
     <skip />
     <!-- no translation found for wifi_p2p_peer_devices (299526878463303432) -->
     <skip />
+    <!-- no translation found for wifi_p2p_remembered_groups (3847022927914068230) -->
+    <skip />
     <!-- no translation found for wifi_p2p_failed_connect_message (8921447388048243547) -->
     <skip />
     <!-- no translation found for wifi_p2p_failed_rename_message (2562182284946936380) -->
@@ -892,12 +1027,21 @@
     <skip />
     <!-- no translation found for wifi_p2p_cancel_connect_message (7477756213423749402) -->
     <skip />
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Punct d\'access WLAN mobil"</string>
-    <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_p2p_delete_group_message (834559380069647086) -->
     <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_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>
+    <!-- no translation found for wifi_tether_failed_subtext (1484941858530919002) -->
+    <skip />
+    <!-- no translation found for wifi_tether_configure_ap_text (7974681394041609308) -->
+    <skip />
+    <!-- no translation found for wifi_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) -->
@@ -910,13 +1054,13 @@
     <skip />
     <string name="ring_volume_title" msgid="7938706566797464165">"Volumen dal tun da scalin"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en il modus silenzius"</string>
-    <!-- no translation found for notification_sound_title (312032901303146002) -->
+    <!-- no translation found for notification_sound_title (5137483249425507572) -->
     <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Glisch d\'avis pulsanta"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tun da scalin"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Avis"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilisar il volumen da tun dals cloms che entran per ils avis"</string>
-    <!-- no translation found for notification_sound_dialog_title (9052854168612951170) -->
+    <!-- no translation found for notification_sound_dialog_title (3805140135741385667) -->
     <skip />
     <string name="media_volume_title" msgid="3576565767317118106">"Multimedia"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Reglar il volumen per la musica ed ils videos"</string>
@@ -994,23 +1138,25 @@
     <skip />
     <!-- no translation found for wallpaper_settings_fragment_title (519078346877860129) -->
     <skip />
-    <!-- no translation found for screensaver_settings_title (3848608373818910549) -->
+    <!-- no translation found for screensaver_settings_title (3349790120327233241) -->
     <skip />
-    <!-- no translation found for screensaver_settings_summary_on (433728808047613634) -->
+    <!-- no translation found for screensaver_settings_summary_either_long (2458481525925378465) -->
     <skip />
-    <!-- no translation found for screensaver_settings_summary_off (7019248565878953105) -->
+    <!-- no translation found for screensaver_settings_summary_either_short (6140527286137331478) -->
     <skip />
-    <!-- no translation found for screensaver_component_title (8596216100441725363) -->
+    <!-- no translation found for screensaver_settings_summary_sleep (9086186698140423493) -->
     <skip />
-    <!-- no translation found for screensaver_timeout_title (4882666970355550822) -->
+    <!-- no translation found for screensaver_settings_summary_dock (2072657401664633283) -->
     <skip />
-    <!-- no translation found for screensaver_timeout_summary (7717201094598701673) -->
+    <!-- no translation found for screensaver_settings_summary_off (2481581696365146473) -->
     <skip />
-    <!-- no translation found for screensaver_timeout_zero_summary (1274235565189071582) -->
+    <!-- no translation found for screensaver_settings_disabled_prompt (3857507943322777651) -->
     <skip />
-    <!-- no translation found for screensaver_test (3048249263811694128) -->
+    <!-- no translation found for screensaver_settings_when_to_dream (8352267826043957746) -->
     <skip />
-    <!-- no translation found for screensaver_activate_on_dock_title (3753003388633168862) -->
+    <!-- no translation found for screensaver_settings_dream_start (4998187847985120168) -->
+    <skip />
+    <!-- no translation found for screensaver_settings_button (7292214707625717013) -->
     <skip />
     <string name="automatic_brightness" msgid="5014143533884135461">"Clerezza automatica"</string>
     <!-- no translation found for title_font_size (4405544325522105222) -->
@@ -1058,6 +1204,8 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versiun Baseband"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versiun dal kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Numer dal build"</string>
+    <!-- no translation found for selinux_status (6212165375172061672) -->
+    <skip />
     <string name="device_info_not_available" msgid="8062521887156825182">"Betg disponibel"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -1081,12 +1229,15 @@
     <!-- no translation found for status_icc_id (943368755577172747) -->
     <skip />
     <string name="status_network_type" msgid="3279383550222116235">"Tip da rait mobil"</string>
+    <!-- no translation found for status_latest_area_info (7222470836568238054) -->
+    <skip />
     <string name="status_data_state" msgid="5503181397066522950">"Status da la rait mobila"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Status da servetsch"</string>
     <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 />
@@ -1100,6 +1251,8 @@
     <string name="sd_memory" product="default" msgid="151871913888051515">"Carta SD"</string>
     <!-- no translation found for memory_available (5052397223077021181) -->
     <skip />
+    <!-- no translation found for memory_available_read_only (6497534390167920206) -->
+    <skip />
     <string name="memory_size" msgid="6629067715017232195">"Memoria en total"</string>
     <!-- no translation found for memory_calculating_size (2188358544203768588) -->
     <skip />
@@ -1115,6 +1268,8 @@
     <skip />
     <!-- no translation found for memory_media_misc_usage (235452944021647124) -->
     <skip />
+    <!-- no translation found for memory_media_cache_usage (6704293333141177910) -->
+    <skip />
     <!-- no translation found for sd_eject (4988563376492400073) -->
     <skip />
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Demontar la carta SD"</string>
@@ -1138,7 +1293,12 @@
     <skip />
     <!-- no translation found for sd_format_summary (212703692181793109) -->
     <skip />
-    <string name="read_only" msgid="6702420168629076340">" (mo per lectura)"</string>
+    <!-- no translation found for memory_clear_cache_title (5423840272171286191) -->
+    <skip />
+    <!-- no translation found for memory_clear_cache_message (4550262490807415948) -->
+    <skip />
+    <!-- no translation found for mtp_ptp_mode_summary (3710436114807789270) -->
+    <skip />
     <!-- no translation found for dlg_confirm_unmount_title (3077285629197874055) -->
     <skip />
     <!-- no translation found for dlg_confirm_unmount_title (3634502237262534381) -->
@@ -1179,6 +1339,8 @@
     <skip />
     <!-- no translation found for usb_label_installer_cd (4331173824920630215) -->
     <skip />
+    <!-- no translation found for storage_other_users (808708845102611856) -->
+    <skip />
     <string name="battery_status_title" msgid="9159414319574976203">"Status da l\'accu"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivel da l\'accu"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1215,6 +1377,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>
@@ -1332,12 +1498,22 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> vegn deconnectà dal tethering."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Agid"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Raits mobilas"</string>
+    <!-- no translation found for manage_mobile_plan_title (7588182101738043593) -->
+    <skip />
+    <!-- no translation found for mobile_unknown_sim_operator (9101230468757324260) -->
+    <skip />
+    <!-- no translation found for mobile_no_provisioning_url (2399426808423775711) -->
+    <skip />
+    <!-- no translation found for mobile_insert_sim_card (9052590985784056395) -->
+    <skip />
+    <!-- no translation found for mobile_connect_to_internet (1733894125065249639) -->
+    <skip />
     <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 />
@@ -1365,6 +1541,8 @@
     <skip />
     <string name="legal_information" msgid="5769301644270604095">"Infurmaziuns legalas"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Contribuents"</string>
+    <!-- no translation found for regulatory_information (5695464367088752150) -->
+    <skip />
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenza"</string>
     <string name="terms_title" msgid="7697580845616764642">"Cundiziuns d\'utilisaziun"</string>
@@ -1398,7 +1576,8 @@
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confermar il schema memorisà"</string>
     <!-- no translation found for lockpattern_need_to_unlock_wrong (4694973540770105678) -->
     <skip />
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dissegnai in schema da debloccaziun:"</string>
+    <!-- no translation found for lockpattern_recording_intro_header (2063630508212535241) -->
+    <skip />
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Smatgar sin Menu per mussar l\'agid."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Prender davent il det sche Vus avais terminà."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Colliai almain <xliff:g id="NUMBER">%d</xliff:g> puncts. Empruvai anc ina giada:"</string>
@@ -1424,14 +1603,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Co dissegnar in schema da debloccaziun:"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Memia bleras emprovas senza success!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Empruvar anc ina giada en <xliff:g id="NUMBER">%d</xliff:g> secundas."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Interrumper"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Vinavant"</string>
-    <!-- no translation found for lock_title (2909697418179419990) -->
-    <skip />
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Segirar Voss telefonin"</string>
-    <!-- no translation found for lock_intro_message (8616353869251700776) -->
-    <skip />
-    <!-- no translation found for lock_intro_message (8393155371327584659) -->
+    <!-- no translation found for activity_not_found (5551664692991605325) -->
     <skip />
     <!-- no translation found for manageapplications_settings_title (7041951105633616745) -->
     <skip />
@@ -1450,6 +1622,10 @@
     <skip />
     <!-- no translation found for install_all_warning (8113734576826384682) -->
     <skip />
+    <!-- no translation found for verify_applications (2959359554974828518) -->
+    <skip />
+    <!-- no translation found for verify_applications_summary (6737505521913263792) -->
+    <skip />
     <!-- no translation found for advanced_settings (1777249286757067969) -->
     <skip />
     <!-- no translation found for advanced_settings_summary (4016682978071086747) -->
@@ -1479,6 +1655,10 @@
     <!-- no translation found for external_data_size_label (626414192825329708) -->
     <skip />
     <string name="uninstall_text" msgid="3644892466144802466">"Deinstallar"</string>
+    <!-- no translation found for uninstall_all_users_text (851857393177950340) -->
+    <skip />
+    <!-- no translation found for install_text (884360662922471113) -->
+    <skip />
     <string name="disable_text" msgid="6544054052049395202">"Deactivar"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activar"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Stizzar las datas"</string>
@@ -1515,12 +1695,16 @@
     <!-- 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) -->
     <skip />
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Sin la carta SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Deactivà"</string>
+    <!-- no translation found for not_installed (1475144352069281880) -->
+    <skip />
     <!-- no translation found for no_applications (7336588977497084921) -->
     <skip />
     <!-- no translation found for internal_storage (1584700623164275282) -->
@@ -1564,6 +1748,10 @@
     <skip />
     <!-- no translation found for join_many_items_middle (7556692394478220814) -->
     <skip />
+    <!-- no translation found for security_settings_billing_desc (8061019011821282358) -->
+    <skip />
+    <!-- no translation found for security_settings_premium_sms_desc (8734171334263713717) -->
+    <skip />
     <string name="computing_size" msgid="1599186977475211186">"Calcular…"</string>
     <!-- no translation found for invalid_size_value (7563537715280712285) -->
     <skip />
@@ -1602,10 +1790,20 @@
     <skip />
     <!-- no translation found for app_disable_dlg_text (3562567756362627323) -->
     <skip />
+    <!-- no translation found for app_special_disable_dlg_title (2690148680327142674) -->
+    <skip />
+    <!-- no translation found for app_special_disable_dlg_text (3447657419284854195) -->
+    <skip />
     <!-- no translation found for app_disable_notifications_dlg_title (7669264654851761857) -->
     <skip />
     <!-- no translation found for app_disable_notifications_dlg_text (5088484670924769845) -->
     <skip />
+    <!-- no translation found for app_ops_settings (5108481883575527511) -->
+    <skip />
+    <!-- no translation found for app_ops_running (7706949900637284122) -->
+    <skip />
+    <!-- no translation found for app_ops_never_used (9114608022906887802) -->
+    <skip />
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilisaziun da la memoria"</string>
     <!-- no translation found for storageuse_settings_summary (3748286507165697834) -->
     <skip />
@@ -1627,6 +1825,10 @@
     <skip />
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <!-- no translation found for running_process_item_user_label (3129887865552025943) -->
+    <skip />
+    <!-- no translation found for running_process_item_removed_user_label (8250168004291472959) -->
+    <skip />
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process ed <xliff:g id="NUMSERVICES">%2$d</xliff:g> servetsch"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process e <xliff:g id="NUMSERVICES">%2$d</xliff:g> servetschs"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process ed <xliff:g id="NUMSERVICES">%2$d</xliff:g> servetsch"</string>
@@ -1676,7 +1878,6 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Smatgar duas giadas la tasta da vid per inserir «.»."</string>
     <!-- no translation found for show_password (3001113966880559611) -->
     <skip />
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <!-- no translation found for ime_security_warning (4135828934735934248) -->
     <skip />
     <!-- no translation found for spellchecker_security_warning (9060897418527708922) -->
@@ -1707,10 +1908,7 @@
     <skip />
     <!-- no translation found for keyboard_layout_picker_title (556081931972771610) -->
     <skip />
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicziunari da l\'utilisader"</string>
-    <!-- no translation found for user_dict_single_settings_title (524997218433540614) -->
-    <skip />
-    <!-- no translation found for user_dict_multiple_settings_title (3735224433307996276) -->
+    <!-- no translation found for user_dict_settings_title (3427169369758733521) -->
     <skip />
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Agiuntar"</string>
@@ -1729,6 +1927,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>
@@ -1791,19 +1993,43 @@
     <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) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Restar activ"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Il visur na dorma mai cun chargiar"</string>
+    <!-- no translation found for bt_hci_snoop_log (3340699311158865670) -->
+    <skip />
+    <!-- no translation found for bt_hci_snoop_log_summary (730247028210113851) -->
+    <skip />
+    <!-- no translation found for select_runtime_title (649783802363155346) -->
+    <skip />
+    <!-- no translation found for select_runtime_dialog_title (5314872813037493958) -->
+    <skip />
+    <!-- no translation found for select_runtime_warning_message (1937574953265648165) -->
+    <skip />
     <string name="allow_mock_location" msgid="2787962564578664888">"Posiziuns faussas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permetter posiziuns faussas"</string>
     <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) -->
     <skip />
+    <!-- no translation found for verify_apps_over_usb_title (4177086489869041953) -->
+    <skip />
+    <!-- no translation found for verify_apps_over_usb_summary (9164096969924529200) -->
+    <skip />
     <!-- no translation found for enforce_read_external_title (7733257271454664956) -->
     <skip />
     <!-- no translation found for enforce_read_external_summary (1798088409346660567) -->
@@ -1820,6 +2046,10 @@
     <skip />
     <!-- no translation found for enforce_read_external_confirm_message (3858482712337574407) -->
     <skip />
+    <!-- no translation found for enable_terminal_title (95572094356054120) -->
+    <skip />
+    <!-- no translation found for enable_terminal_summary (67667852659359206) -->
+    <skip />
     <string name="gadget_picker_title" msgid="98374951396755811">"Tscherner in gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Tscherner in widget"</string>
     <!-- no translation found for allow_bind_app_widget_activity_allow_bind_title (2538303018392590627) -->
@@ -1845,39 +2075,49 @@
     <skip />
     <!-- no translation found for accessibility_system_title (7187919089874130484) -->
     <skip />
-    <!-- no translation found for accessibility_toggle_large_text_title (6618674985313017711) -->
+    <!-- no translation found for accessibility_screen_magnification_title (7001782548715744981) -->
     <skip />
-    <!-- no translation found for accessibility_power_button_ends_call_title (5468375366375940894) -->
+    <!-- no translation found for accessibility_screen_magnification_summary (2380627654189671754) -->
     <skip />
-    <!-- no translation found for accessibility_speak_password_title (3344423945644925355) -->
+    <!-- no translation found for accessibility_global_gesture_preference_title (6752037184140789970) -->
     <skip />
-    <!-- no translation found for accessibility_long_press_timeout_title (2373216941395035306) -->
+    <!-- no translation found for accessibility_global_gesture_preference_summary_on (6180927399052022181) -->
     <skip />
-    <!-- no translation found for accessibility_script_injection_title (7921388904564822855) -->
+    <!-- no translation found for accessibility_global_gesture_preference_summary_off (8102103337813609849) -->
+    <skip />
+    <!-- no translation found for accessibility_global_gesture_preference_description (750438015254396963) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_large_text_preference_title (6307247527580207161) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_screen_magnification_preference_title (2472285215737820469) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_screen_magnification_auto_update_preference_title (7218498768415430963) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_screen_magnification_auto_update_preference_summary (4392059334816220155) -->
+    <skip />
+    <!-- no translation found for accessibility_power_button_ends_call_prerefence_title (6673851944175874235) -->
+    <skip />
+    <!-- no translation found for accessibility_toggle_speak_password_preference_title (5986628515113204844) -->
+    <skip />
+    <!-- no translation found for accessibility_long_press_timeout_preference_title (6708467774619266508) -->
     <skip />
     <!-- no translation found for accessibility_menu_item_settings (3344942964710773365) -->
     <skip />
-    <!-- no translation found for accessibility_service_state_on (8791337599927106344) -->
+    <!-- no translation found for accessibility_feature_state_on (2864292320042673806) -->
     <skip />
-    <!-- no translation found for accessibility_service_state_off (2458594460762620776) -->
+    <!-- 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 />
@@ -1885,12 +2125,30 @@
     <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) -->
     <skip />
+    <!-- no translation found for print_settings (4742428530112487843) -->
+    <skip />
+    <!-- no translation found for print_settings_title (4911263339115736689) -->
+    <skip />
+    <!-- no translation found for print_services_title (1088097751249445946) -->
+    <skip />
+    <!-- no translation found for print_service_security_warning_title (2338435517408144841) -->
+    <skip />
+    <!-- no translation found for print_service_security_warning_summary (919299459931111450) -->
+    <skip />
+    <!-- no translation found for print_no_services_installed (8443039625463872294) -->
+    <skip />
+    <!-- no translation found for print_menu_item_settings (6591330373682227082) -->
+    <skip />
+    <!-- no translation found for print_menu_item_add_printers (2890738028215834012) -->
+    <skip />
+    <!-- no translation found for print_feature_state_on (8098901852502441048) -->
+    <skip />
+    <!-- no translation found for print_feature_state_off (7294876968403966040) -->
+    <skip />
     <!-- no translation found for power_usage_summary_title (7190304207330319919) -->
     <skip />
     <string name="power_usage_summary" msgid="7237084831082848168">"Consumaders da l\'accu"</string>
@@ -1905,7 +2163,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) -->
@@ -1913,9 +2171,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) -->
@@ -1927,7 +2185,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>
@@ -1938,13 +2197,19 @@
     <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 />
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Datas tramessas"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Datas recepidas"</string>
+    <!-- no translation found for usage_type_data_send (3875198715268918671) -->
+    <skip />
+    <!-- no translation found for usage_type_data_recv (6694951443404021754) -->
+    <skip />
+    <!-- no translation found for usage_type_data_wifi_send (7178327382353096029) -->
+    <skip />
+    <!-- no translation found for usage_type_data_wifi_recv (7822328607564241372) -->
+    <skip />
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Temp activ"</string>
@@ -1956,7 +2221,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>
@@ -1967,8 +2232,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 />
@@ -1984,6 +2250,8 @@
     <skip />
     <!-- no translation found for battery_sugg_apps_settings (3974902365643634514) -->
     <skip />
+    <!-- no translation found for battery_desc_users (7682989161885027823) -->
+    <skip />
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> dapi la deconnexiun"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Dapi la davosa deconnexiun (<xliff:g id="UNPLUGGED">%1$s</xliff:g>)"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Consum en total"</string>
@@ -2015,6 +2283,8 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Autezza dal tun"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Influenzescha il tun dal text discurrì"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Lingua"</string>
+    <!-- no translation found for tts_lang_not_selected (7395787019276734765) -->
+    <skip />
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Definescha la vusch specifica da mintga lingua per il text pledà"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Tadlar in exempel"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Far ina curta demonstraziun da la sintesa vocala"</string>
@@ -2028,6 +2298,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>
@@ -2052,8 +2324,37 @@
     <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 />
+    <!-- no translation found for gadget_state_on (6909119593004937688) -->
+    <skip />
+    <!-- no translation found for gadget_state_off (5220212352953066317) -->
+    <skip />
+    <!-- no translation found for gadget_state_turning_on (3395992057029439039) -->
+    <skip />
+    <!-- no translation found for gadget_state_turning_off (2395546048102176157) -->
+    <skip />
+    <!-- no translation found for gadget_wifi (4712584536500629417) -->
+    <skip />
+    <!-- no translation found for gadget_bluetooth (8998572807378694410) -->
+    <skip />
+    <!-- no translation found for gadget_gps (1558173602059236567) -->
+    <skip />
+    <!-- no translation found for gadget_sync (858895763714222152) -->
+    <skip />
+    <!-- no translation found for gadget_brightness_template (930541920933123603) -->
+    <skip />
+    <!-- no translation found for gadget_brightness_state_auto (6667967252426515446) -->
+    <skip />
+    <!-- no translation found for gadget_brightness_state_full (6814570109772137631) -->
+    <skip />
+    <!-- no translation found for gadget_brightness_state_half (3696671957608774204) -->
+    <skip />
+    <!-- no translation found for gadget_brightness_state_off (946382262872753084) -->
+    <skip />
     <!-- no translation found for vpn_settings_title (5662579425832406705) -->
     <skip />
     <!-- no translation found for credentials_title (4446234003860769883) -->
@@ -2074,6 +2375,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) -->
@@ -2108,7 +2415,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 />
@@ -2117,12 +2424,6 @@
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauraziun automatica"</string>
     <!-- no translation found for auto_restore_summary (4235615056371993807) -->
     <skip />
-    <!-- no translation found for bugreport_title (1009498799922543551) -->
-    <skip />
-    <!-- no translation found for bugreport_message (1182209569732110590) -->
-    <skip />
-    <!-- no translation found for report (302437572240018342) -->
-    <skip />
     <!-- no translation found for local_backup_password_title (3860471654439418822) -->
     <skip />
     <!-- no translation found for local_backup_password_summary_none (393503434408227110) -->
@@ -2136,7 +2437,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>
@@ -2157,13 +2458,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 />
@@ -2207,11 +2508,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 />
@@ -2343,6 +2644,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) -->
@@ -2365,19 +2668,17 @@
     <skip />
     <!-- no translation found for show_hw_screen_updates_summary (1115593565980196197) -->
     <skip />
+    <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+    <skip />
+    <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+    <skip />
+    <!-- no translation found for debug_hw_overdraw (2968692419951565417) -->
+    <skip />
     <!-- no translation found for disable_overlays (2074488440505934665) -->
     <skip />
     <!-- no translation found for disable_overlays_summary (3578941133710758592) -->
     <skip />
-    <!-- no translation found for 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) -->
+    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
     <skip />
     <!-- no translation found for debug_layout (5981361776594526155) -->
     <skip />
@@ -2391,9 +2692,13 @@
     <skip />
     <!-- no translation found for force_hw_ui_summary (5535991166074861515) -->
     <skip />
-    <!-- no translation found for track_frame_time (6146354853663863443) -->
+    <!-- no translation found for force_msaa (7920323238677284387) -->
     <skip />
-    <!-- no translation found for track_frame_time_summary (447577515813970287) -->
+    <!-- no translation found for force_msaa_summary (9123553203895817537) -->
+    <skip />
+    <!-- no translation found for show_non_rect_clip (505954950474595172) -->
+    <skip />
+    <!-- no translation found for track_frame_time (6146354853663863443) -->
     <skip />
     <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
     <skip />
@@ -2401,6 +2706,8 @@
     <skip />
     <!-- no translation found for animator_duration_scale_title (3406722410819934083) -->
     <skip />
+    <!-- no translation found for overlay_display_devices_title (5364176287998398539) -->
+    <skip />
     <!-- no translation found for debug_applications_category (4206913653849771549) -->
     <skip />
     <!-- no translation found for immediately_destroy_activities (8366775083630234121) -->
@@ -2413,6 +2720,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) -->
@@ -2423,7 +2734,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 />
@@ -2451,9 +2762,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 />
@@ -2515,7 +2826,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 (7132639594296036143) -->
+    <skip />
+    <!-- no translation found for data_usage_restrict_background_multiuser (2642864376010074543) -->
     <skip />
     <!-- no translation found for data_usage_sweep_warning (6387081852568846982) -->
     <skip />
@@ -2523,6 +2838,8 @@
     <skip />
     <!-- no translation found for data_usage_uninstalled_apps (614263770923231598) -->
     <skip />
+    <!-- no translation found for data_usage_uninstalled_apps_users (7986294489899813194) -->
+    <skip />
     <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
     <skip />
     <!-- no translation found for data_usage_total_during_range (4091294280619255237) -->
@@ -2533,13 +2850,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 />
@@ -2602,6 +2919,14 @@
     <skip />
     <!-- no translation found for vpn_menu_delete (8098021690546891414) -->
     <skip />
+    <!-- no translation found for vpn_menu_lockdown (7863024538064268139) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_summary (2200032066376720339) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_none (9214462857336483711) -->
+    <skip />
+    <!-- no translation found for vpn_lockdown_config_error (3898576754914217248) -->
+    <skip />
     <!-- no translation found for vpn_no_network (3050233675132726155) -->
     <skip />
     <!-- no translation found for vpn_missing_cert (7972907102570411501) -->
@@ -2638,44 +2963,167 @@
     <skip />
     <!-- no translation found for additional_system_update_settings_list_item_title (214987609894661992) -->
     <skip />
-    <!-- no translation found for user_settings_title (5189224330534906766) -->
+    <!-- no translation found for selinux_status_disabled (924551035552323327) -->
     <skip />
-    <!-- no translation found for user_list_title (2152311434413878709) -->
+    <!-- no translation found for selinux_status_permissive (6004965534713398778) -->
     <skip />
-    <!-- no translation found for user_add_user_menu (1675956975014862382) -->
+    <!-- no translation found for selinux_status_enforcing (2252703756208463329) -->
     <skip />
-    <!-- no translation found for user_details_title (3037625632127241370) -->
+    <!-- no translation found for user_settings_title (6151874007858148344) -->
     <skip />
-    <!-- no translation found for user_information_heading (8728151075759863162) -->
+    <!-- no translation found for user_list_title (7937158411137563543) -->
     <skip />
-    <!-- no translation found for user_name_title (7563724675699398319) -->
+    <!-- no translation found for user_add_user_menu (3154537325132012954) -->
     <skip />
-    <!-- no translation found for user_restrictions_heading (4426403050397418553) -->
+    <!-- no translation found for user_summary_restricted_profile (6354966213806839107) -->
     <skip />
-    <!-- no translation found for user_market_requires_pin (3260702297207279414) -->
+    <!-- no translation found for user_need_lock_message (2596365678651842785) -->
     <skip />
-    <!-- no translation found for user_max_content_rating (8297759970216482772) -->
+    <!-- no translation found for user_set_lock_button (8311219392856626841) -->
     <skip />
-    <!-- no translation found for user_system_apps_heading (2408331798732183682) -->
+    <!-- no translation found for user_summary_not_set_up (8778205026866794909) -->
     <skip />
-    <!-- no translation found for user_market_apps_heading (4657387297168308251) -->
+    <!-- no translation found for user_summary_restricted_not_set_up (1628116001964325544) -->
     <skip />
-    <!-- no translation found for user_discard_user_menu (6638388031088461242) -->
+    <!-- no translation found for user_owner (3879126011135546571) -->
     <skip />
-    <!-- no translation found for user_remove_user_menu (3210146886949340574) -->
+    <!-- no translation found for user_you (1639158809315025986) -->
     <skip />
-    <!-- no translation found for user_new_user_name (7603010274765911161) -->
+    <!-- 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 (3086244205384741788) -->
+    <skip />
+    <!-- no translation found for user_add_user_message_short (3310933423737035428) -->
+    <skip />
+    <!-- no translation found for user_setup_dialog_title (1765794166801864563) -->
+    <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) -->
+    <skip />
+    <!-- no translation found for user_cannot_manage_message (8440449301994432789) -->
+    <skip />
+    <!-- no translation found for user_cannot_manage_message (1133251987818014757) -->
+    <skip />
+    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
+    <skip />
+    <!-- no translation found for user_remove_user_menu (6897150520686691355) -->
+    <skip />
+    <!-- no translation found for user_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_confirm_remove_message (5284111415714437285) -->
+    <!-- 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) -->
+    <skip />
+    <!-- no translation found for user_confirm_remove_message (4610106937214870034) -->
+    <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) -->
+    <skip />
+    <!-- no translation found for global_locale_change_title (5956281361384221451) -->
+    <skip />
+    <!-- no translation found for global_font_change_title (1887126466191012035) -->
+    <skip />
+    <!-- no translation found for restriction_settings_title (4233515503765879736) -->
+    <skip />
+    <!-- no translation found for restriction_menu_reset (2067644523489568173) -->
+    <skip />
+    <!-- no translation found for restriction_menu_change_pin (740081584044302775) -->
     <skip />
     <!-- no translation found for app_notifications_switch_label (9124072219553687583) -->
     <skip />
     <!-- no translation found for help_label (1107174367904110532) -->
     <skip />
+    <!-- no translation found for user_account_title (1127193807312271167) -->
+    <skip />
+    <!-- no translation found for user_picture_title (7297782792000291692) -->
+    <skip />
     <!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
     <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 (6160672982086584261) -->
+    <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 b9ea10f..74f8f83 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,16 +218,127 @@
     <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="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Dispozitiv"</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>
+    <item msgid="5124443975763747838">"butoane media"</item>
+    <item msgid="4547883971364273343">"focalizare audio"</item>
+    <item msgid="2603878814882344450">"volum principal"</item>
+    <item msgid="7136963238377062018">"volum voce"</item>
+    <item msgid="4270236897655923007">"volum sonerie"</item>
+    <item msgid="6325739889222559394">"volum media"</item>
+    <item msgid="5762123934816216821">"volum alarmă"</item>
+    <item msgid="785049718065337473">"volum notificări"</item>
+    <item msgid="6700305533746877052">"volumul Bluetooth"</item>
+    <item msgid="2029227495214047094">"mențineți activ"</item>
+    <item msgid="26109888160231211">"monitorizarea locației"</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>
+    <item msgid="5753789168376302997">"Butoane media"</item>
+    <item msgid="3265262911688671938">"Focalizare audio"</item>
+    <item msgid="2098976479485046797">"Volum principal"</item>
+    <item msgid="5660213838861789350">"Volum voce"</item>
+    <item msgid="7983336752371254444">"Volum sonerie"</item>
+    <item msgid="7878027809189330917">"Volum media"</item>
+    <item msgid="7260546305036218513">"Volum alarmă"</item>
+    <item msgid="9103719301075748925">"Volum notificări"</item>
+    <item msgid="7025966722295861512">"Volum Bluetooth"</item>
+    <item msgid="4665183401128289653">"Mențineți activ"</item>
+    <item msgid="8584357129746649222">"Locație"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Scurtă"</item>
     <item msgid="2560532955514699713">"Medie"</item>
     <item msgid="2372711992605524591">"Lungă"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (depanare)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Utilizați Dalvik"</item>
+    <item msgid="5131846588686178907">"Utilizați ART"</item>
+    <item msgid="4530003713865319928">"Utilizați ART, versiunea de depanare"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nu verificaţi niciodată"</item>
     <item msgid="6042769699089883931">"Verificaţi doar pentru conţinut DRM"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Animaţie la scara 5x"</item>
     <item msgid="1069584980746680398">"Animaţie la scara 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Niciuna"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi şi 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Niciuna"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Dezactivată"</item>
+    <item msgid="7688197031296835369">"Afișați zonele cu suprapunere"</item>
+    <item msgid="8332661909019981149">"Afișați contorul de suprapunere"</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>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Timp limită"</item>
     <item msgid="7664124146786465092">"Nereuşită"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Întrebaţi"</item>
+    <item msgid="5077768429488260031">"Nu permiteţi niciodată"</item>
+    <item msgid="1417929597727989746">"Permiteţi întotdeauna"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 1f89441..f0ddbbd 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -19,8 +19,16 @@
     <string name="yes" msgid="4676390750360727396">"Da"</string>
     <string name="no" msgid="6731231425810196216">"Nu"</string>
     <string name="create" msgid="3578857613172647409">"Creaţi"</string>
+    <string name="allow" msgid="3349662621170855910">"Permiteți"</string>
+    <string name="deny" msgid="6947806159746484865">"Refuzați"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Necunoscută"</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS ŞI REŢELE"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Mai aveți de parcurs <xliff:g id="STEP_COUNT">%1$d</xliff:g> pas pentru a deveni dezvoltator."</item>
+    <item quantity="other" msgid="6722953419953594148">"Mai aveți de parcurs <xliff:g id="STEP_COUNT">%1$d</xliff:g> pași pentru a deveni dezvoltator."</item>
+  </plurals>
+    <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_device" msgid="5781174212691167553">"DISPOZITIV"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
     <string name="header_category_system" msgid="2073558547468647128">"SISTEM"</string>
@@ -58,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>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Încarcă"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Descărcare"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(wireless)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Nu se încarcă"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nu încarcă"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Complet"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Deconectat"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"wireless"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Necunoscut"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Necunoscut"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Eroare necunoscută"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Golită"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Detectabil"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Vizibil pt. dispoz. Bluetooth din aprop. (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Vizibil pt. toate disp. Bluetooth din apropiere"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nu este vizibil pentru alte dispozitive Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Vizibil numai pe dispozitivele asociate"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Setaţi dispozitivul ca detectabil"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timp limită pentru vizibilitate"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Setaţi cât timp va fi detectabil dispozitivul"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Blocaţi apelarea vocală"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Împiedicaţi apelarea prin Bluetooth când este blocat ecranul"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispozitive Bluetooth"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Afişaţi fişierele primite"</string>
     <string name="device_picker" msgid="8398232791303186677">"Selector de dispozitive Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitare de permisiune Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"O aplicaţie încearcă să activeze funcţia Bluetooth. Permiteţi?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"O aplicaţie de pe tableta dvs. încearcă să facă tableta detectabilă de alte dispozitive Bluetooth pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde. Permiteţi?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"O aplicaţie de pe telefonul dvs. încearcă să facă telefonul detectabil de alte dispozitive Bluetooth pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde. Permiteţi?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"O aplicaţie de pe tableta dvs. încearcă să facă tableta „detectabilă întotdeauna” de alte dispozitive Bluetooth. Permiteţi?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"O aplicaţie de pe telefonul dvs. încearcă să facă telefonul „detectabil întotdeauna” de alte dispozitive Bluetooth. Permiteţi?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"O aplicaţie de pe tableta dvs. încearcă să activeze Bluetooth, astfel încât aceasta să fie detectabilă de alte dispozitive pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde. Permiteţi?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"O aplicaţie de pe telefonul dvs. încearcă să activeze Bluetooth, astfel încât acesta să fie detectabil de alte dispozitive pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde. Permiteţi?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"O aplicaţie de pe tableta dvs. încearcă să activeze Bluetooth, astfel încât aceasta să fie detectabilă de alte dispozitive. Permiteţi?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"O aplicaţie de pe telefonul dvs. încearcă să activeze Bluetooth, astfel încât acesta să fie detectabil de alte dispozitive. Permiteţi?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"O aplicație încearcă să activeze Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"O aplicație încearcă să facă tableta vizibilă pentru alte gadgeturi Bluetooth pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"O aplicație încearcă să facă telefonul vizibil pentru alte gadgeturi Bluetooth pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"O aplicație încearcă să facă tableta vizibilă pentru alte gadgeturi Bluetooth. Puteți modifica ulterior acest lucru din setările Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"O aplicație încearcă să facă telefonul vizibil pentru alte gadgeturi Bluetooth. Puteți modifica ulterior acest lucru din setările Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"O aplicație încearcă să activeze Bluetooth și să facă tableta vizibilă pentru alte gadgeturi pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"O aplicație încearcă să activeze Bluetooth și să facă telefonul vizibil pentru alte gadgeturi pentru <xliff:g id="TIMEOUT">%1$d</xliff:g> (de) secunde."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"O aplicație încearcă să activeze Bluetooth și să facă tableta vizibilă pentru alte gadgeturi. Puteți modifica ulterior acest lucru din setările Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"O aplicație încearcă să activeze Bluetooth și să facă telefonul vizibil pentru alte gadgeturi. Puteți modifica ulterior acest lucru din setările Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Se activează Bluetooth?"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Se dezactivează Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conectare automată"</string>
@@ -172,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>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy-ul HTTP este utilizat de browser, dar nu poate fi utilizat de alte aplicaţii."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Locaţie:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vecin:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informaţii celulă:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Încercări de date:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Serviciu GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Aţi pierdut conectivitatea la date deoarece aţi părăsit reţeaua de domiciliu neavând activat roamingul."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Activaţi"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Când permiteţi roamingul de date puteţi acumula taxe considerabile pentru roaming!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Dacă permiteţi roamingul de date, puteţi acumula cheltuieli considerabile pentru roaming!\n\nAceastă setare afectează toţi utilizatorii de pe această tabletă."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Dacă permiteţi roamingul de date, puteţi acumula cheltuieli considerabile pentru roaming!\n\nAceastă setare afectează toţi utilizatorii de pe acest telefon."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Permiteţi roamingul de date?"</string>
     <string name="networks" msgid="6333316876545927039">"Selectarea operatorului"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Alegeţi un operator de reţea"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info. proprietar"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necesită un cod PIN numeric sau o parolă de decriptare a tabletei la fiecare pornire a acesteia"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Necesită un cod PIN numeric sau o parolă de decriptare a telefonului la fiecare pornire a acestuia"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Criptat"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puteţi să criptaţi conturi, setări, aplicaţii descărcate şi datele acestora, fişiere media şi alte tipuri de fişiere. După criptarea tabletei, trebuie să introduceţi un cod PIN numeric sau o parolă pentru a o decripta de fiecare dată când o porniţi. Nu puteţi decripta tableta decât prin resetarea configurării din fabrică, ceea ce va şterge toate datele de pe aceasta."\n\n"Criptarea poate dura cel puţin o oră. Trebuie să începeţi cu o baterie încărcată şi să ţineţi tableta conectată până la finalizarea criptării. Întreruperea procesului de criptare poate duce la pierderea tuturor datelor sau a unor părţi din acestea."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puteţi să criptaţi conturi, setări, aplicaţii descărcate şi datele acestora, fişiere media şi alte tipuri de fişiere. După criptarea telefonului, trebuie să introduceţi un cod PIN numeric sau o parolă pentru a-l decripta de fiecare dată când îl porniţi. Nu puteţi decripta telefonul decât prin resetarea configurării din fabrică, ceea ce va şterge toate datele de pe acesta."\n\n"Criptarea poate dura cel puţin o oră. Trebuie să începeţi cu o baterie încărcată şi să ţineţi telefonul conectat până la finalizarea criptării. Întreruperea procesului de criptare poate duce la pierderea tuturor datelor sau a unor părţi din acestea."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puteţi să criptaţi conturi, setări, aplicaţii descărcate şi datele acestora, fişiere media şi alte tipuri de fişiere. După criptarea tabletei, trebuie să introduceţi un cod PIN numeric sau o parolă pentru a o decripta de fiecare dată când o porniţi. Nu puteţi decripta tableta decât prin resetarea configurării din fabrică, ceea ce va şterge toate datele de pe aceasta.\n\nCriptarea poate dura cel puţin o oră. Trebuie să începeţi cu o baterie încărcată şi să ţineţi tableta conectată până la finalizarea criptării. Întreruperea procesului de criptare poate duce la pierderea tuturor datelor sau a unor părţi din acestea."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puteţi să criptaţi conturi, setări, aplicaţii descărcate şi datele acestora, fişiere media şi alte tipuri de fişiere. După criptarea telefonului, trebuie să introduceţi un cod PIN numeric sau o parolă pentru a-l decripta de fiecare dată când îl porniţi. Nu puteţi decripta telefonul decât prin resetarea configurării din fabrică, ceea ce va şterge toate datele de pe acesta.\n\nCriptarea poate dura cel puţin o oră. Trebuie să începeţi cu o baterie încărcată şi să ţineţi telefonul conectat până la finalizarea criptării. Întreruperea procesului de criptare poate duce la pierderea tuturor datelor sau a unor părţi din acestea."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Criptaţi tableta"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Criptaţi telefonul"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Încărcaţi bateria şi încercaţi din nou."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Încercaţi din nou peste <xliff:g id="DELAY">^1</xliff:g> (de) secunde."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Introduceţi parola"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Criptare nereuşită"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Criptarea a fost întreruptă şi nu se poate finaliza. Prin urmare, datele de pe tableta dvs. nu mai sunt accesibile. "\n\n"Pentru a relua utilizarea tabletei, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi tableta după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Criptarea a fost întreruptă şi nu se poate finaliza. Prin urmare, datele de pe telefonul dvs. nu mai sunt accesibile. "\n\n"Pentru a relua utilizarea telefonului, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi telefonul după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Criptarea a fost întreruptă şi nu se poate finaliza. Prin urmare, datele de pe tableta dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea tabletei, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi tableta după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Criptarea a fost întreruptă şi nu se poate finaliza. Prin urmare, datele de pe telefonul dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea telefonului, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi telefonul după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Comutaţi metoda de introducere"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Alegeţi blocare ecran"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Aleg. blocare rezervă"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Schimbaţi codul PIN de deblocare"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Schimbaţi parola pentru deblocare"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Parola trebuie să conţină minimum %d (de) caractere"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Codul PIN trebuie să conţin minimum %d (de) caractere"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Codul PIN trebuie să aibă minimum %d cifre"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Atingeţi Continuaţi la terminare"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuaţi"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Parola trebuie să aibă mai puţin de <xliff:g id="NUMBER">%d</xliff:g> (de) caractere."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ca difuzor"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pentru muzică şi fişiere media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Reţineţi setările"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Afişaje împerecheate"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dispozitive disponibile"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Se conectează"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Conectat"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponibil"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Se utilizează"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Setări de afişare"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Deconectaţi?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Această acţiune va încheia conexiunea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Opțiuni pentru ecrane wireless"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Eliminaţi"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Terminat"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Nume"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Pornit"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Oprit"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Dezactivat"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permiteţi schimbul de date atunci când tableta atinge alt dispozitiv"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permiteţi schimbul de date atunci când telefonul atinge alt dispozitiv"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Dezactivată"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponibilă, deoarece NFC este oprit"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"După activarea acestei funcţii, puteţi transmite conţinutul aplicaţiilor către un alt dispozitiv compatibil NFC, ţinând cele două dispozitive apropiate unul de celălalt. De exemplu, puteţi să transmiteţi pagini din browser, videoclipuri YouTube, persoane din agendă şi multe altele."\n\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="android_beam_explained" msgid="6981652347448777459">"După activarea acestei funcţii, puteţi transmite conţinutul aplicaţiilor către un alt dispozitiv compatibil NFC, ţinând cele două dispozitive apropiate unul de celălalt. De exemplu, puteţi să transmiteţi pagini din browser, videoclipuri YouTube, persoane din agendă şi multe altele.\n\nNu trebuie decât să apropiaţi cele două dispozitive (de obicei, aşezându-le unul în spatele celuilalt) şi să atingeţi ecranul. Aplicaţia determină apoi ce poate fi transmis."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Descoperire serviciu de reţea"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permite aplicaţiilor de pe alte dispozitive să descopere aplicaţii pe acest dispozitiv"</string>
-    <string name="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="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="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="8116564886303972764">"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_in_progress" msgid="2944576520214787628">"Configurarea WPS este deja în desfăşurare şi poate dura până la două minute pentru a se finaliza"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Setarea de securitate pentru routerul wireless (TKIP) nu este acceptată"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentificare eşuată. Încercaţi din nou."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"A fost detectată altă sesiune WPS. Încercaţi din nou peste câteva minute."</string>
     <string name="wifi_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>
@@ -564,6 +621,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\nPermiteț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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Salvaţi"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nu s-a putut salva reţeaua"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Anulaţi"</string>
-    <string name="wifi_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_skip_anyway" msgid="6965361454438011190">"Ignoraţi oricum"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"Nu ignoraţi"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"AVERTISMENT: puteţi acumula costuri suplimentare pentru date de la operator.\n\nConfigurarea 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\nConfigurarea telefonului poate presupune o activitate semnificativă în reţea."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Se caută…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Redenumiţi dispozitivul"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Împerecheaţi dispozitivele"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Grupuri reţinute"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Conectarea nu s-a putut realiza."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Dispozitivul nu a fost redenumit."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Deconectaţi?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Dacă vă deconectaţi, conexiunea cu <xliff:g id="PEER_NAME">%1$s</xliff:g> şi cu alte <xliff:g id="PEER_COUNT">%2$s</xliff:g> dispozitive se va încheia."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Anulaţi invitaţia?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Doriţi să anulaţi invitaţia de conectare cu <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portabil"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Eliminaţi acest grup?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Hotspot Wi-Fi portabil"</string>
+    <string name="wifi_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>
@@ -616,17 +688,17 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Efecte muzicale"</string>
     <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="312032901303146002">"Notificare prestabilită"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Indicator luminos de notificare prin pulsaţie"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Sunet de notificare prestabilit"</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>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Alegeţi tonul de sonerie pentru notificări"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Sunet de notificare prestabilit"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Media"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Setaţi volumul pentru muzică şi videoclipuri"</string>
     <string name="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>
@@ -670,16 +742,17 @@
     <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="screensaver_settings_title" msgid="3848608373818910549">"Abţibilduri pentru ecran"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Va porni după un interval de inactivitate, dacă dispozitivul este conectat la alimentare"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Dezactivat"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Abţibild pentru ecran selectat"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Când se activează"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"După un interval de inactivitate de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Niciodată"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Încercaţi-l!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Porneşte şi când dispozitivul este andocat"</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>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"În timpul încărcării"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Când dispozitivul este andocat"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Dezactivat"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Pentru a controla ceea ce se întâmplă când telefonul este andocat şi/sau în modul inactiv, activaţi Daydream."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Când porneşte Daydreams"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Începeţi acum"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Setări"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminozitate automată"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Dimensiune font"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Dimensiune font"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Cod PIN incorect"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Codurile PIN nu corespund"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Nu se poate schimba codul PIN."\n"Codul PIN poate fi incorect."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Nu se poate schimba codul PIN.\nCodul PIN poate fi incorect."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Codul PIN pentru SIM a fost modificat"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Nu se poate modifica starea de blocare a cardului SIM."\n"Codul PIN poate fi incorect."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Nu se poate modifica starea de blocare a cardului SIM.\nCodul PIN poate fi incorect."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Anulaţi"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stare tabletă"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Versiunea benzii de bază"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Versiune nucleu"</string>
     <string name="build_number" msgid="3075795840572241758">"Numărul versiunii"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Stare SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Indisponibil"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stare"</string>
     <string name="device_status" msgid="607405385799807324">"Stare"</string>
@@ -733,12 +807,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">"Tip de reţea mobilă"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Informații operator"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Starea reţelei mobile"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Starea acoperirii"</string>
     <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>
@@ -748,14 +823,16 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Stocare USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Card SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"Disponibil"</string>
+    <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>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (muzică, tonuri de sonerie, podcasturi etc.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Diverse"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Datele memorate în cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Demontaţi stoc. distrib."</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Demontaţi cardul SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Demontaţi stocarea USB internă"</string>
@@ -766,11 +843,13 @@
     <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="read_only" msgid="6702420168629076340">" (numai citire)"</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>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Demontaţi cardul SD?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Dacă demontaţi stocarea USB, unele aplicaţii pe care le utilizaţi se vor opri şi ar putea fi nedisponibile până la remontarea stocării USB."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Cameră foto (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Vă permite să transferaţi fotografii utilizând software-ul camerei foto şi să transferaţi fişiere de pe computere care nu acceptă MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Instalaţi instrumentul de transfer al fişierelor"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Alţi utilizatori"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stare baterie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivelul bateriei"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Nume APN"</string>
@@ -822,7 +902,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>
@@ -835,37 +917,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_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_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>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajutor"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Reţele mobile"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Gestionați planul de date mobile"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operator de SIM necunoscut"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Niciun site de provizionare cunoscut pentru %1$s"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Introduceți cartela SIM și reporniți"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conectați-vă la internet"</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>
@@ -917,6 +1004,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Afişaţi informaţii legale, starea şi versiunea programului software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informaţii de ordin juridic"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Colaboratori"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Informaţii reglementare"</string>
     <string name="copyright_title" msgid="865906688917260647">"Drept de autor"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenţă"</string>
     <string name="terms_title" msgid="7697580845616764642">"Termeni şi condiţii"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Schimbaţi codul PIN de deblocare"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Confirmaţi modelul salvat"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Încercaţi din nou:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Desenaţi un model pentru deblocare"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Desenați un model pentru deblocare:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Apăsaţi pe Meniu pentru ajutor."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Ridicaţi degetul când aţi terminat."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Conectaţi minimum <xliff:g id="NUMBER">%d</xliff:g> (de) puncte. Încercaţi din nou:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Modul de desenare a unui model de deblocare"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Prea multe încercări incorecte!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Încercaţi din nou peste <xliff:g id="NUMBER">%d</xliff:g> (de) secunde."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Anulaţi"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Înainte"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Securizarea tabletei"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Securizarea telefonului"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protejaţi tableta împotriva utilizării neautorizate, prin crearea unui model personal de deblocare a ecranului. Glisaţi uşor cu degetul pentru a conecta, în orice ordine doriţi, punctele de pe ecranul următor. Trebuie să conectaţi cel puţin patru puncte. "\n\n"Sunteţi gata să începeţi? Atingeţi „Înainte”"</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protejaţi telefonul împotriva utilizării neautorizate, prin crearea unui model personal de deblocare a ecranului. Glisaţi uşor cu degetul pentru a conecta, în orice ordine doriţi, cel puţin patru puncte de pe ecranul următor. "\n\n"Sunteţi gata să începeţi? Atingeţi Înainte."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Aplicaţia nu este instalată pe telefonul dvs."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestionaţi aplicaţii"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestionaţi şi eliminaţi aplicaţiile instalate"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplicaţii"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Permiteţi instalarea aplicaţiilor din surse necunoscute"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tableta şi datele dvs. personale sunt mai vulnerabile la un atac din partea aplicaţiilor ce provin din surse necunoscute. Sunteţi de acord că sunteţi singura persoană responsabilă pentru deteriorarea tabletei sau pierderea datelor ce pot avea loc ca urmare a utilizării acestor aplicaţii."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefonul şi datele dvs. personale sunt mai vulnerabile la un atac din partea aplicaţiilor ce provin din surse necunoscute. Sunteţi de acord că sunteţi singura persoană responsabilă pentru deteriorarea telefonului sau pierderea datelor ce pot avea loc ca urmare a utilizării acestor aplicaţii."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Verificaţi aplicaţiile"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Respingeţi sau avertizaţi înainte de instalarea unor aplicaţii care pot cauza daune"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Setări avansate"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Activaţi mai multe opţiuni pentru setări"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informaţii despre aplicaţie"</string>
@@ -1001,14 +1086,16 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Stocare date pe USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Card SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Dezinstalaţi"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Dezinstalaţi pentru toţi utilizatorii"</string>
+    <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>
@@ -1019,23 +1106,25 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Procese memorie cache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Resetați pref. aplicații"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Resetaţi pref. aplicații?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Astfel vor fi resetate toate preferinţele pentru:"\n\n" "<li>"aplicaţii dezactivate;"</li>\n" "<li>"notificări de aplicaţii dezactivate;"</li>\n" "<li>"aplicaţii prestabilite pentru acţiuni;"</li>\n" "<li>"restricţii privind datele de fundal pentru aplicaţii."</li>\n\n" Nu veţi pierde nimic din datele aplicaţiilor."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Astfel vor fi resetate toate preferinţele pentru:\n\n "<li>"aplicaţii dezactivate;"</li>\n" "<li>"notificări de aplicaţii dezactivate;"</li>\n" "<li>"aplicaţii prestabilite pentru acţiuni;"</li>\n" "<li>"restricţii privind datele de fundal pentru aplicaţii."</li>\n\n" Nu veţi pierde nimic din datele aplicaţiilor."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetaţi aplicaţiile"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gestionaţi spaţiul"</string>
     <string name="filter" msgid="2018011724373033887">"Filtraţi"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Alegeţi opţiunile de filtrare"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Pe cardul SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Dezactivată"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Neinstalată"</string>
     <string name="no_applications" msgid="7336588977497084921">"Nu există aplicaţii."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Stocare internă"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Stocare USB"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Stocare card SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Se recalculează dimensiunea..."</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Ştergeţi datele aplicaţiei?"</string>
+    <string name="clear_data_dlg_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>
@@ -1044,7 +1133,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>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> şi <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Această aplicaţie poate să genereze costuri:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Trimiteţi SMS premium"</string>
     <string name="computing_size" msgid="1599186977475211186">"În curs de calculare..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Nu s-a putut calcula mărimea pachetului."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Nu aveţi instalată nicio aplicaţie terţă parte."</string>
@@ -1077,8 +1168,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_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>
@@ -1094,6 +1190,8 @@
     <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">"Utilizator: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Utilizator eliminat"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces şi <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviciu"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces şi <xliff:g id="NUMSERVICES">%2$d</xliff:g> (de) servicii"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> (de) procese şi <xliff:g id="NUMSERVICES">%2$d</xliff:g> serviciu"</string>
@@ -1114,10 +1212,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>
@@ -1128,8 +1226,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="show_password_summary" msgid="7345931695292850058"></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>
@@ -1145,9 +1242,7 @@
     <!-- no translation found for keyboard_layout_default_label (2952672513543482165) -->
     <skip />
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Aspecte tastatură"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicţionarul utilizatorului"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dicţionar personal"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Dicţionare personale"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Dicționar personal"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Adăugaţi"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Adăugaţi în dicţionar"</string>
@@ -1158,9 +1253,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>
@@ -1173,7 +1270,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>
@@ -1186,7 +1283,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>
@@ -1198,24 +1295,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ecranul nu va fi inactiv pe durata încărcării"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activați jurnalul de examinare HCI Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Înregistrați toate pachetele HCI Bluetooth într-un fișier"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Select. mediul de execuție"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Select. mediul de execuție"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Reporniți pentru a schimba mediul de execuție de la <xliff:g id="OLD">%1$s</xliff:g> la <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permiteţi locaţiile fictive"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permiteţi locaţiile fictive"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Verificaţi aplicaţiile instalate utilizând ADB/ADT, pentru a detecta un comportament dăunător."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protejaţi stocarea USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplicaţiile trebuie să ceară permisiunea de a citi stocarea USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Protejaţi stocarea USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Când stocarea USB este protejată, aplicaţiile trebuie să solicite permisiunea de a citi datele de pe stocarea externă."\n\n"Este posibil ca unele aplicaţii să nu funcţioneze înainte de a fi actualizate de către dezvoltatorii lor."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Când stocarea USB este protejată, aplicaţiile trebuie să solicite permisiunea de a citi datele de pe stocarea externă.\n\nEste posibil ca unele aplicaţii să nu funcţioneze înainte de a fi actualizate de către dezvoltatorii lor."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Protejaţi cardul SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplicaţiile trebuie să ceară permisiunea de a citi cardul SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Protejaţi cardul SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Când cardul SD este protejat, aplicaţiile trebuie să solicite permisiunea de a citi datele de pe stocarea externă."\n\n"Este posibil ca unele aplicaţii să nu funcţioneze înainte de a fi actualizate de către dezvoltatorii lor."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Când cardul SD este protejat, aplicaţiile trebuie să solicite permisiunea de a citi datele de pe stocarea externă.\n\nEste posibil ca unele aplicaţii să nu funcţioneze înainte de a fi actualizate de către dezvoltatorii lor."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Aplicație terminal locală"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Activați aplicația terminal care oferă acces la shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Alegeţi obiectul gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Alegeţi obiectul widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Creaţi widgetul şi permiteţi accesul?"</string>
@@ -1235,29 +1346,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Setări de accesibilitate"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Servicii"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Text mare"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Butonul de pornire finaliz. apelul"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Rostiţi parolele"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Întâr. pt. Ating. şi menţ. apăs."</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Sporiţi accesibilitatea web"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gesturi pentru mărire"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"După activarea acestei funcţii, puteţi mări şi micşora atingând de trei ori ecranul.\n\nÎn timp ce măriţi, puteţi:\n"<ul><li>"să deplasaţi: deplasaţi două sau mai multe degete pe ecran;"</li>\n<li>"să ajustaţi nivelul de zoom: ciupiţi cu două sau mai multe degete ori îndepărtați-le."</li></ul>\n\n"De asemenea, puteţi să măriţi temporar ce se află sub degetul dvs. atingând ecranul de trei ori şi menţinând degetul pe ecran. În această stare mărită, puteţi să glisaţi degetul pentru a explora diferite părţi ale ecranului. Ridicaţi degetul pentru a reveni la starea anterioară.\n\nNotă: atingerea triplă pentru mărire funcţionează peste tot, cu excepţia tastaturii şi a barei de navigare."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Comandă rapidă accesibilitate"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Activat"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Dezactivată"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"După activarea acestei funcţii, puteţi să activaţi rapid funcţiile de accesibilitate în doi paşi:\n\nPasul 1: apăsaţi şi menţineţi apăsat butonul de pornire până când auziţi un sunet sau simţiţi o vibraţie.\n\nPasul 2: atingeţi ecranul cu două degete şi menţineţi degetele pe ecran până când auziţi o confirmare audio.\n\nDacă gadgetul are mai mulţi utilizatori, folosirea acestei comenzi rapide pe ecranul de blocare activează temporar accesibilitatea până când gadgetul este deblocat."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Text mare"</string>
+    <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 î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_menu_item_settings" msgid="3344942964710773365">"Setări"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Activat"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"Activată"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Dezactivată"</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="print_settings" msgid="4742428530112487843">"Printare"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Setări de printare"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Servicii"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utilizați <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> poate primi documentele pe care le printați. Aceste documente pot conține informații delicate."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nu există servicii instalate"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Setări"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Adăugați imprimante"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Activată"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Dezactiv."</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Acumulator"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Ce funcţii au utilizat bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Date utilizare baterie nedisp."</string>
@@ -1269,14 +1394,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>
@@ -1284,7 +1409,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>
@@ -1294,11 +1419,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Date primite"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Date mobile trimise"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Date mobile primite"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Date Wi-Fi trimise"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Date Wi-Fi primite"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Durată de activitate"</string>
@@ -1307,7 +1434,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>
@@ -1316,8 +1443,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>
@@ -1325,6 +1452,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Opriţi sau dezinstalaţi aplicaţia"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Controlaţi manual funcţia GPS pentru a împiedica utilizarea acesteia de aplicaţii"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplicaţia poate oferi setări pentru reducerea utilizării bateriei"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Baterie utilizată de utilizator"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> de la deconectare"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"De la ultima deconectare pentru <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Totaluri privind utilizarea"</string>
@@ -1340,7 +1468,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>
@@ -1351,6 +1479,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Înălţime"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afectează tonul textului vorbit"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Limbă"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nu ați selectat limba"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Setează vocea caracteristică limbii pentru textul vorbit"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Ascultaţi un exemplu"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Redaţi o demonstraţie scurtă a sintetizării vorbirii"</string>
@@ -1361,7 +1490,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>
@@ -1379,18 +1509,35 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Luminozitate <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automată"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"completă"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"pe jumătate"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"dezactivată"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Stocarea acreditărilor"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalaţi de pe stocare"</string>
     <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>
@@ -1412,14 +1559,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"La reinstalarea unei aplicaţii, restabiliţi setările şi datele pentru care aţi creat o copie de rezervă"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Executaţi un raport despre erori"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Acest raport va colecta informaţii despre starea actuală a dispozitivului, pentru a le trimite ca mesaj de e-mail. Va dura un timp din momentul pornirii raportului despre erori şi până când acesta va fi gata pentru a fi trimis, prin urmare vă rugăm să aveți puțină răbdare."</string>
-    <string name="report" msgid="302437572240018342">"Raportaţi"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Parolă cop. rez. desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"În prezent, copiile de rezervă complete pe desktop nu sunt protejate"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Atingeţi pentru a modifica sau pentru a elimina parola pentru copiile de rezervă complete pe desktop"</string>
@@ -1427,7 +1571,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>
@@ -1443,10 +1587,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>
@@ -1456,7 +1600,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>
@@ -1468,9 +1612,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\nAtingeț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>
@@ -1498,7 +1642,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Calendar"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Agendă"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Bun venit la Sincronizarea Google!"</font>" "\n"O abordare Google asupra sincronizării datelor, care vă permite accesul la agenda dvs., la întâlniri şi la multe alte informaţii, oriunde v-aţi afla."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Bun venit la Sincronizarea Google!"</font>" \nO abordare Google asupra sincronizării datelor, care vă permite accesul la agenda dvs., la întâlniri şi la multe alte informaţii, oriunde v-aţi afla."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Setări privind sincronizarea aplicaţiei"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Datele şi sincronizarea"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Schimbaţi parola"</string>
@@ -1521,7 +1665,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>
@@ -1538,6 +1682,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>
@@ -1549,39 +1694,43 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Iluminare suprafeţe toată fereastra la actualizare"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Afiş. actualiz. ecran GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Iluminare ecrane din ferestre la desenarea cu GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Actualiz. strat. hardware"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Straturile hardware clipesc verde la actualizare"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Depanați suprapunerea"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Afişaţi utiliz. procesor."</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Suprap. pe ecran indic. util. curentă a procesor."</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forţaţi redarea cu GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Forţaţi utilizarea GPU pentru desen în 2D"</string>
+    <string name="force_msaa" msgid="7920323238677284387">"Forţaţi MSAA 4x"</string>
+    <string name="force_msaa_summary" msgid="9123553203895817537">"Activaţi MSAA 4x în aplicaţiile OpenGL ES 2.0"</string>
+    <string name="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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulaţi afişaje secundare"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplicaţii"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Nu păstraţi activităţile"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Opreşte orice activitate imediat ce utilizatorul îl părăseşte"</string>
     <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="data_usage_summary_title" msgid="3804110657238092929">"Rata de utilizare a datelor"</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">"Utilizarea 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>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronizați automat datele"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Schimbaţi data ciclului..."</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Ziua din lună pentru resetarea ciclului de utilizare a datelor:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"Nicio aplic. nu a utilizat date în ac. perioadă."</string>
@@ -1592,8 +1741,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>
@@ -1608,11 +1757,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Dezact. date de fundal în reţele mobile. Dacă sunt dispon., utiliz. reţele non-mobile."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Pt. restr. dat. fundal pt. aplic., set. întâi lim. pt. date mob."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Restricţionaţi datele de fundal?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Această funcţie poate face ca o aplicaţie care depinde de datele de fundal să nu mai funcţioneze când sunt disponibile numai reţele mobile."\n\n"Puteţi găsi comenzi mai adecvate pentru utilizarea datelor în setările disponibile în cadrul aplicaţiei."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Această funcţie poate face ca o aplicaţie care depinde de datele de fundal să nu mai funcţioneze când sunt disponibile numai reţele mobile.\n\nPuteţi găsi comenzi mai adecvate pentru utilizarea datelor în setările disponibile în cadrul aplicaţiei."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Restricţionarea datelor de fundal este posibilă numai dacă aţi setat o limită de date mobile."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Activaţi sinc. autom. a datelor?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Modificările conturilor dvs. pe web vor fi copiate în mod automat pe tabletă."\n\n"Unele conturi pot să copieze, de asemenea, în mod automat toate modificările pe care le efectuaţi pe tabletă pe web. Aşa funcţionează un Cont Google."\n\n"Pentru a alege ce tipuri de informaţii se pot sincroniza în fiecare cont, accesaţi Setări &gt; Conturi."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Modificările conturilor dvs. pe web vor fi copiate în mod automat pe telefon."\n\n"Unele conturi pot să copieze, de asemenea, în mod automat toate modificările pe care le efectuaţi pe telefon pe web. Aşa funcţionează un Cont Google."\n\n"Pentru a alege ce tipuri de informaţii se pot sincroniza în fiecare cont, accesaţi Setări &gt; Conturi."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Modificările conturilor dvs. pe web vor fi copiate în mod automat pe tabletă.\n\nUnele conturi pot să copieze, de asemenea, în mod automat toate modificările pe care le efectuaţi pe tabletă pe web. Aşa funcţionează un Cont Google.\n\nPentru a alege ce tipuri de informaţii se pot sincroniza în fiecare cont, accesaţi Setări &gt; Conturi."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Modificările conturilor dvs. pe web vor fi copiate în mod automat pe telefon.\n\nUnele conturi pot să copieze, de asemenea, în mod automat toate modificările pe care le efectuaţi pe telefon pe web. Aşa funcţionează un Cont Google.\n\nPentru a alege ce tipuri de informaţii se pot sincroniza în fiecare cont, accesaţi Setări &gt; Conturi."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Dezact. sinc. autom. a datelor?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Această acţiune va economisi date şi durata bateriei, dar va trebui să sincronizaţi fiecare cont manual pentru a culege informaţiile recente. În plus, nu veţi primi notificări atunci când apar actualizări."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de resetare a ciclului de utilizare"</string>
@@ -1621,22 +1770,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Setaţi un avertisment de utilizare a datelor"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Setaţi o limită de utilizare a datelor"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitarea utilizării datelor"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Conexiunea de date mobile va fi dezactivată la atingerea limitei specificate.\n\nDin 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\nDin 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" 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\nAceastă 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\nAceastă 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Aplicaţii şi utilizatori eliminaţi"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> primiţi, <xliff:g id="SENT">%2$s</xliff:g> trimişi"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: aproximativ <xliff:g id="TOTAL">%1$s</xliff:g> utilizaţi."</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: aprox. <xliff:g id="TOTAL">%1$s</xliff:g> utilizaţi, conform tabletei. Contabilizarea operatorului poate diferi."</string>
     <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>
@@ -1667,7 +1819,11 @@
     <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>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Activarea permanentă a reţelei VPN necesită o adresă IP, atât pentru server, cât şi pentru DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Nu există nicio conexiune la reţea. Încercaţi din nou mai târziu."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Lipseşte un certificat. Editaţi profilul."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistem"</string>
@@ -1686,24 +1842,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Anulaţi"</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">"Actualizări de sistem suplimentare"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Utilizatori şi restricţii"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Utilizatori"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Adăugaţi utilizator"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Editaţi detaliile"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Informaţii despre utilizator"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Nume"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Restricţii pentru conţinut"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Este necesar codul PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Evaluarea conţinutului"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Aplicaţii de sistem"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Aplicaţii instalate"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Renunţaţi"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Elimin. utilizatorul"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Copil cicălitor"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Dezactivat"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Facultativ"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Obligatoriu"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Utilizatori"</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="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\nDupă ce creați un utilizator nou, respectiva persoană trebuie să parcurgă un proces de configurare.\n\nOricare 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\nOricare 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_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_confirm_remove_message" msgid="5284111415714437285">"Sigur doriţi să eliminaţi de pe dispozitiv utilizatorul şi toate datele asociate acestuia?"</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="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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Modificaţi dimensiunea fontului"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Restricții"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Eliminați restricțiile"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Schimbați codul PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Afişaţi notificările"</string>
     <string name="help_label" msgid="1107174367904110532">"Ajutor"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Cont pentru conţinut"</string>
+    <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="6160672982086584261">"Setați restricțiile aplicației"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controlate de <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Această aplicație nu este acceptată pentru profilurile cu permisiuni limitate"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Această aplicație poate accesa conturile dvs."</string>
+    <string name="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 da052fd..3960a26 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -50,14 +50,14 @@
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="8929270399652145290">"Сразу"</item>
-    <item msgid="6736512735606834431">"5 сек"</item>
-    <item msgid="8044619388267891375">"15 сек"</item>
-    <item msgid="1822002388249545488">"30 сек"</item>
-    <item msgid="8538071621211916519">"1 мин"</item>
-    <item msgid="5663439580228932882">"2 мин"</item>
-    <item msgid="49888496216106852">"5 минут"</item>
-    <item msgid="9002737361305019353">"10 мин"</item>
-    <item msgid="4322676235684793329">"30 мин"</item>
+    <item msgid="6736512735606834431">"Через 5 сек."</item>
+    <item msgid="8044619388267891375">"Через 15 сек."</item>
+    <item msgid="1822002388249545488">"Через 30 сек."</item>
+    <item msgid="8538071621211916519">"Через 1 мин."</item>
+    <item msgid="5663439580228932882">"Через 2 мин."</item>
+    <item msgid="49888496216106852">"Через 5 мин."</item>
+    <item msgid="9002737361305019353">"Через 10 мин."</item>
+    <item msgid="4322676235684793329">"Через 30 мин."</item>
   </string-array>
   <string-array name="entries_font_size">
     <item msgid="8166647333858618801">"Мелкий"</item>
@@ -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>
@@ -145,14 +152,14 @@
     <item msgid="5702329417707689835">"Отличный"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Всегда"</item>
+    <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>
+    <item msgid="2124319326282651391">"Не выключать"</item>
     <item msgid="7433294150916905997">"Только при питании от сети"</item>
-    <item msgid="1390404486722375028">"Никогда"</item>
+    <item msgid="1390404486722375028">"Всегда выключать"</item>
   </string-array>
   <string-array name="wifi_frequency_band_entries">
     <item msgid="624340809384223320">"Авто"</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,16 +218,127 @@
     <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="886742181977884584">"Мультимедиа"</item>
+    <item msgid="7924928667052300589">"Устройство"</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>
+    <item msgid="5124443975763747838">"кнопки мультимедиа"</item>
+    <item msgid="4547883971364273343">"аудиофокус"</item>
+    <item msgid="2603878814882344450">"общая громкость"</item>
+    <item msgid="7136963238377062018">"громкость голоса"</item>
+    <item msgid="4270236897655923007">"громкость звонка"</item>
+    <item msgid="6325739889222559394">"громкость мультимедиа"</item>
+    <item msgid="5762123934816216821">"громкость будильника"</item>
+    <item msgid="785049718065337473">"громкость уведомлений"</item>
+    <item msgid="6700305533746877052">"громкость Bluetooth-устройств"</item>
+    <item msgid="2029227495214047094">"не отключать"</item>
+    <item msgid="26109888160231211">"Отслеживать местоположение"</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>
+    <item msgid="5753789168376302997">"Кнопки мультимедиа"</item>
+    <item msgid="3265262911688671938">"Аудиофокус"</item>
+    <item msgid="2098976479485046797">"Общая громкость"</item>
+    <item msgid="5660213838861789350">"Громкость голоса"</item>
+    <item msgid="7983336752371254444">"Громкость звонка"</item>
+    <item msgid="7878027809189330917">"Громкость мультимедиа"</item>
+    <item msgid="7260546305036218513">"Громкость будильника"</item>
+    <item msgid="9103719301075748925">"Громкость уведомлений"</item>
+    <item msgid="7025966722295861512">"Громкость Bluetooth-устройств"</item>
+    <item msgid="4665183401128289653">"Не отключать"</item>
+    <item msgid="8584357129746649222">"Местоположение"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Небольшая"</item>
     <item msgid="2560532955514699713">"Средняя"</item>
     <item msgid="2372711992605524591">"Большая"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (отладка)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Использовать Dalvik"</item>
+    <item msgid="5131846588686178907">"Использовать ART"</item>
+    <item msgid="4530003713865319928">"Использовать отладочную версию ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Никогда не проверять"</item>
     <item msgid="6042769699089883931">"Проверять только содержание DRM"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Скорость 5x"</item>
     <item msgid="1069584980746680398">"Скорость 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Нет данных"</item>
+    <item msgid="688482401508173818">"720 x 480 пикс. (mdpi)"</item>
+    <item msgid="1725473474827398815">"1280 x 720 пикс. (tvdpi)"</item>
+    <item msgid="6813511923592083251">"1920 x 1080 пикс. (xhdpi)"</item>
+    <item msgid="3646519549495410112">"1280x720 (tvdpi)/1920x1080 (xhdpi)"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Нет данных"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"ВЫКЛ"</item>
+    <item msgid="7688197031296835369">"Показывать области наложения"</item>
+    <item msgid="8332661909019981149">"Показывать число объектов"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартное ограничение"</item>
     <item msgid="4071574792028999443">"Без фоновых процессов"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Время ожидания истекло"</item>
     <item msgid="7664124146786465092">"Сбой"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Спрашивать"</item>
+    <item msgid="5077768429488260031">"Не разрешать"</item>
+    <item msgid="1417929597727989746">"Разрешать всегда"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e83ecf3..ad69cef 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Да"</string>
     <string name="no" msgid="6731231425810196216">"Нет"</string>
     <string name="create" msgid="3578857613172647409">"Создать"</string>
+    <string name="allow" msgid="3349662621170855910">"Разрешить"</string>
+    <string name="deny" msgid="6947806159746484865">"Отклонить"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Неизвестно"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Вы почти у цели. Осталось несколько шагов (<xliff:g id="STEP_COUNT">%1$d</xliff:g>)."</item>
+    <item quantity="other" msgid="6722953419953594148">"Вы почти у цели. Осталось несколько шагов (<xliff:g id="STEP_COUNT">%1$d</xliff:g>)."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Вы стали разработчиком!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Не нужно, вы уже разработчик."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"БЕСПРОВОДНЫЕ СЕТИ"</string>
     <string name="header_category_device" msgid="5781174212691167553">"УСТРОЙСТВО"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"ЛИЧНЫЕ ДАННЫЕ"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Идет зарядка"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"от сети"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"по USB"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Работа от батареи"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"Wi-Fi"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Не заряжается"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не заряжается"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Батарея заряжена"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Не подключено"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"Питание от сети"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"Wi-Fi"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"Питание от сети и USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Неизвестно"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Неизвестно"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Неизвестная ошибка"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Холодная"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Видимость"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Время видимости для устройств Bluetooth: <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Отображать для ближайших устройств Bluetooth"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Не отображать для других Bluetooth-устройств"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Отображать только для подключенных устройств"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Сделать устройство видимым"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Доступно только для подключенных устройств"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Тайм-аут видимости"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Укажите, в течение какого времени устройство будет видимым"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заблокировать голосовой набор"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Предотвратить использование телефона Bluetooth, когда экран заблокирован"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Устройства Bluetooth"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Полученные файлы"</string>
     <string name="device_picker" msgid="8398232791303186677">"Выбор устройства"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Запрос разрешения на включение Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Приложение запрашивает разрешение включить Bluetooth. Разрешить?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Одному из приложений нужно, чтобы ваш планшетный ПК был доступен для поиска на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек. Включить Bluetooth?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Одному из приложений нужно, чтобы ваш телефон был доступен для поиска на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек. Включить Bluetooth?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Одному из приложений нужно, чтобы ваш планшетный ПК был доступен для поиска на других устройствах. Включить Bluetooth?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Одному из приложений нужно, чтобы ваш телефон был доступен для поиска на других устройствах. Включить Bluetooth?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Одному из приложений нужно, чтобы ваш планшетный ПК был доступен для поиска на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек. Включить Bluetooth?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Одному из приложений нужно, чтобы ваш телефон был доступен для поиска на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек. Включить Bluetooth?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Одному из приложений нужно, чтобы ваш планшетный ПК был доступен для поиска на других устройствах. Включить Bluetooth?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Одному из приложений нужно, чтобы ваш телефон был доступен для поиска на других устройствах. Включить Bluetooth?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Приложение запрашивает разрешение включить Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Одному из приложений требуется, чтобы ваш планшетный ПК был доступен для поиска через Bluetooth на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Одному из приложений требуется, чтобы ваш телефон был доступен для поиска через Bluetooth на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Одному из приложений требуется сделать ваш планшетный ПК доступным для поиска через Bluetooth на других устройствах. Позже эти настройки можно будет изменить."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Одному из приложений требуется сделать ваш телефон доступным для поиска через Bluetooth на других устройствах. Позже эти настройки можно будет изменить."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Одному из приложений требуется включить Bluetooth и сделать ваш планшетный ПК доступным для поиска на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Одному из приложений требуется включить Bluetooth и сделать ваш телефон доступным для поиска на других устройствах в течение <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Одному из приложений требуется включить Bluetooth и сделать ваш планшетный ПК доступным для поиска на других устройствах. Позже эти настройки можно будет изменить."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Одному из приложений требуется включить Bluetooth и сделать ваш телефон доступным для поиска на других устройствах. Позже эти настройки можно будет изменить."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Включение Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Отключение Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Автоматическое подключение"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Прокси-сервер HTTP используется браузером, но недоступен для других приложений."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Местоположение:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Соседний CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Индекс сети:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Попыток данных:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Услуга GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роуминг:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Передача данных прекращена, потому что телефон находится за пределами домашней сети, а интернет-роуминг выключен."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Включить"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Возможны высокие расходы на использование роуминга."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Использование роуминга может повлечь за собой непредвиденные расходы.\n\nНастройки будут изменены для всех пользователей устройства."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Использование роуминга может повлечь за собой непредвиденные расходы.\n\nНастройки будут изменены для всех пользователей устройства."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Разрешить интернет-роуминг?"</string>
     <string name="networks" msgid="6333316876545927039">"Выбор оператора"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Выберите оператора связи"</string>
@@ -292,12 +302,16 @@
     <string name="biometric_weak_liveliness_title" msgid="2661613702124561096">"Настоящий фейсконтроль"</string>
     <string name="biometric_weak_liveliness_summary" msgid="4199587000948042325">"Нужно моргнуть, чтобы разблокировать экран"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Автоблокировка"</string>
-    <string name="lock_after_timeout_summary" msgid="6128431871360905631">"После <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> спящего режима"</string>
+    <string name="lock_after_timeout_summary" 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_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Введите текст для показа на экране блокировки"</string>
-    <string name="location_settings_title" msgid="4483843407328665068">"Данные о местоположении"</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>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
@@ -308,8 +322,8 @@
     <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">"Можно зашифровать данные различных типов: аккаунты, настройки, загруженные приложения и их контент, мультимедийные и другие файлы. После этого при каждом включении устройства потребуется вводить PIN-код или пароль. Шифрование снимается только путем сброса настроек, в результате которого удаляются все данные."\n\n"Шифрование занимает не менее часа. Батарея должна быть полностью заряжена, а устройство подключено к источнику питания, пока шифрование не завершится. Если прервать его, данные будут частично или полностью потеряны."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Можно зашифровать данные различных типов: аккаунты, настройки, загруженные приложения и их контент, мультимедийные и другие файлы. После этого при каждом включении устройства потребуется вводить PIN-код или пароль. Шифрование снимается только путем сброса настроек, в результате которого удаляются все данные."\n\n"Шифрование занимает не менее часа. Батарея должна быть полностью заряжена, а устройство подключено к источнику питания, пока шифрование не завершится. Если прервать его, данные на устройстве будут частично или полностью потеряны."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Можно зашифровать данные различных типов: аккаунты, настройки, загруженные приложения и их контент, мультимедийные и другие файлы. После этого при каждом включении устройства потребуется вводить PIN-код или пароль. Шифрование снимается только путем сброса настроек, в результате которого удаляются все данные.\n\nШифрование занимает не менее часа. Батарея должна быть полностью заряжена, а устройство подключено к источнику питания, пока шифрование не завершится. Если прервать его, данные будут частично или полностью потеряны."</string>
+    <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>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Повторите попытку через <xliff:g id="DELAY">^1</xliff:g> с."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Введите пароль"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Сбой шифрования"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Данные на вашем планшетном ПК больше недоступны из-за того, что шифрование было прервано. "\n\n"Чтобы дальше использовать устройство, нужно сбросить настройки. После этого вы сможете восстановить все данные, для которых в аккаунте Google были созданы резервные копии."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Данные на вашем телефоне больше недоступны из-за того, что шифрование было прервано. "\n\n"Чтобы дальше использовать устройство, нужно сбросить настройки. После этого вы сможете восстановить все данные, для которых в аккаунте Google были созданы резервные копии."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Данные на вашем планшетном ПК больше недоступны из-за того, что шифрование было прервано. \n\nЧтобы дальше использовать устройство, нужно сбросить настройки. После этого вы сможете восстановить все данные, для которых в аккаунте Google были созданы резервные копии."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Данные на вашем телефоне больше недоступны из-за того, что шифрование было прервано. \n\nЧтобы дальше использовать устройство, нужно сбросить настройки. После этого вы сможете восстановить все данные, для которых в аккаунте Google были созданы резервные копии."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Сменить способ ввода"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Блокировка экрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Доп. способ блокировки"</string>
@@ -337,19 +351,19 @@
     <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_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_summary" msgid="180083326982058964">"Низкий уровень защиты (экспериментальная функция)"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Графический ключ"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Средний уровень защиты"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN-код"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"Уровень безопасности от среднего до высокого"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Пароль"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Высокий уровень защиты"</string>
     <string name="unlock_set_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_none" msgid="5660014471997663139">"Для разблокировки экрана сдвиньте слайдер"</string>
     <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Фейсконтроль"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Графический ключ"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN-код"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Изменить ПИН-код разблокировки"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Изменить пароль разблокировки"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Пароль должен содержать не менее %d символов"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-код должен содержать не менее %d символов"</string>
+    <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>
@@ -406,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>
@@ -480,6 +503,28 @@
     <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_empty_list_wifi_display_off" msgid="1225626898926363100">"Чтобы просмотреть список устройств, включите беспроводной проектор."</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_paired_devices" msgid="7395326840730024303">"Сопряженные экраны"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Доступные устройства"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Подключение…"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Подключен"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Доступен"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Используется"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Настройки экрана"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Отключиться?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Произойдет разъединение с устройством&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Настройки беспроводного проектора"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Удалить"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Готово"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Название"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Включен"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Выключен"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Отключен"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Разрешить обмен данными при совмещении планшета с другим устройством"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Разрешить обмен данными при совмещении телефона с другим устройством"</string>
@@ -488,57 +533,69 @@
     <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">"Когда включена эта функция, вы можете обмениваться данными между устройствами, просто приложив их друг к другу.\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="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="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="8116564886303972764">"Введите 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_in_progress" msgid="2944576520214787628">"Выполняется настройка WPS. На завершение этого процесса потребуется не более двух минут."</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Установлено подключение к сети Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Выполняется настройка WPS. Для завершения потребуется не более двух минут."</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Ошибка. Повторите попытку через несколько минут."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Безопасная настройка беспроводного маршрутизатора (WEP) не поддерживается"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Безопасная настройка беспроводного маршрутизатора (TKIP) не поддерживаются"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Ошибка аутентификации. Повторите попытку."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Обнаружен другой сеанс WPS. Повторите попытку через несколько минут."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Имя сети (SSID)"</string>
-    <string name="wifi_security" msgid="6603611185592956936">"Безопасность"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Введите имя сети SSID"</string>
+    <string name="wifi_security" msgid="6603611185592956936">"Защита"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Уровень сигнала"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Статус"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Скорость связи"</string>
@@ -564,6 +621,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>
@@ -571,8 +631,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_advanced_titlebar" msgid="1627063574532930090">"Дополнительные функции"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Полоса частот Wi-Fi"</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="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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Поиск…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Переименовать устройство"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Обнаруженные устройства"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Сохраненные группы"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Не удалось подключиться."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Не удалось переименовать устройство."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Отключиться?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"После отключения соединение с \"<xliff:g id="PEER_NAME">%1$s</xliff:g>\" и другими устройствами (<xliff:g id="PEER_COUNT">%2$s</xliff:g>) будет прервано."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Отмена приглашения"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Вы собираетесь отменить приглашение на подключение к устройству \"<xliff:g id="PEER_NAME">%1$s</xliff:g>\". Продолжить?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Точка доступа Wi-Fi"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Удалить эту группу?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Портативная точка доступа Wi-Fi"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Звуковые эффекты"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Громкость звонка"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Виброзвонок без звука"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Уведомление по умолчанию"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Звук уведомлений по умолчанию"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Индикатор событий"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Мелодия"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Уведомление"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Использовать этот уровень громкости также для уведомлений"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Выбрать мелодию уведомлений"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Звук уведомлений по умолчанию"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Мультимедиа"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Настроить громкость музыки и видео"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Будильник"</string>
@@ -671,15 +743,16 @@
     <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="3848608373818910549">"Заставка"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Активация в спящем режиме при зарядке"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Выключено"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Заставка"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Время до активации"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Выкл."</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Попробовать"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Вкл. в док-станции"</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">"Чтобы знать, что происходит с телефоном, когда он подключен к док-станции или находится в спящем режиме, включите заставку."</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>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN-код SIM-карты"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Неверный PIN-код"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN-коды не совпадают"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Не удается изменить PIN."\n"Возможно, код введен неверно."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Не удается изменить PIN.\nВозможно, код введен неверно."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN-код SIM-карты успешно изменен"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Не удалось изменить состояние блокировки SIM-карты."\n"Возможно, введен неверный PIN-код."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Не удалось изменить состояние блокировки SIM-карты.\nВозможно, введен неверный PIN-код."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"ОК"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Отмена"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Состояние планшетного ПК"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Прошивка модуля связи"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Версия ядра"</string>
     <string name="build_number" msgid="3075795840572241758">"Номер сборки"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Статус SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Недоступно"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Общая информация"</string>
     <string name="device_status" msgid="607405385799807324">"Общая информация"</string>
@@ -733,12 +807,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">"Тип мобильной сети"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Сведения об операторе"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Передача данных в моб. сети"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Доступность моб. сети"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"Уровень сигнала"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-накопитель"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-карта"</string>
     <string name="memory_available" msgid="5052397223077021181">"Доступно"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Доступно (только для чтения)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Всего места"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Идет подсчет..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Данные приложений и файлы мультимедиа"</string>
@@ -756,6 +832,7 @@
     <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_cache_usage" msgid="6704293333141177910">"Данные кэша"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Безопасное извлечение"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Извлечь SD-карту"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Отключить внутр. USB-накопитель"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Очистить SD-карту"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Удаление с внутреннего USB-накопителя телефона всех данных, включая музыку и фотографии."</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Удаляет все данные с SD-карты, например музыку и фотографии"</string>
-    <string name="read_only" msgid="6702420168629076340">" (только для чтения)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Очистить кэш?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Будут удалены данные всех приложений."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Функция MTP или PTP активирована"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Отключить USB-накопитель?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Отключить SD-карту?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Если отключить USB-накопитель, некоторые приложения перестанут работать. Чтобы снова получить к ним доступ, нужно подключить накопитель."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Камера (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Позволяет передавать фотографии с помощью программного обеспечения камеры, а также передавать любые файлы на компьютеры, которые не поддерживают MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Установить инструменты передачи файлов"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Другие пользователи"</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>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Сброс настроек"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Возврат к заводским настройкам и удаление всех данных из памяти планшетного ПК"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Возврат к заводским настройкам и удаление всех данных из памяти телефона"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:"\n\n<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:"\n\n<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Аккаунты, добавленные на этом устройстве:"\n</string>
+    <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>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Чтобы удалить музыку, фотографии и другие пользовательские данные, необходимо очистить "<b>"SD-карту"</b>"."</string>
@@ -897,10 +979,15 @@
     <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="manage_mobile_plan_title" msgid="7588182101738043593">"Управление тарифным планом"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Неизвестный оператор"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"У оператора \"%1$s\" нет веб-сайта для синхронизации"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Вставьте SIM-карту и перезагрузите устройство"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Подключитесь к Интернету"</string>
     <string name="location_title" msgid="1029961368397484576">"Мое местоположение"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"По координатам сети"</string>
-    <string name="location_neighborhood_level" msgid="5626515380188353712">"Разрешить отправлять анонимные данные о местоположении и позволить приложениям использовать службу геопозиционирования Google, чтобы быстрее определять его"</string>
-    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Местоположение определяется с помощью Wi-Fi"</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="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>
@@ -909,14 +996,15 @@
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Использовать сервер для A-GPS (снимите флажок для улучшения работы GPS)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"Учитывать при поиске"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Разрешить Google использовать данные о местоположении для улучшения поиска и работы других служб"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"Доступ к данным о моем местоположении"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Позволить использовать данные о местоположении приложениям, у которых есть соответствующее разрешение"</string>
-    <string name="location_sources_heading" msgid="1278732419851088319">"Источники данных о местоположении"</string>
-    <string name="about_settings" product="tablet" msgid="593457295516533765">"О планшетном ПК"</string>
+    <string name="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>
     <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="copyright_title" msgid="865906688917260647">"Авторские права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лицензия"</string>
     <string name="terms_title" msgid="7697580845616764642">"Условия использования"</string>
@@ -930,7 +1018,7 @@
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Выберите пароль"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Создайте графический ключ"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Выберите ПИН-код"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Подтвердите пароль"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Введите новый пароль"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Подтвердите графический ключ"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Подтвердите ПИН-код"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Пароли не совпадают"</string>
@@ -941,16 +1029,16 @@
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Ключ был установлен"</string>
     <string name="lock_settings_title" msgid="335025124489630932">"Блокировка экрана"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Изменить ключ"</string>
-    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Изменить ПИН-код разблокировки"</string>
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Изменить PIN-код"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Начертите существующий ключ"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Повторите попытку"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Начертите графический ключ разблокировки"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Начертите ключ разблокировки"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Для справки нажмите \"Меню\"."</string>
-    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"По завершении отпустите палец."</string>
-    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Соедините точки (как минимум <xliff:g id="NUMBER">%d</xliff:g>). Повторите попытку:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Графический ключ сохранен."</string>
-    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Для подтверждения начертите графический ключ повторно:"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Новый графический ключ разблокировки:"</string>
+    <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"По завершении отпустите палец"</string>
+    <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Соедините не менее <xliff:g id="NUMBER">%d</xliff:g> точек"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="8378617839439987962">"Графический ключ сохранен"</string>
+    <string name="lockpattern_need_to_confirm" msgid="5144676887162575050">"Начертите ключ еще раз"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="2223856038485537716">"Новый ключ разблокировки"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Подтвердить"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Воспроизвести повторно"</string>
     <string name="lockpattern_retry_button_text" msgid="1949847413862309134">"Повтор"</string>
@@ -960,18 +1048,13 @@
     <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_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>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Слишком много неудачных попыток!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Повторите попытку через <xliff:g id="NUMBER">%d</xliff:g> с."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Отмена"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Далее"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Безопасность планшетного ПК"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Обеспечение безопасности телефона"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Создайте графический ключ разблокировки экрана, и никто, кроме вас, не сможет воспользоваться вашим планшетным ПК. Для этого соедините в произвольном порядке не менее четырех точек на экране. "\n\n"Чтобы начать, нажмите \"Далее\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Чтобы никто, кроме вас, не мог воспользоваться вашим телефоном, создайте графический ключ разблокировки экрана. Для этого соедините в произвольном порядке не менее четырех точек на следующем экране. "\n\n"Чтобы начать, нажмите \"Далее\"."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Приложение не установлено на телефоне."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Управление приложениями"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управление установленными приложениями и их удаление"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Приложения"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Разрешить установку приложений из неизвестных источников"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Ваши личные данные и данные планшетного ПК более уязвимы для атак приложений из неизвестных источников. Вы соглашаетесь с тем, что несете полную ответственность за любой ущерб, нанесенный планшетному ПК, и потерю данных, связанные с использованием этих приложений."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Ваши личные данные и данные телефона более уязвимы для атак приложений из неизвестных источников. Вы соглашаетесь с тем, что несете полную ответственность за любой ущерб, нанесенный телефону, и потерю данных, связанные с использованием этих приложений."</string>
+    <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="application_info_label" msgid="5736524913065714880">"О приложении"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"на USB-накопителе"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-карта"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Удалить"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Удалить для всех пользователей"</string>
+    <string name="install_text" msgid="884360662922471113">"Установить"</string>
     <string name="disable_text" msgid="6544054052049395202">"Отключить"</string>
     <string name="enable_text" msgid="9217362512327828987">"Включить"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Стереть данные"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Показать процессы в кэше"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Сбросить настройки"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Сбросить настройки?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Будут сброшены следующие настройки:"\n\n" "<li>"список отключенных приложений;"</li>\n" "<li>"уведомления для отключенных приложений;"</li>\n" "<li>"список приложений по умолчанию;"</li>\n" "<li>"ограничения на передачу данных в фоновом режиме."</li>\n\n" Данные приложений удалены не будут."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Будут сброшены следующие настройки:\n\n "<li>"список отключенных приложений;"</li>\n" "<li>"уведомления для отключенных приложений;"</li>\n" "<li>"список приложений по умолчанию;"</li>\n" "<li>"ограничения на передачу данных в фоновом режиме."</li>\n\n" Данные приложений удалены не будут."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Да"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Управление местом"</string>
     <string name="filter" msgid="2018011724373033887">"Фильтр"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Выберите параметры фильтра"</string>
     <string name="filter_apps_all" msgid="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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На SD-карте"</string>
     <string name="disabled" msgid="9206776641295849915">"Отключено"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Не установлено"</string>
     <string name="no_applications" msgid="7336588977497084921">"Нет приложений"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Внутр. память"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-память"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> и <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Это приложение может списывать деньги с вашего счета:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Отправить SMS?"</string>
     <string name="computing_size" msgid="1599186977475211186">"Вычисление..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Не удалось определить размер пакета."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Нет приложений сторонних разработчиков."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Изменить папку для установки приложений"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Отключить приложение?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Отключение встроенной службы может нарушить работу других приложений."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Отключить?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <string name="memory" msgid="6609961111091483458">"ОЗУ"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Пользователь: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Удаление пользователя…"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"Процессов: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; служб: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"Процессов: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; служб: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"Процессов: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; служб: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
@@ -1127,8 +1225,7 @@
     <string name="auto_punctuate" msgid="4595367243950425833">"Автопунктуация"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Настройки внешней клавиатуры"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Нажмите дважды клавишу \"Пробел\" для ввода точки"</string>
-    <string name="show_password" msgid="3001113966880559611">"Показывать пароль"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></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="spellchecker_security_warning" msgid="9060897418527708922">"Для проверки орфографии будет использоваться приложение <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>, которое может собирать все вводимые данные, в том числе пароли и номера кредитных карт. Продолжить?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Настройки"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Для смены нажмите CTRL + Пробел"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"По умолчанию"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Раскладка клавиатуры"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Словарь пользователя"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Пользовательский словарь"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Пользовательские словари"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Пользовательский словарь"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Добавить"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Добавление в словарь"</string>
@@ -1157,6 +1252,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>
@@ -1197,26 +1294,40 @@
     <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="bt_hci_snoop_log" msgid="3340699311158865670">"Включить журнал трансляции операций HCI Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Сохранять все пакеты HCI Bluetooth в файле"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Выберите среду"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Среда выполнения"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Перезагрузить устройство, чтобы сменить среду выполнения с <xliff:g id="OLD">%1$s</xliff:g> на <xliff:g id="NEW">%2$s</xliff:g>?"</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>
+    <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>
-    <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_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="enable_terminal_title" msgid="95572094356054120">"Локальный терминальный доступ"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Разрешить терминальный доступ к локальной оболочке"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Выбор гаджета"</string>
-    <string name="widget_picker_title" msgid="9130684134213467557">"Выбор виджета"</string>
+    <string name="widget_picker_title" msgid="9130684134213467557">"Выберите виджет"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Создать виджет и разрешить доступ?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Когда вы создаете виджет, приложение \"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>\" получает доступ ко всем его данным."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Всегда разрешать приложению \"<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>\" создавать виджеты и получать их данные"</string>
@@ -1234,29 +1345,43 @@
     <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_toggle_large_text_title" msgid="6618674985313017711">"Большой текст"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Кнопка питания завершает вызов"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Озвучивать пароли"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Задержка при нажатии и удержании"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Расширение доступности"</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>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Выкл."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Вы сможете быстро включать специальные возможности. Вот как это сделать.\n\n1. Нажмите кнопку питания и удерживайте ее, пока не раздастся звуковой сигнал или вибросигнал.\n\n2. Нажмите на экран двумя пальцами и не отпускайте их, пока не услышите сообщение о том, что команда выполнена.\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_toggle_speak_password_preference_title" msgid="5986628515113204844">"Озвучивать пароли"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Задержка при нажатии и удержании"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Настройки"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Вкл."</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Выключено"</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="accessibility_feature_state_on" msgid="2864292320042673806">"Включено"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Выключено"</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="print_settings" msgid="4742428530112487843">"Печать"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Настройки печати"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Сервисы"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Включить <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"Сервису \"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>\" могут быть переданы документы, содержащие конфиденциальные данные."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Сервисов нет"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Настройки"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Добавить принтеры"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"ВКЛ"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"ВЫКЛ"</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>
@@ -1265,17 +1390,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Получено"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Данные отправлены"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Данные получены"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Данные отправлены по сети Wi‑Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Данные получены по сети Wi‑Fi"</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>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <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="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>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Тон"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Влияет на высоту синтезированной речи"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Язык"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Язык не выбран"</string>
     <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>
@@ -1361,6 +1490,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>
@@ -1377,9 +1507,23 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Яркость: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"автонастройка"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"максимум"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"средняя"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"минимум"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Хранилище учетных данных"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Установить с карты памяти"</string>
@@ -1388,8 +1532,11 @@
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Установить сертификаты с SD-карты"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Очистить учетные данные"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Удалить все сертификаты"</string>
-    <string name="trusted_credentials" msgid="4266945289534242402">"Надежные учетные данные"</string>
+    <string name="trusted_credentials" msgid="4266945289534242402">"Надежные сертификаты"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Показывать надежные сертификаты ЦС"</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>
@@ -1410,15 +1557,12 @@
     <string name="privacy_settings_title" msgid="4856282165773594890">"Восстановление и сброс"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Резервное копирование и восстановление"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Возврат к заводским настройкам"</string>
-    <string name="backup_data_title" msgid="1239105919852668016">"Копирование данных"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Сохранять резервные копии данных приложений, паролей точек доступа Wi-Fi и настроек на серверах Google"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"Резервный аккаунт"</string>
+    <string name="backup_data_title" msgid="1239105919852668016">"Резервирование данных"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"Сохранять резервные копии данных приложений, паролей точек доступа Wi-Fi и настроек на серверах Google"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Аккаунт для резервирования"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Не найдены аккаунты с резервными копиями данных"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Автовосстановление"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"При переустановке приложения восстановить резервную копию настроек и данных"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Создание отчета об ошибке"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Информация о текущем состоянии вашего устройства будет собрана для отправки по электронной почте. Чтобы приготовить отчет об ошибке потребуется некоторое время."</string>
-    <string name="report" msgid="302437572240018342">"Сообщить"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Пароль для резервного копирования"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Полные резервные копии в настоящее время не защищены"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Изменить или удалить пароль для резервного копирования"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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>
@@ -1482,7 +1626,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>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Подсвечивать окна полностью при их обновлении"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Показывать обнов. экрана"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Подсвечивать области экрана при отрисовке с GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Показ. аппаратные обновл."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Выделять аппаратные уровни зеленым при обновлении"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Отладка наложения"</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="debug_layout" msgid="5981361776594526155">"Показывать границы макета"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Показывать загрузку ЦП"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Экран, показывающий текущую загрузку ЦП"</string>
-    <string name="force_hw_ui" msgid="6426383462520888732">"Ускорить работу GPU"</string>
+    <string name="force_hw_ui" msgid="6426383462520888732">"GPU-ускорение"</string>
     <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>
+    <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>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Удалять сводку действий после их завершения"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <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" msgid="1466689968707308512">"Если будут доступны только мобильные сети, программы, зависящие от фонового режима, могут перестать работать."\n\n"Установите другие параметры передачи данных в настройках приложения."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Если будут доступны только мобильные сети, программы, зависящие от фонового режима, могут перестать работать.\n\nУстановите другие параметры передачи данных в настройках приложения."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="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"В некоторых случаях также выполняется обратная синхронизация."\n\n"Чтобы указать для каждого аккаунта, какие данные нужно синхронизировать, перейдите в меню \"Настройки &gt; Аккаунты\"."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Все изменения, внесенные в аккаунты на компьютере, будут автоматически скопированы на устройство."\n\n"В некоторых случаях также выполняется обратная синхронизация."\n\n"Чтобы указать для каждого аккаунта, какие данные нужно синхронизировать, перейдите в меню \"Настройки &gt; Аккаунты\"."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Все изменения, внесенные в аккаунты на компьютере, будут автоматически скопированы на устройство.\n\nВ некоторых случаях также выполняется обратная синхронизация.\n\nЧтобы указать для каждого аккаунта, какие данные нужно синхронизировать, перейдите в меню \"Настройки &gt; Аккаунты\"."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Все изменения, внесенные в аккаунты на компьютере, будут автоматически скопированы на устройство.\n\nВ некоторых случаях также выполняется обратная синхронизация.\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>
@@ -1620,22 +1769,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" 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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Добавить профиль VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Изменить профиль"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Удалить профиль"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Постоянная VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Выберите постоянную сеть VPN: трафик будет разрешен только при подключении к этой сети."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Сеть не выбрана"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Укажите IP-адрес для сервера и DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Отсутствует сетевое соединение. Повторите попытку позже."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Отсутствует сертификат. Измените профиль."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Система"</string>
@@ -1687,24 +1843,86 @@
     <!-- no translation found for percentage (5866131581207788624) -->
     <skip />
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Дополнительные обновления системы"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Ограничения пользователей"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Пользователи"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Добавить пользователя"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Изменить сведения"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Информация о пользователе"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Имя"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Ограничения на контент"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Требуется PIN-код"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Рейтинг контента"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Системные приложения"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Установленные приложения"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Отменить"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Удалить"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Pesky kid"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Отключено"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Только предупреждение"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Блокировка"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Пользователи"</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="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_confirm_remove_message" msgid="5284111415714437285">"Действительно удалить с устройства аккаунт пользователя и все его данные?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Измените размер шрифта"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Ограничения"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Отменить ограничения"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Изменить PIN-код"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Включить уведомления"</string>
     <string name="help_label" msgid="1107174367904110532">"Справка"</string>
-    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Широковещательная передача сообщений"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Выберите типы экстренных оповещений на экране."</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="user_restrictions_title" msgid="7745810037152772035">"Ограничения для приложения и контента"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ПЕРЕИМЕНОВАТЬ"</string>
+    <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Настроить ограничения"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Под управлением приложения \"<xliff:g id="APP">%1$s</xliff:g>\""</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Приложение не поддерживается в профилях с ограниченным доступом"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Этому приложению разрешен доступ к вашим аккаунтам"</string>
+    <string name="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 6b04bed..41f8e5a 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,16 +218,127 @@
     <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="886742181977884584">"Médiá"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"mediálne tlačidlá"</item>
+    <item msgid="4547883971364273343">"zvukové zameranie"</item>
+    <item msgid="2603878814882344450">"hlavná hlasitosť"</item>
+    <item msgid="7136963238377062018">"hlasitosť hlasu"</item>
+    <item msgid="4270236897655923007">"hlasitosť zvonenia"</item>
+    <item msgid="6325739889222559394">"hlasitosť médií"</item>
+    <item msgid="5762123934816216821">"hlasitosť budíka"</item>
+    <item msgid="785049718065337473">"hlasitosť upozornení"</item>
+    <item msgid="6700305533746877052">"hlasitosť bluetooth"</item>
+    <item msgid="2029227495214047094">"zakázať režim spánku"</item>
+    <item msgid="26109888160231211">"sledovať polohu"</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>
+    <item msgid="5753789168376302997">"Tlačidlá médií"</item>
+    <item msgid="3265262911688671938">"Zameranie zvuku"</item>
+    <item msgid="2098976479485046797">"Hlavná hlasitosť"</item>
+    <item msgid="5660213838861789350">"Hlasitosť hlasu"</item>
+    <item msgid="7983336752371254444">"Hlasitosť zvonenia"</item>
+    <item msgid="7878027809189330917">"Hlasitosť médií"</item>
+    <item msgid="7260546305036218513">"Hlasitosť budíka"</item>
+    <item msgid="9103719301075748925">"Hlasitosť upozornení"</item>
+    <item msgid="7025966722295861512">"Hlasitosť zariadenia Bluetooth"</item>
+    <item msgid="4665183401128289653">"Zakázať režim spánku"</item>
+    <item msgid="8584357129746649222">"Poloha"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krátka"</item>
     <item msgid="2560532955514699713">"Stredná"</item>
     <item msgid="2372711992605524591">"Dlhá"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (ladenie)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Použiť nástroj Dalvik"</item>
+    <item msgid="5131846588686178907">"Použiť nástroj ART"</item>
+    <item msgid="4530003713865319928">"Použiť zostavu na ladenie programu ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nikdy nekontrolovať"</item>
     <item msgid="6042769699089883931">"Kontrolovať len obsah DRM"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Mierka animácie 5x"</item>
     <item msgid="1069584980746680398">"Mierka animácie 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Žiadne"</item>
+    <item msgid="688482401508173818">"720 x 480 mdpi"</item>
+    <item msgid="1725473474827398815">"1 280 x 720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1 920 x 1 080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1 280 x 720 tvdpi a 1 920 x 1 080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Žiadne"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Vypnuté"</item>
+    <item msgid="7688197031296835369">"Zobraziť oblasti prekreslení"</item>
+    <item msgid="8332661909019981149">"Zobraziť počítadlo prekreslení"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Štandardný limit"</item>
     <item msgid="4071574792028999443">"Žiadne procesy na pozadí"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Časový limit vypršal"</item>
     <item msgid="7664124146786465092">"Neúspešné"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Opýtať sa"</item>
+    <item msgid="5077768429488260031">"Nikdy nepovoliť"</item>
+    <item msgid="1417929597727989746">"Vždy povoliť"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d9d7e08..0de09c4 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Áno"</string>
     <string name="no" msgid="6731231425810196216">"Nie"</string>
     <string name="create" msgid="3578857613172647409">"Vytvoriť"</string>
+    <string name="allow" msgid="3349662621170855910">"Povoliť"</string>
+    <string name="deny" msgid="6947806159746484865">"Odmietnuť"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Neznáme"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Počet krokov do získania stavu vývojára: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
+    <item quantity="other" msgid="6722953419953594148">"Počet krokov do získania stavu vývojára: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Teraz ste vývojár!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Nie je to potrebné, už ste vývojár."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEZDRÔTOVÉ PRIPOJENIE A SIETE"</string>
     <string name="header_category_device" msgid="5781174212691167553">"ZARIADENIE"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"OSOBNÉ"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Nabíjanie"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Vybíjanie"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(bezdrôtové)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Nenabíja sa"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nenabíja sa"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Plná"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Odpojené"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"bezdrôtové"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Neznáme"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Neznáme"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Neznáma chyba"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Studené"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Viditeľné"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Viditeľné pre všetky okolité zariadenia Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Viditeľné pre všetky okolité zariadenia Bluetooth"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Neviditeľné pre ostatné zariadenia Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Viditeľné len pre spárované zariadenia"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Prepne zariadenie do viditeľného režimu"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Časový limit viditeľnosti"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Nastavte dobu, počas ktorej bude zariadenie vo viditeľnom režime"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Uzamknúť hlasové vytáčanie"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zabrániť použitiu vytáčania Bluetooth pri uzamknutej obrazovke"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Zariadenia Bluetooth"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Zobraziť prijaté súbory"</string>
     <string name="device_picker" msgid="8398232791303186677">"Výber zariadenia Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Žiadosť o povolenie zariadenia Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Aplikácia chce zapnúť pripojenie Bluetooth. Povoliť?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Aplikácia v tablete chce prepnúť váš tablet do viditeľného režimu pre ostatné zariadenia Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. Povoliť?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Aplikácia v telefóne chce prepnúť váš telefón do viditeľného režimu pre ostatné zariadenia Bluetooth na <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. Povoliť?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Aplikácia v tablete chce prepnúť váš tablet do trvalo viditeľného režimu pre ostatné zariadenia Bluetooth. Povoliť?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Aplikácia v telefóne chce prepnúť váš telefón do trvalo viditeľného režimu pre ostatné zariadenia Bluetooth. Povoliť?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Aplikácia v tablete chce zapnúť pripojenie Bluetooth a prepnúť váš tablet do viditeľného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. Povoliť?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Aplikácia v telefóne chce zapnúť pripojenie Bluetooth a prepnúť váš telefón do viditeľného režimu na <xliff:g id="TIMEOUT">%1$d</xliff:g> sek. Povoliť?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Aplikácia v tablete chce zapnúť pripojenie Bluetooth a prepnúť váš tablet do viditeľného režimu. Povoliť?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Aplikácia v telefóne chce zapnúť pripojenie Bluetooth a prepnúť váš telefón do viditeľného režimu. Povoliť?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikácia chce zapnúť rozhranie Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikácia chce na <xliff:g id="TIMEOUT">%1$d</xliff:g> s prepnúť váš tablet do režimu, v ktorom bude viditeľný pre ostatné zariadenia Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikácia chce na <xliff:g id="TIMEOUT">%1$d</xliff:g> s prepnúť váš telefón do režimu, v ktorom bude viditeľný pre ostatné zariadenia Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikácia chce váš tablet prepnúť do režimu, v ktorom bude viditeľný pre ostatné zariadenia Bluetooth. Toto nastavenie môžete neskôr zmeniť v nastaveniach rozhrania Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Aplikácia chce váš telefón prepnúť do režimu, v ktorom bude viditeľný pre ostatné zariadenia Bluetooth. Toto nastavenie môžete neskôr zmeniť v nastaveniach rozhrania Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Aplikácia chce na <xliff:g id="TIMEOUT">%1$d</xliff:g> s zapnúť rozhranie Bluetooth a prepnúť váš tablet do viditeľného režimu."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Aplikácia chce na <xliff:g id="TIMEOUT">%1$d</xliff:g> s zapnúť rozhranie Bluetooth a prepnúť váš telefón do viditeľného režimu."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Aplikácia chce zapnúť rozhranie Bluetooth a prepnúť váš tablet do režimu, v ktorom bude viditeľný pre ostatné zariadenia. Toto nastavenie môžete neskôr zmeniť v nastaveniach rozhrania Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Aplikácia chce zapnúť rozhranie Bluetooth a prepnúť váš telefón do režimu, v ktorom bude viditeľný pre ostatné zariadenia. Toto nastavenie môžete neskôr zmeniť v nastaveniach rozhrania Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Zapnúť Bluetooth?"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Vypínanie Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automaticky pripojiť"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Prehliadač používa server proxy pre protokol HTTP, ale ostatné aplikácie ho používať nemusia."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Poloha:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Susedný identifikátor CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokusy údajov:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Služba GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Pripojenie dátových služieb bolo prerušené, pretože ste opustili domovskú sieť a dátové služby pri roamingu máte vypnuté."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Zapnúť"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Ak povolíte dátové služby pri roamingu, môžu sa účtovať vysoké poplatky."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Ak povolíte dátové služby pri roamingu, môžu sa účtovať vysoké poplatky za roaming!\n\nToto nastavenie ovplyvní všetkých používateľov tohto tabletu."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Ak povolíte dátové služby pri roamingu, môžu sa účtovať vysoké poplatky za roaming!\n\nToto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Povoliť dátové služby pri roamingu?"</string>
     <string name="networks" msgid="6333316876545927039">"Výber operátora"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Zvoliť sieťového operátora"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info. o vlastníkovi"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Pri každom zapnutí tabletu požadovať číslo PIN alebo heslo na jeho dešifrovanie"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Pri každom zapnutí telefónu požadovať číslo PIN alebo heslo na jeho dešifrovanie"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrované"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Svoje účty, nastavenia, prevzaté aplikácie a ich údaje môžete šifrovať. Po zašifrovaní tabletu budete musieť pri každom zapnutí zadať číselný kód PIN alebo heslo a dešifrovať ho – toto šifrovanie budete môcť zrušiť iba obnovením továrenských nastavení, čím sa všetky údaje v tablete vymažú."\n\n"Šifrovanie môže trvať aj viac ako hodinu. V tablete musí byť pred šifrovaním nabitá batéria a po celú dobu šifrovania musí byť pripojený k zdroju napájania. Ak šifrovanie prerušíte, stratíte niektoré alebo všetky údaje."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Svoje účty, nastavenia, prevzaté aplikácie a ich údaje môžete šifrovať. Po zašifrovaní telefónu budete musieť pri každom zapnutí zadať číselný kód PIN alebo heslo a dešifrovať ho – toto šifrovanie budete môcť zrušiť iba obnovením továrenských nastavení, čím sa všetky údaje v telefóne vymažú."\n\n"Šifrovanie môže trvať aj viac ako hodinu. V telefóne musí byť pred šifrovaním nabitá batéria a po celú dobu šifrovania musí byť pripojený k zdroju napájania. Ak šifrovanie prerušíte, stratíte niektoré alebo všetky údaje."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Svoje účty, nastavenia, prevzaté aplikácie a ich údaje môžete šifrovať. Po zašifrovaní tabletu budete musieť pri každom zapnutí zadať číselný kód PIN alebo heslo a dešifrovať ho – toto šifrovanie budete môcť zrušiť iba obnovením továrenských nastavení, čím sa všetky údaje v tablete vymažú.\n\nŠifrovanie môže trvať aj viac ako hodinu. V tablete musí byť pred šifrovaním nabitá batéria a po celú dobu šifrovania musí byť pripojený k zdroju napájania. Ak šifrovanie prerušíte, stratíte niektoré alebo všetky údaje."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Svoje účty, nastavenia, prevzaté aplikácie a ich údaje môžete šifrovať. Po zašifrovaní telefónu budete musieť pri každom zapnutí zadať číselný kód PIN alebo heslo a dešifrovať ho – toto šifrovanie budete môcť zrušiť iba obnovením továrenských nastavení, čím sa všetky údaje v telefóne vymažú.\n\nŠifrovanie môže trvať aj viac ako hodinu. V telefóne musí byť pred šifrovaním nabitá batéria a po celú dobu šifrovania musí byť pripojený k zdroju napájania. Ak šifrovanie prerušíte, stratíte niektoré alebo všetky údaje."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifrovať tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifrovať telefón"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Nabite batériu a skúste to znova."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Počet sekúnd zostávajúcich do ďalšieho pokusu: <xliff:g id="DELAY">^1</xliff:g>."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Zadajte svoje heslo"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifrovanie bolo neúspešné"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifrovanie bolo prerušené a nedá sa dokončiť. Výsledkom je, že údaje vo vašom tablete už nie sú k dispozícii. "\n\n"Ak chcete ďalej používať svoj tablet, musíte obnoviť jeho továrenské nastavenia. Po ich obnovení budete mať počas nastavovania tabletu príležitosť obnoviť všetky údaje, ktoré sa zálohovali do vášho účtu Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifrovanie bolo prerušené a nedá sa dokončiť. Výsledkom je, že údaje vo vašom telefóne už nie sú k dispozícii. "\n\n"Ak chcete ďalej používať svoj telefón, musíte obnoviť jeho továrenské nastavenia. Po ich obnovení budete mať počas nastavovania telefónu príležitosť obnoviť všetky údaje, ktoré boli zálohované vo vašom účte Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifrovanie bolo prerušené a nedá sa dokončiť. Výsledkom je, že údaje vo vašom tablete už nie sú k dispozícii. \n\nAk chcete ďalej používať svoj tablet, musíte obnoviť jeho továrenské nastavenia. Po ich obnovení budete mať počas nastavovania tabletu príležitosť obnoviť všetky údaje, ktoré sa zálohovali do vášho účtu Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifrovanie bolo prerušené a nedá sa dokončiť. Výsledkom je, že údaje vo vašom telefóne už nie sú k dispozícii. \n\nAk chcete ďalej používať svoj telefón, musíte obnoviť jeho továrenské nastavenia. Po ich obnovení budete mať počas nastavovania telefónu príležitosť obnoviť všetky údaje, ktoré boli zálohované vo vašom účte Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Prepnúť metódu vstupu"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Zvoľte uzamk. obrazov."</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Vybrať zámku zálohy"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Zmena bezpečnostného kódu PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Zmeniť bezpečnostné heslo"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Heslo musí obsahovať najmenej %d znakov"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Kód PIN musí obsahovať najmenej %d znakov"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Kód PIN musí obsahovať najmenej %d číslic"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Po dokončení sa dotknite tlačidla Pokračovať"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Pokračovať"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Heslo musí mať menej ako <xliff:g id="NUMBER">%d</xliff:g> znakov."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ako reproduktor telefónu"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pre hudbu a médiá"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamätať nastavenia"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Spárované displeje"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dostupné zariadenia"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Prepája sa"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Pripojené"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"K dispozícii"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Používa sa"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Nastavenia obrazovky"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Odpojiť?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Táto akcia ukončí vaše pripojenie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Možnosti bezdrôtového displeja"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Odstrániť"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Hotovo"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Názov"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Zapnuté"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Vypnuté"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Zakázané"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Povoliť výmenu údajov, ak sa tablet dotýka iného zariadenia"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Povoliť výmenu údajov, ak sa telefón dotýka iného zariadenia"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Vyp."</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nedostupné, pretože je vypnutá technológia NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="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="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\nStačí 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="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="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="8116564886303972764">"Zadajte vo 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_in_progress" msgid="2944576520214787628">"WPS prebieha a dokončenie procesu môže trvať až dve mnúty."</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Pripojené k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS prebieha a dokončenie procesu môže trvať až dve mnúty"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Spustenie WPS zlyhalo. Skúste to znova o niekoľko minút."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Nastavenie zabezpečenia bezdrôtového smerovača (TKIP) nie je podporované"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Nastavenie zabezpečenia bezdrôtového smerovača (TKIP) nie je podporované"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Zlyhanie overenia totožnosti. Skúste to znova."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Bola rozpoznaná ďalšia relácia WPS. Skúste to znova o niekoľko minút."</string>
     <string name="wifi_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>
@@ -564,6 +621,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\nChcete 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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Uložiť"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nepodarilo sa uložiť sieť"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Zrušiť"</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_skip_anyway" msgid="6965361454438011190">"Preskočiť aj tak"</string>
+    <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\nNastavenie 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\nNastavenie 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="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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Prebieha vyhľadávanie..."</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Premenovať zariadenie"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Partnerské zariadenia"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Zapamätané skupiny"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Nepodarilo sa pripojiť."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Premenovanie zariadenia zlyhalo."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Odpojiť?"</string>
@@ -602,26 +671,29 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Ak sa odpojíte, ukončíte spojenie so zariadením <xliff:g id="PEER_NAME">%1$s</xliff:g> a ďalšími zariadeniami (<xliff:g id="PEER_COUNT">%2$s</xliff:g>)."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Prenosný prístupový bod Wi-Fi"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Odstrániť túto skupinu?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prenosný hotspot Wi-Fi"</string>
+    <string name="wifi_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>
     <string name="ring_volume_title" msgid="7938706566797464165">"Hlasitosť vyzváňania"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrovať v tichom režime"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Predvolené upozornenie"</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="9052854168612951170">"Zvoliť vyzváňací tón upozornenia"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Predvolené zvukové upozornenie"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Médiá"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Umožňuje nastaviť hlasitosť hudby a videí"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Budík"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vybrať tapetu z"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Dekorácia obrazovky"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Ak je zariadenie pripojené ku zdroju, spustí sa pri prechode do režimu spánku"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Zakázané"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Vybratá dekorácia"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Čas aktivácie"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Po nečinnosti <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nikdy"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Vyskúšať"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Spustiť aj po vložení do doku"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Šetrič obrazovky"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Pri vložení do doku alebo pri nabíjaní v režime spánku"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"V oboch prípadoch"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Pri nabíjaní"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"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č"</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>
     <string name="title_font_size" msgid="4405544325522105222">"Veľkosť písma"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Veľkosť písma"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"Kód PIN karty SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Nesprávny kód PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Kódy PIN sa nezhodujú"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Kód PIN nie je možné zmeniť."\n"Kód PIN je zrejme nesprávny."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Kód PIN nie je možné zmeniť.\nKód PIN je zrejme nesprávny."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Kód PIN karty SIM bol zmenený."</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Stav zámku karty SIM nie je možné zmeniť."\n"Zrejme ste zadali nesprávny kód PIN."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Stav zámku karty SIM nie je možné zmeniť.\nZrejme ste zadali nesprávny kód PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Zrušiť"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stav tabletu"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Verzia základného pásma"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Verzia jadra"</string>
     <string name="build_number" msgid="3075795840572241758">"Číslo zostavy"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Stav zabezpečenia SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nie je k dispozícii"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stav"</string>
     <string name="device_status" msgid="607405385799807324">"Stav"</string>
@@ -733,12 +807,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">"Typ mobilnej siete"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Informácie o operátorovi"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Stav mobilnej siete"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Stav služby"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Ukladací priestor USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Karta SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"K dispozícii"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"K dispozícii (len na čítanie)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Celková pamäť"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Prebieha výpočet..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikácie (údaje aplikácií a obsah médií)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Obrázky, videá"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Zvuk (hudba, vyzváňacie tóny, podcasty atď.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Rôzne"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Údaje uložené vo vyrovnávacej pamäti"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Odpojte zdieľaný ukl. priestor"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Odpojiť kartu SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Odp. interný ukl. priestor USB"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Vymazať kartu SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Vymaže vš. údaje v internom uklad. priestore USB, napr. hudbu alebo fotografie."</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Vymaže všetky údaje na karte SD, ako je hudba alebo fotografie"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Iba na čítanie)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Vymazať údaje vo vyrovnávacej pamäti?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Vymažú sa údaje v pamäti pre všetky aplikácie"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Funkcia MTP alebo PTP je aktívna"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Odpojiť úložisko USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Odpojiť kartu SD?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Ak odpojíte úložisko USB, niektoré používané aplikácie môžu byť zastavené a nebudú k dispozícii, kým úložisko USB znova nepripojíte."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Fotoaparát (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Umožňuje prenos fotografií pomocou softvéru fotoaparátu a prenos akýchkoľvek súborov do počítačov, ktoré nepodporujú protokol MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Inštalovať nástroje na prenos súborov"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Ďalší používatelia"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stav batérie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Stav batérie"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Názvy prístupových bodov (APN)"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Obnovenie továrenských nastavení"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Vymaže všetky údaje v tablete"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Vymaže všetky údaje v telefóne"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Táto operácia vymaže všetky údaje v "<b>"internom úložisku"</b>" tabletu, vrátane:"\n\n<li>"účtu Google,"</li>\n<li>"údajov a nastavení systému a aplikácií,"</li>\n<li>"prevzatých aplikácií"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Táto operácia vymaže všetky údaje v "<b>"internom úložisku"</b>" telefónu, vrátane:"\n\n<li>"účtu Google,"</li>\n<li>"údajov a nastavení systému a aplikácií,"</li>\n<li>"prevzatých aplikácií"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálne ste prihlásení do nasledujúcich účtov:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Táto operácia vymaže všetky údaje v "<b>"internom úložisku"</b>" tabletu, vrátane:\n\n"<li>"účtu Google,"</li>\n<li>"údajov a nastavení systému a aplikácií,"</li>\n<li>"prevzatých aplikácií"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Táto operácia vymaže všetky údaje v "<b>"internom úložisku"</b>" telefónu, vrátane:\n\n"<li>"účtu Google,"</li>\n<li>"údajov a nastavení systému a aplikácií,"</li>\n<li>"prevzatých aplikácií"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálne ste prihlásení do nasledujúcich účtov:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Hudba"</li>\n<li>"Fotografie"</li>\n<li>"Iné používateľské údaje"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie používateľské údaje, musíte vymazať "<b>"úložisko USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie používateľské údaje, musíte vymazať "<b>"kartu SD"</b>"."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Ukončí sa zdieľané dát. pripojenie zariad. <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomocník"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilné siete"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Správa mobilného plánu"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Neznámy operátor karty SIM"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s nemá žiadne provízne webové stránky"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vložte kartu SIM a reštartujte"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Pripojte sa k internetu"</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>
@@ -917,6 +1004,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Zobrazuje právne informácie, stav a verziu softvéru"</string>
     <string name="legal_information" msgid="5769301644270604095">"Právne informácie"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Prispievatelia"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Regulačné informácie"</string>
     <string name="copyright_title" msgid="865906688917260647">"Autorské práva"</string>
     <string name="license_title" msgid="1990487604356037871">"Licencia"</string>
     <string name="terms_title" msgid="7697580845616764642">"Zmluvné podmienky"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Zmena bezpečnostného kódu PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potvrďte uložený vzor"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Skúsiť znova:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Nakreslite bezpečnostný vzor"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Nakreslite bezpečnostný vzor:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pomocníka zobrazíte stlačením klávesy Menu."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Na záver zdvihnite prst z obrazovky."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Minimálny počet spojených bodov je <xliff:g id="NUMBER">%d</xliff:g>. Skúste to znova:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Bezpečnostný vzor obrazovky nakreslite takto"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Príliš veľa chybných pokusov."</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Počet sekúnd zostávajúcich do ďalšieho pokusu: <xliff:g id="NUMBER">%d</xliff:g>."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Zrušiť"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Ďalej"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Zabezpečenie vášho tabletu"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Zabezpečenie telefónu"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Chráňte svoj tablet pred neoprávneným použitím vytvorením osobného vzoru na odomknutie obrazovky. Na ďalšej obrazovke pospájajte prstom body v ľubovoľnom poradí. Musíte spojiť aspoň štyri body. "\n\n"Ak chcete začať, dotknite sa tlačidla Ďalej."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Svoj telefón môžete chrániť pred neautorizovaným použitím pomocou osobného bezpečnostného vzoru obrazovky. Bodky na nasledujúcej obrazovke spojte prejdením prstom v akomkoľvek poradí. Spojiť treba aspoň štyri bodky. "\n\n"Keď chcete začať, dotknite sa tlačidla „Ďalej“."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Aplikácia nie je v telefóne nainštalovaná."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Spravovať aplikácie"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Správa a odstraňovanie nainštalovaných aplikácií"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplikácie"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Povoliť inštaláciu aplikácií z neznámych zdrojov"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Váš tablet a osobné údaje sú zraniteľnejšie voči útokom aplikácií z neznámych zdrojov. Súhlasíte s tým, že ste výhradne zodpovedný/-á za všetky škody na tablete alebo stratu údajov, ktoré môžu vzniknúť v dôsledku používania týchto aplikácií."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Váš telefón a osobné údaje sú zraniteľnejšie voči útokom aplikácií z neznámych zdrojov. Súhlasíte s tým, že ste výhradne zodpovedný/-á za všetky škody na telefóne alebo stratu údajov, ktoré môžu vzniknúť v dôsledku používania týchto aplikácií."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Overiť aplikácie"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Zakázať inštaláciu škodlivých aplikácií alebo na ne upozorniť"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Rozšírené nastavenia"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Povoliť ďalšie možnosti nastavení"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informácie o aplikácii"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Údaje ukladacieho priestoru USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Karta SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Odinštalovať"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Odinštalovať pre všetkých používateľov"</string>
+    <string name="install_text" msgid="884360662922471113">"Inštalovať"</string>
     <string name="disable_text" msgid="6544054052049395202">"Zakázať"</string>
     <string name="enable_text" msgid="9217362512327828987">"Povoliť"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Vymazanie údajov"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Procesy vo vyrov. pamäti"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Obnoviť predvoľby aplik."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Obnoviť predvoľby aplik.?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Touto akciou obnovíte všetky predvoľby pre:"\n\n" "<li>"zakázané aplikácie,"</li>\n" "<li>"zakázané upozornenia aplikácií,"</li>\n" "<li>"predvolené aplikácie na vykonávanie akcií,"</li>\n" "<li>"obmedzenia údajov na pozadí pre aplikácie."</li>\n\n" O žiadne údaje aplikácií neprídete."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Touto akciou obnovíte všetky predvoľby pre:\n\n "<li>"zakázané aplikácie,"</li>\n" "<li>"zakázané upozornenia aplikácií,"</li>\n" "<li>"predvolené aplikácie na vykonávanie akcií,"</li>\n" "<li>"obmedzenia údajov na pozadí pre aplikácie."</li>\n\n" O žiadne údaje aplikácií neprídete."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Obnoviť aplikácie"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Správa pamäte"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na karte SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Zakázané"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Nenainštalované"</string>
     <string name="no_applications" msgid="7336588977497084921">"Žiadne aplikácie."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interný ukl. priestor"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Ukladací priestor USB"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> a <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Táto aplikácia vám môže účtovať poplatky:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Odoslať prémiovú správu SMS"</string>
     <string name="computing_size" msgid="1599186977475211186">"Prebieha výpočet…"</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Nepodarilo sa vypočítať veľkosť balíčka."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Nie sú nainštalované žiadne aplikácie tretích strán."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Zmena preferovaného umiestnenia pre inštaláciu nových aplikácií"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Zakázať vstavanú aplikáciu?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Ak zakážete vstavané aplikácie, ostatné aplikácie sa môžu správať zvláštne."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Odstrániť údaje a zakázať aplikáciu?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Používateľ: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Odstránený používateľ"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"Počet procesov: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služieb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"Počet procesov: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služieb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"Počet procesov: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; počet služieb: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Nastavenia fyzickej klávesnice"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Znak „.“ môžete vložiť dvojitým stlačením klávesu Medzerník."</string>
     <string name="show_password" msgid="3001113966880559611">"Zobraziť heslá"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Pri metóde vstupu je možné zhromažďovať zadávaný text vrátane osobných údajov, ako sú napríklad heslá alebo čísla kreditných kariet. Tento spôsob je používaný aplikáciou <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Chcete použiť túto metódu vstupu?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Táto kontrola pravopisu môže zhromažďovať zadávaný text vrátane osobných údajov, ako sú napríklad heslá alebo čísla kreditných kariet. Je používaná aplikáciou <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Chcete povoliť túto kontrolu pravopisu?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Nastavenia"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Prepnite klávesmi ctrl-space"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predvolené"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Rozloženia klávesnice"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Používateľský slovník"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Osobný slovník"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osobné slovníky"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Osobný slovník"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Pridať"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Pridať do slovníka"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Obrazovka sa pri nabíjaní neprepne do režimu spánku"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Povoliť sledovací protokol Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zaznamenať všetky pakety Bluetooth HCI do súboru"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Výber času spustenia"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Výber času spustenia"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Chcete vykonať reštart a zmeniť čas spustenia z <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Povoliť simulované polohy"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Povoliť simulované polohy"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Kontrolovať škodlivosť aplikácií nainštalovaných pomocou nástroja ADB/ADT."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Chrániť úložisko USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplikácie musia pred čítaním z úložiska USB žiadať povolenie"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Chrániť úložisko USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Keď je úložisko USB chránené, aplikácie musia pred čítaním údajov z externého úložiska požiadať o povolenie."\n\n"Pri niektorých aplikáciách platí, že budú fungovať až vtedy, keď ich vývojári aktualizujú."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Keď je úložisko USB chránené, aplikácie musia pred čítaním údajov z externého úložiska požiadať o povolenie.\n\nPri niektorých aplikáciách platí, že budú fungovať až vtedy, keď ich vývojári aktualizujú."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Chrániť kartu SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikácie musia pred čítaním z karty SD vyžiadať povolenie"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Chrániť kartu SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Keď je karta SD chránená, aplikácie musia pred čítaním údajov z externého úložiska požiadať o povolenie."\n\n"Pri niektorých aplikáciách platí, že budú fungovať až vtedy, keď ich vývojári aktualizujú."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Keď je karta SD chránená, aplikácie musia pred čítaním údajov z externého úložiska požiadať o povolenie.\n\nPri niektorých aplikáciách platí, že budú fungovať až vtedy, keď ich vývojári aktualizujú."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Miestny terminál"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Povoliť terminálovú apl. na miestny prístup k prostrediu shell"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Vyberte modul gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Vyberte miniaplikáciu"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vytvoriť miniaplikáciu a povoliť prístup?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Nastavenia uľahčenia prístupu"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Služby"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Systém"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Veľké písmo"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Tlačidlo Napájanie ukončuje hovor"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Hovorené heslá"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Oneskorenie dotyku a podržania"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Zlepšiť dostupnosť webu"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gestá priblíženia"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Keď je táto funkcia zapnutá, môžete približovať alebo odďalovať trojitým klepnutím na obrazovku.\n\nPočas priblíženia môžete:\n"<ul><li>"Posúvať: Ťahajte dvoma alebo viacerými prstami po obrazovke."</li>\n<li>"Prispôsobiť úroveň priblíženia: Priblížte dva alebo viacero prstov k sebe alebo ich od seba odtiahnite."</li></ul>\n\n"Obsah pod prstom môžete tiež dočasne priblížiť trojitým klepnutím a podržaním. V stave priblíženia môžete posúvaním prsta preskúmavať rôzne časti obrazovky. Odtiahnutím prsta sa vrátite do predchádzajúceho stavu.\n\nPoznámka: Priblíženie trojitým klepnutím funguje všade okrem klávesnice a navigačného panela."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Skratka zjednodušeného ovládania"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Zapnuté"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Vypnuté"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Ak je táto funkcia zapnutá, môžete rýchlo v dvoch krokoch povoliť funkcie zjednodušenia ovládania:\n\nKrok 1: Stlačte tlačidlo zapnutia a podržte ho, dokým nezaznie zvukový signál alebo nezacítite vibrácie.\n\nKrok 2: Dotknite sa obrazovky dvoma prstami a podržte ju, dokým nezaznie zvuk potvrdenia.\n\nAk má zariadenie viacero používateľov, pomocou tejto skratky je možné na uzamknutej obrazovke dočasne povoliť zjednodušenie ovládania, dokým sa zariadenie neodomkne."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Veľké písmo"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Priblíženie obrazovky"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto. aktualiz. priblíž. obrazovky"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Aktualizovať priblíž. obrazov. pri prechodoch apl."</string>
+    <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_menu_item_settings" msgid="3344942964710773365">"Nastavenia"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Zapnuté"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"Zapnuté"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Vypnuté"</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="print_settings" msgid="4742428530112487843">"Tlač"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Nastavenia tlače"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Služby"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Použiť službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"Služba <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> môže prijímať dokumenty, ktoré tlačíte. Tieto dokumenty môžu obsahovať citlivé údaje."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nie sú nainštalované žiadne služby"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Nastavenia"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Pridať tlačiarne"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Zapnuté"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Vypnuté"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batéria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Čo využíva batériu"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Údaje o spotrebe nie sú k dispozícii."</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Prijaté údaje"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Odoslané mobilné dáta"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Prijaté mobilné dáta"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Dáta odoslané cez Wi-Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Dáta prijaté cez Wi-Fi"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Zvuk"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Doba zapnutia"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Zastavte aplikáciu alebo ju odinštalujte"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"GPS môžete ručne nastaviť tak, aby ho aplikácie nemohli používať"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Táto aplikácia môže ponúkať nastavenia na zníženie používania batérie"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Využitie batérie používateľom"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odpojenia"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Pri poslednom odpojení pre <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Využitie batérie celkom"</string>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Výška"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Určuje zvuk hovoreného textu"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Jazyk"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nebol vybratý jazyk"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Nastavenia jazyka hlasu pre hovorený text"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Vypočuť príklad"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Prehrať krátku ukážku syntézy reči"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Jas <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automaticky"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"plné"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"polovičné"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"vypnuté"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Ukladací priestor poverení"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Inštalovať z uklad. priestoru"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Pri preinštalovaní aplikácie obnoviť zálohované údaje a nastavenia"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Zaznamenať správu o chybe"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Zhromažďuje informácie o aktuálnom stave zariadenia a tieto informácie je následne možné odoslať prostredníctvom e-mailovej správy. Od spustenia vytvárania správy o chybe až do chvíle, kedy je tento nástroj pripravený odoslať prvú správu, môže uplynúť nejaký čas. Prosíme vás preto o trpezlivosť."</string>
-    <string name="report" msgid="302437572240018342">"Vytvoriť prehľad"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Heslo pre zálohu do PC"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Úplné zálohy na počítači nie sú momentálne chránené"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Dotykom zmeníte alebo odstránite heslo pre úplné zálohy do počítača"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nAk 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>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalendár"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kontakty"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Víta vás služba Google Sync"</font>" "\n"Spoločnosť Google pomocou nej synchronizuje údaje a umožňuje vám tak pristupovať ku kontaktom, stretnutiam a ďalším informáciám, nech ste kdekoľvek."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Víta vás služba Google Sync"</font>" \nSpoločnosť Google pomocou nej synchronizuje údaje a umožňuje vám tak pristupovať ku kontaktom, stretnutiam a ďalším informáciám, nech ste kdekoľvek."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Nastavenia synchronizácie aplikácie"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Údaje a synchronizácia"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Zmeniť heslo"</string>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Celý obsah okna pri aktualizácii bliká"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Zobr. aktual. zobraz. GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Zobrazenia v oknách vykresľované s GPU blikajú"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Zobr. aktual. hardv. vrs."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Hard. vrstvy pri aktualizácii blikajú na zeleno"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Ladenie prekresľovania GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Zobraziť využitie CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Prekryvná vrstva obr. s aktuálnym využ. procesora"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Vynútiť vykresľovanie GPU"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulovať sek. displeje"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Aplikácie"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Neuchovávať aktivity"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Zničiť každú aktivitu, hneď ako ju používateľ ukončí"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Zakázať údaje na pozadí v mob. sieťach. Použiť iné ako mob. siete, ak sú k disp."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Nastav. dát. limitu mob. siete obmedzíte údaje na poz. pre apl."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Obmedziť údaje na pozadí?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ak budú k dispozícii len mobilné siete, môže táto funkcia spôsobiť, že aplikácie, ktoré údaje na pozadí vyžadujú, nebudú fungovať."\n\n"Vhodnejšie spôsoby ovládania využívania údajov nájdete v nastaveniach aplikácie."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ak budú k dispozícii len mobilné siete, môže táto funkcia spôsobiť, že aplikácie, ktoré údaje na pozadí vyžadujú, nebudú fungovať.\n\nVhodnejšie spôsoby ovládania využívania údajov nájdete v nastaveniach aplikácie."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Obmedzenie údajov na pozadí je možné len v prípade, že ste nastavili dátový limit pre mobilnú sieť."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Zapnúť automat. synchr. údajov?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Všetky zmeny vykonané v rámci vašich účtov na webe sa automaticky skopírujú do vášho tabletu."\n\n"Niektoré účty môžu tiež automaticky skopírovať na web akékoľvek zmeny vykonané v tablete. Týmto spôsobom funguje aj účet Google."\n\n"Typy informácií, ktoré sa budú v jednotlivých účtoch synchronizovať, môžete nastaviť v sekcii Nastavenia &gt; Účty."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Všetky zmeny vykonané v rámci vašich účtov na webe sa automaticky skopírujú do vášho telefónu."\n\n"Niektoré účty môžu tiež automaticky skopírovať na web akékoľvek zmeny vykonané v telefóne. Týmto spôsobom funguje aj účet Google."\n\n"Typy informácií, ktoré sa budú v jednotlivých účtoch synchronizovať, môžete nastaviť v sekcii Nastavenia &gt; Účty."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Všetky zmeny vykonané v rámci vašich účtov na webe sa automaticky skopírujú do vášho tabletu.\n\nNiektoré účty môžu tiež automaticky skopírovať na web akékoľvek zmeny vykonané v tablete. Týmto spôsobom funguje aj účet Google.\n\nTypy informácií, ktoré sa budú v jednotlivých účtoch synchronizovať, môžete nastaviť v sekcii Nastavenia &gt; Účty."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Všetky zmeny vykonané v rámci vašich účtov na webe sa automaticky skopírujú do vášho telefónu.\n\nNiektoré účty môžu tiež automaticky skopírovať na web akékoľvek zmeny vykonané v telefóne. Týmto spôsobom funguje aj účet Google.\n\nTypy informácií, ktoré sa budú v jednotlivých účtoch synchronizovať, môžete nastaviť v sekcii Nastavenia &gt; Účty."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Vypnúť automat. synchr. údajov?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Toto nastavenie šetrí spotrebu dát a batérie. Na získanie najnovších informácií však budete musieť každý účet synchronizovať ručne. Nebudete tiež dostávať upozornenia na dostupné aktualizácie."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Dátum obnovenia cyklu sledovania prenesených dát"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Nastaviť upozornenie o využívaní údajov"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nastaviť limit využívania údajov"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Nastavuje sa obmedzenie dátových prenosov"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Po dosiahnutí stanoveného limitu bude vaše mobilné dátové pripojenie zakázané.\n\nKeďž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\nKeďž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" 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\nToto 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\nToto 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Odstránené aplikácie a používatelia"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"Prijaté: <xliff:g id="RECEIVED">%1$s</xliff:g> Odoslané: <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>: využitých približne <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>: 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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Pridať profil siete VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Upraviť profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Odstrániť profil"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Vždy zapnutá sieť VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Vyberte profil siete VPN, ku ktorej chcete mať vždy pripojenie. Prenos údajov bude povolený len pri pripojení k tejto sieti VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Žiadna"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Vždy zapnutá sieť VPN vyžaduje adresu IP pre server aj DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Nie je k dispozícii žiadne sieťové pripojenie. Skúste to znova neskôr."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Chýba certifikát. Upravte profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Systém"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Zrušiť"</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">"Ďalšie aktualizácie systému"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Používatelia a obmedzenia"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Používatelia"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Pridať používateľa"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Upraviť podrobnosti"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Informácie o používateľovi"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Meno"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Obmedzenia obsahu"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Vyžadovať PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Hodnotenie obsahu"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Systémové aplikácie"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Nainštalované aplikácie"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Zahodiť"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Odstr. používateľa"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Otravné dieťa"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Zakázané"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Mierne"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Prísne"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Používatelia"</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="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\nKeď vytvoríte nového používateľa, táto osoba musí prejsť procesom nastavenia.\n\nKaž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\nKtorý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_confirm_remove_message" msgid="5284111415714437285">"Naozaj chcete odstrániť používateľa a všetky priradené údaje zo zariadenia?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Zmeniť veľkosť písma"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Obmedzenia"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Odstrániť obmedzenia"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Zmeniť kód PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Zobraziť upozornenia"</string>
     <string name="help_label" msgid="1107174367904110532">"Pomocník"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Účet pre obsah"</string>
+    <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="6160672982086584261">"Nastaviť obmedzenia aplikácií"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Riadi: <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Profily s obmedzeniami nepodporujú túto aplikáciu"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Táto aplikácia môž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 0e358f6..5e4c497 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,16 +218,127 @@
     <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="886742181977884584">"Predstavnosti"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"gumbi za predstavnosti"</item>
+    <item msgid="4547883971364273343">"fokus zvoka"</item>
+    <item msgid="2603878814882344450">"glavna glasnost"</item>
+    <item msgid="7136963238377062018">"glasnost glasu"</item>
+    <item msgid="4270236897655923007">"glasnost zvonjenja"</item>
+    <item msgid="6325739889222559394">"glasnost predstavnosti"</item>
+    <item msgid="5762123934816216821">"glasnost alarma"</item>
+    <item msgid="785049718065337473">"glasnost obvestila"</item>
+    <item msgid="6700305533746877052">"glasnost za Bluetooth"</item>
+    <item msgid="2029227495214047094">"ohrani odklenjen zaslon"</item>
+    <item msgid="26109888160231211">"spremljanje lokacije"</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>
+    <item msgid="5753789168376302997">"Gumbi za predstavnosti"</item>
+    <item msgid="3265262911688671938">"Osredotočenost zvoka"</item>
+    <item msgid="2098976479485046797">"Glavna glasnost"</item>
+    <item msgid="5660213838861789350">"Glasnost glasu"</item>
+    <item msgid="7983336752371254444">"Glasnost zvonjenja"</item>
+    <item msgid="7878027809189330917">"Glasnost predstavnosti"</item>
+    <item msgid="7260546305036218513">"Glasnost alarma"</item>
+    <item msgid="9103719301075748925">"Glasnost obvestila"</item>
+    <item msgid="7025966722295861512">"Glasnost Bluetootha"</item>
+    <item msgid="4665183401128289653">"Ohrani odklenjen zaslon"</item>
+    <item msgid="8584357129746649222">"Lokacija"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kratko"</item>
     <item msgid="2560532955514699713">"Srednja"</item>
     <item msgid="2372711992605524591">"Dolgo"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (iskanje napak)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Uporabi Dalvik"</item>
+    <item msgid="5131846588686178907">"Uporabi ART"</item>
+    <item msgid="4530003713865319928">"Uporabi različico za iskanje napak ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nikoli ne preveri"</item>
     <item msgid="6042769699089883931">"Preveri samo glede vsebine DRM"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Merilo animacije: 5 x"</item>
     <item msgid="1069584980746680398">"Merilo animacije: 10 x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Brez"</item>
+    <item msgid="688482401508173818">"720 x 480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280 x 720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280 x 720 tvdpi in 1920 x 1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Brez"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Izklop"</item>
+    <item msgid="7688197031296835369">"Risanje zunaj vidnega območja"</item>
+    <item msgid="8332661909019981149">"Števec risanja zunaj vidn. območja"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardna omejitev"</item>
     <item msgid="4071574792028999443">"Ni postopkov v ozadju"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Časovna omejitev"</item>
     <item msgid="7664124146786465092">"Neuspešno"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Vprašaj"</item>
+    <item msgid="5077768429488260031">"Nikoli ne dovoli"</item>
+    <item msgid="1417929597727989746">"Vedno dovoli"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index bae9e24..d3c1bde 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Da"</string>
     <string name="no" msgid="6731231425810196216">"Ne"</string>
     <string name="create" msgid="3578857613172647409">"Ustvari"</string>
+    <string name="allow" msgid="3349662621170855910">"Dovoli"</string>
+    <string name="deny" msgid="6947806159746484865">"Zavrni"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Neznano"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Št. korakov, ki vas loči od tega, da postanete razvijalec: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
+    <item quantity="other" msgid="6722953419953594148">"Št. korakov, ki vas loči od tega, da postanete razvijalec: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Zdaj ste razvijalec."</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Ni treba, ker ste že razvijalec."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"BREZŽIČNE IN OMREŽNE POVEZAVE"</string>
     <string name="header_category_device" msgid="5781174212691167553">"NAPRAVA"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"OSEBNO"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Polnjenje"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Praznjenje"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(brezžično)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Se ne polni"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Se ne polni"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Polna"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Odklopljeno"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"Napajanje"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"brezžično"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"Napajanje + USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Neznano"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Neznano"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Neznana napaka"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Hladno"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Viden"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Vidno vsem napravam Bluetooth v bližini (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Vidno vsem napravam Bluetooth v bližini"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ni vidno drugim napravam Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Vidno samo seznanjenim napravam"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Naj bo naprava vidna drugim"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Časovna omejitev vidnosti"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Nastavite trajanje vidnosti naprave"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Zakleni glasovno klicanje"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Prepreči uporabo telefona Bluetooth, kadar je zaslon zaklenjen"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Naprave Bluetooth"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Pokaži prejete datoteke"</string>
     <string name="device_picker" msgid="8398232791303186677">"Izbirnik naprav Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Zahteva za dovoljenje za uporabo funkcije Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Program želi vklopiti Bluetooth. Želite omogočiti?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Program v tabličnem računalniku želi vklopiti Bluetooth in nastaviti tablični računalnik, da ga bodo lahko druge naprave odkrile <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Želite omogočiti?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Program v telefonu želi nastaviti telefon, da ga bodo lahko druge naprave odkrile <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Želite omogočiti?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Program v telefonu želi nastaviti tablični računalnik, da ga bodo lahko druge naprave Bluetooth kadar koli odkrile. Želite omogočiti?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Program v telefonu želi nastaviti telefon, da ga bodo lahko druge naprave Bluetooth kadar koli odkrile. Želite omogočiti?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Program v tabličnem računalniku želi vklopiti Bluetooth in nastaviti tablični računalnik, da ga bodo lahko druge naprave odkrile <xliff:g id="TIMEOUT">%1$d</xliff:g> s. Želite omogočiti?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Program v telefonu želi za <xliff:g id="TIMEOUT">%1$d</xliff:g> s vklopiti Bluetooth in nastaviti telefon, da ga bodo lahko odkrile druge naprave. Želite dovoliti?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Program v tabličnem računalniku želi vklopiti Bluetooth in nastaviti tablični računalnik, da ga bodo lahko druge naprave odkrile. Želite omogočiti?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Program v telefonu želi vklopiti Bluetooth in nastaviti telefon, da ga bodo lahko druge naprave odkrile. Želite omogočiti?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Aplikacija želi vklopiti Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Aplikacija želi, da lahko druge naprave Bluetooth vidijo vaš tablični računalnik toliko sekund: <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Aplikacija želi, da lahko druge naprave Bluetooth vidijo vaš telefon toliko sekund: <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Aplikacija želi omogočiti, da lahko druge naprave Bluetooth vidijo vaš tablični računalnik. To lahko pozneje spremenite v nastavitvah Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Aplikacija želi omogočiti, da lahko druge naprave Bluetooth vidijo vaš telefon. To lahko pozneje spremenite v nastavitvah Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Aplikacija želi vklopiti Bluetooth in omogočiti, da lahko druge naprave vidijo vaš tablični računalnik toliko sekund: <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Aplikacija želi vklopiti Bluetooth in omogočiti, da lahko druge naprave vidijo vaš telefon toliko sekund: <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Aplikacija želi vklopiti Bluetooth in omogočiti, da lahko druge naprave vidijo vaš tablični računalnik. To lahko pozneje spremenite v nastavitvah Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Aplikacija želi vklopiti Bluetooth in omogočiti, da lahko druge naprave vidijo vaš telefon. To lahko pozneje spremenite v nastavitvah Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Vklop Bluetootha…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Izklop Bluetootha…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Samodejno poveži"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP lahko uporablja brskalnik, drugi programi pa ne."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokacija:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID v bližini:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Podatki o celici:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Podatkovni poskusi:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Storitev GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Gostovanje:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Podatkovna povezava ni mogoča, ker ste zapustili domače omrežje, podatkovno gostovanje pa je izklopljeno."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Vklopi"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Če dovolite podatkovno gostovanje, so lahko stroški gostovanja visoki."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Če omogočite podatkovno gostovanje, si lahko naprtite velike stroške!\n\nNastavitev vpliva na vse uporabnike v tem tabličnem računalniku."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Če omogočite podatkovno gostovanje, si lahko naprtite velike stroške!\n\nNastavitev vpliva na vse uporabnike v tem telefonu."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Želite dovoliti podatkovno gostovanje?"</string>
     <string name="networks" msgid="6333316876545927039">"Izbira operaterja"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Izbira omrežnega operaterja"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Podatki o lastniku"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Zahteva kodo PIN ali geslo, s katerim boste ob vsakem vklopu dešifrirali tablični računalnik"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Zahteva kodo PIN ali geslo, s katerim boste ob vsakem vklopu dešifrirali telefon"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrirano"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Šifrirate lahko račune, nastavitve, prenesene programe in njihove podatkovne, predstavnostne in druge datoteke. Če šifrirate tablični računalnik, ga morate ob vsakem vklopu dešifrirati z vpisom številske kode PIN ali gesla, sicer ga lahko dešifrirate samo tako, da ga ponastavite na tovarniške nastavitve, pri čemer izbrišete vse podatke."\n\n"Šifriranje traja uro ali več. Začeti morate z napolnjeno baterijo, računalnik pa mora biti do konca postopka priključen v električno omrežje. Če postopek prekinete, boste izgubili nekatere ali vse podatke."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Šifrirate lahko račune, nastavitve, prenesene programe in njihove podatkovne, predstavnostne in druge datoteke. Če šifrirate telefon, ga morate ob vsakem vklopu dešifrirati z vpisom številske kode PIN ali gesla, sicer ga lahko dešifrirate samo tako, da ga ponastavite na tovarniške nastavitve, pri čemer izbrišete vse podatke."\n\n"Šifriranje traja uro ali več. Začeti morate z napolnjeno baterijo, telefon pa mora biti do konca postopka priključen v električno omrežje. Če postopek prekinete, boste izgubili nekatere ali vse podatke."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Šifrirate lahko račune, nastavitve, prenesene programe in njihove podatkovne, predstavnostne in druge datoteke. Če šifrirate tablični računalnik, ga morate ob vsakem vklopu dešifrirati z vpisom številske kode PIN ali gesla, sicer ga lahko dešifrirate samo tako, da ga ponastavite na tovarniške nastavitve, pri čemer izbrišete vse podatke.\n\nŠifriranje traja uro ali več. Začeti morate z napolnjeno baterijo, računalnik pa mora biti do konca postopka priključen v električno omrežje. Če postopek prekinete, boste izgubili nekatere ali vse podatke."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Šifrirate lahko račune, nastavitve, prenesene programe in njihove podatkovne, predstavnostne in druge datoteke. Če šifrirate telefon, ga morate ob vsakem vklopu dešifrirati z vpisom številske kode PIN ali gesla, sicer ga lahko dešifrirate samo tako, da ga ponastavite na tovarniške nastavitve, pri čemer izbrišete vse podatke.\n\nŠifriranje traja uro ali več. Začeti morate z napolnjeno baterijo, telefon pa mora biti do konca postopka priključen v električno omrežje. Če postopek prekinete, boste izgubili nekatere ali vse podatke."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifriraj tablični računalnik"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifriraj telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Napolnite baterijo in poskusite znova."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Poskusite znova čez <xliff:g id="DELAY">^1</xliff:g> sekund."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Vnesite geslo"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifriranje ni uspelo"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v tabličnem računalniku niso več dostopni. "\n\n"Če želite tablični računalnik spet uporabljati, ga morate ponastaviti na tovarniške nastavitve. Ko ga po ponastavitvi spet nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v Google Račun."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v telefonu niso več dostopni. "\n\n"Če želite telefon ponovno uporabljati, ga morate ponastaviti na tovarniške nastavitve. Ko ga po ponastavitvi ponovno nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v Google Račun."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v tabličnem računalniku niso več dostopni. \n\nČe želite tablični računalnik spet uporabljati, ga morate ponastaviti na tovarniške nastavitve. Ko ga po ponastavitvi spet nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v Google Račun."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v telefonu niso več dostopni. \n\nČe želite telefon ponovno uporabljati, ga morate ponastaviti na tovarniške nastavitve. Ko ga po ponastavitvi ponovno nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v Google Račun."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Preklopite način vnosa"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Izberite zakl. zaslona"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Izberite varnostno zaklepanje"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Spremeni kodo PIN za odklepanje"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Spremeni geslo za odklepanje"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Geslo mora vsebovati vsaj %d znakov"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Koda PIN mora vsebovati vsaj %d znakov"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Koda PIN mora biti vsaj %d-mestna"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Ko končate, se dotaknite »Nadaljuj«"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Naprej"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Geslo mora imeti manj kot toliko znakov: <xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kot zvočnik"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Za glasbo in predstavnost"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapomni si nastavitve"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Seznanjene naprave"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Razpoložljive naprave"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Povezovanje"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Povezane"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Na voljo"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"V uporabi"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Nastavitve naprave"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Želite prekiniti povezavo?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"S tem bo prekinjena povezava z napravo:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Možnosti prikaza brezžičnih naprav"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Pozabi"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Končano"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Ime"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Vklopljeno"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Izklopljeno"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Onemogočeno"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Dovoli izmenjavo podatkov, ko se tablični računalnik dotakne druge naprave"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Dovoli izmenjavo podatkov, ko se telefon dotakne druge naprave"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Izklopljeno"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Ni na voljo, ker je NFC izklopljen"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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\nPribliž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">"Izberi 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="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="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="8116564886303972764">"Vnesite PIN <xliff:g id="NUMBER">%1$s</xliff:g> za usmerjevalnik Wi-Fi. Nastavitev lahko traja do 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_in_progress" msgid="2944576520214787628">"Nastavitev WPS že poteka in lahko traja do dve minuti"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Varnostna nastavitev brezžičnega usmerjevalnika (TKIP) ni podprta"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Preverjanje pristnosti ni uspelo. Poskusite znova."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Zaznana je druga seja WPS. Poskusite znova čez nekaj minut."</string>
     <string name="wifi_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>
@@ -564,6 +621,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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Shrani"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Shranjevanje omrežja ni uspelo"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Prekliči"</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_skip_anyway" msgid="6965361454438011190">"Kljub temu preskoči"</string>
+    <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\nNastavitev 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\nNastavitev telefona lahko zahteva znatno omrežno dejavnost."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Iskanje …"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Preimenovanje naprave"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Enakovredne naprave"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Shranjene skupine"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Povezava ni mogoča."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Naprave ni bilo mogoče preimenovati."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Želite prekiniti povezavo?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Če prekinete povezavo, bo prekinjena povezava z napravo <xliff:g id="PEER_NAME">%1$s</xliff:g> in še toliko drugimi: <xliff:g id="PEER_COUNT">%2$s</xliff:g>."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Prenosna brezžična dostopna točka"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Želite pozabiti to skupino?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prenosna dostopna točka Wi-Fi"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Glasbeni učinki"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Glasnost zvonjenja"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibriraj v tihem načinu"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Privzeto obvestilo"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Privzeti zvok obvestila"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Lučka za obvestila z utripanjem"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvonjenje"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Obvestilo"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Za obvestila uporabljaj glasnost dohodnih klicev"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Izberite melodijo zvonjenja za obvestila"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Privzeti zvok obvestila"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Predstavnost"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Nastavi glasnost za glasbo in video"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
@@ -660,7 +732,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Iskanje"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Upravljaj nastavitve iskanja in zgodovine"</string>
     <string name="display_settings" msgid="7965901687241669598">"Prikaz"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"Samodejno zasuči zaslon"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Samodejno zasukaj zaslon"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Samodejno spremeni usmerjenost ob zasuku tabličnega računalnika"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Samodejno preklopi usmeritev ob zasuku telefona"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Samodejno spremeni usmerjenost ob zasuku tabličnega računalnika"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nedejavnosti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Ozadje"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Izberite ozadje iz"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Zaslonske sladkarije"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Zagon v stanju pripravljenosti, če je priključeno napajanje"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Onemogočeno"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Izbrane sladkarije"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Kdaj aktivirati"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nedejavnosti"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nikoli"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Poskusite!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Zaženi tudi, ko je v stojalu"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Sanjarjenje"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"V stojalu ali v stanju pripravljenosti in med polnjenjem"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Eno ali drugo"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Med napajanjem"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"V stojalu"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Izklopljeno"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Če želite nadzorovati, kaj se dogaja, ko je telefon v stojalu in/ali v stanju pripravljenosti, vklopite »Sanjarjenje«."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kdaj sanjariti"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Začnite zdaj"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Nastavitve"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Samodejna svetlost"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost pisave"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Velikost pisave"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"Koda PIN za kartico SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Napačen PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Kodi PIN se ne ujemata"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Kode PIN ni mogoče spremeniti."\n"Koda PIN je morda napačna."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Kode PIN ni mogoče spremeniti.\nKoda PIN je morda napačna."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Sprememba kode PIN za kartico SIM je uspela"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Zaklepanja kartice SIM ni mogoče spremeniti."\n"Morda je koda PIN napačna."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Zaklepanja kartice SIM ni mogoče spremeniti.\nMorda je koda PIN napačna."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"V redu"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Prekliči"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stanje tabličnega računalnika"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Različica radijske programske opreme"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Različica jedra"</string>
     <string name="build_number" msgid="3075795840572241758">"Delovna različica"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Stanje za SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Ni na voljo"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Stanje"</string>
     <string name="device_status" msgid="607405385799807324">"Stanje"</string>
@@ -733,12 +807,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">"Vrsta mobilnega omrežja"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Podatki operaterja"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Stanje mobilnega omrežja"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Stanje storitve"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Pomnilnik USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Kartica SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"Na voljo"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Na voljo (samo za branje)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Skupno prostora"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Izračunavanje ..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikacije (podatki o aplik. in medijska vsebina)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Slike, videoposnetki"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Zvok (glasba, melodije zvonjenja, podcasti ipd.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Razno"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Predpomnjeni podatki"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Izpni skupno shrambo"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Izpni kartico SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Izpni notranji pomnilnik USB"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Izbriši kartico SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Izbriše vse podatke na notranjem pomnilniku USB, na primer glasbo ali fotografije"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Izbriše vse podatke na kartici SD, na primer glasbo ali fotografije"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Samo za branje)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Želite počistiti predpomnjene podatke?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Počistili boste predpomnjene pod. vseh aplikacij."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Funkcija MTP ali PTP je aktivna"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Želite izpeti pomnilnik USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Želite izpeti kartico SD?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Če izpnete pomnilnik USB, bodo nekateri programi, ki jih uporabljate, nehali delovati in ne bodo na voljo, dokler pomnilnika USB spet ne vpnete."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Fotoaparat (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Omogoča prenos fotografij s programsko opremo fotoaparata in prenos datotek v računalnikih, ki ne podpirajo protokola MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Namestitev orodij za prenos datotek"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Drugi uporabniki"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stanje baterije"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Raven napolnjenosti baterije"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN-ji"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Ponastavitev na tovarniške nastavitve"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Izbriše vse podatke na tabličnem računalniku"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Izbriše vse podatke iz telefona"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"S tem boste iz "<b>"notranjega pomnilnika"</b>" tabličnega računalnika izbrisali vse podatke:"\n\n<li>"Google Račun"</li>\n<li>"Podatke in nastavitve sistema in programov"</li>\n<li>"Prenesene programe"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"S tem boste iz "<b>"notranjega pomnilnika"</b>" telefona izbrisali vse podatke:"\n\n<li>"Google Račun"</li>\n<li>"Podatke in nastavitve sistema in programov"</li>\n<li>"Prenesene programe"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutno ste prijavljeni v te račune:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"S tem boste iz "<b>"notranjega pomnilnika"</b>" tabličnega računalnika izbrisali vse podatke:\n\n"<li>"Google Račun"</li>\n<li>"Podatke in nastavitve sistema in programov"</li>\n<li>"Prenesene programe"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"S tem boste iz "<b>"notranjega pomnilnika"</b>" telefona izbrisali vse podatke:\n\n"<li>"Google Račun"</li>\n<li>"Podatke in nastavitve sistema in programov"</li>\n<li>"Prenesene programe"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutno ste prijavljeni v te račune:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Glasba"</li>\n<li>"Fotografije"</li>\n<li>"Drugi uporabniški podatki"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"pomnilnik USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"kartico SD"</b>"."</string>
@@ -875,7 +957,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>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Internetna povezava z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bo prekinjena."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoč"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilna omrežja"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Upravljanje paketa prenosa podatkov"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Neznani operater za SIM"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s nima znanega spletnega mesta za omogočanje uporabe"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vstavite SIM in znova zaženite"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Vzpostavite internetno povezavo"</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>
@@ -917,6 +1004,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Ogled pravnih informacij, stanja, različice programske opreme"</string>
     <string name="legal_information" msgid="5769301644270604095">"Pravne informacije"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Sodelavci"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Zakonsko predpisani podatki"</string>
     <string name="copyright_title" msgid="865906688917260647">"Avtorska pravica"</string>
     <string name="license_title" msgid="1990487604356037871">"Licenca"</string>
     <string name="terms_title" msgid="7697580845616764642">"Določila in pogoji"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Spremeni kodo PIN za odklepanje"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Potrdite shranjeni vzorec"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Poskusite znova:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Nariši vzorec za odklepanje"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Narišite vzorec za odklepanje:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Če želite pomoč, pritisnite meni."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Ko končate, dvignite prst."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Povežite vsaj <xliff:g id="NUMBER">%d</xliff:g> pik. Poskusite znova:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kako narisati vzorec za odklepanje"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Preveč napačnih poskusov!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Čez <xliff:g id="NUMBER">%d</xliff:g> sekund poskusite znova."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Prekliči"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Naprej"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Varnost tabličnega računalnika"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Zaščita telefona"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Zaščitite tablični računalnik pred nepooblaščeno uporabo tako, da ustvarite vzorec za odklepanje zaslona. Na naslednjem zaslonu s prstom v poljubnem vrstnem redu povežite pike. Povezati morate vsaj štiri pike. "\n\n"Ste pripravljeni? Dotaknite se možnosti »Naprej«."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Zaščitite telefon pred nepooblaščeno uporabo, tako da ustvarite osebni vzorec za odklepanje zaslona. Na naslednjem zaslonu s prstom v poljubnem vrstnem redu povežite vsaj štiri pike. "\n\n"Ste pripravljeni? Dotaknite se gumba »Naprej«."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Aplikacija ni nameščena v telefonu."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Upravljaj programe"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Upravljanje in odstranjevanje nameščenih programov"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Programi"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Dovoli namestitev aplikacij iz neznanih virov"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Programi iz neznanih virov lažje napadejo tablični računalnik in osebne podatke. Strinjate se, da ste za morebitno škodo, nastalo v tabličnem računalniku, ali izgubo podatkov, ki sta posledica uporabe teh programov, odgovorni izključno sami."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Programi iz neznanih virov lažje napadejo telefon in osebne podatke. Strinjate se, da ste izključno sami odgovorni za morebitno škodo, nastalo v telefonu, ali izgubo podatkov, ki sta posledica uporabe teh programov."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Preverjanje aplikacij"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Ne dovoli namestitve ali opozori pred namestitvijo aplikacije, ki je lahko škodljiva"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Dodatne nastavitve"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Omogoči več možnosti nastavitev."</string>
     <string name="application_info_label" msgid="5736524913065714880">"Podatki o aplikaciji"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Podatki na pogonu USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Kartica SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Odstrani"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Odstrani za vse uporabnike"</string>
+    <string name="install_text" msgid="884360662922471113">"Namesti"</string>
     <string name="disable_text" msgid="6544054052049395202">"Onemogoči"</string>
     <string name="enable_text" msgid="9217362512327828987">"Omogoči"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Počisti podatke"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Pokaži predpom. procese"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Ponast. nast. aplikacije"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Ponastavitev nastavitev?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ponastavili boste vse nastavitve za:"\n\n" "<li>"Onemogočene aplikacije"</li>\n" "<li>"Obvestila o onemogočenih aplikacijah"</li>\n" "<li>"Privzete aplikacije za dejanja"</li>\n" "<li>"Omejitve podatkov v ozadju za aplikacije"</li>\n\n" Podatkov aplikacij ne boste izgubili."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ponastavili boste vse nastavitve za:\n\n "<li>"Onemogočene aplikacije"</li>\n" "<li>"Obvestila o onemogočenih aplikacijah"</li>\n" "<li>"Privzete aplikacije za dejanja"</li>\n" "<li>"Omejitve podatkov v ozadju za aplikacije"</li>\n\n" Podatkov aplikacij ne boste izgubili."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Ponastavitev aplikacij"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostor"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na kartici SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Onemogočeno"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Ni nameščeno"</string>
     <string name="no_applications" msgid="7336588977497084921">"Ni programov."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Notranji pomnilnik"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Pomnilnik USB"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> in <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Ta aplikacija vam lahko zaračuna stroške:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Pošlji SMS za plačljive storitve"</string>
     <string name="computing_size" msgid="1599186977475211186">"Izračunavanje ..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Velikosti paketa ni bilo mogoče izračunati."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Nimate nameščenih programov drugih ponudnikov."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Spremenite prednostno namestitveno mesto za nove programe."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Želite onemogočiti vgrajen program?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Če onemogočite vgrajen program, bodo drugi programi morda nepravilno delovali."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Ali želite izbrisati podatke in onemogočiti aplikacijo?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Uporabnik: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Odstranjen uporabnik"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proces, <xliff:g id="NUMSERVICES">%2$d</xliff:g> storitev"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g>proces, število storitev: <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> procesov in <xliff:g id="NUMSERVICES">%2$d</xliff:g> storitev"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Nastavitve fizične tipkovnice"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Dvakrat pritisnite preslednico, da vnesete ».«"</string>
     <string name="show_password" msgid="3001113966880559611">"Gesla so vidna"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Ta način vnosa lahko morda zbere besedilo, ki ga vtipkate, vključno z osebnimi podatki, kot so gesla in številke kreditnih kartic. Omogoča jo program <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Ali želite uporabiti ta način vnosa?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Ta pregledovalnik črkovanja bo morda lahko zbral vse besedilo, ki ga vnesete, vključno z osebnimi podatki, kot so gesla in številke kreditnih kartic. Pregledovalnik je iz programa <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Ga želite uporabiti?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Nastavitve"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Preklopite s Ctrl + preslednica"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Privzeto"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Razporeditve tipkovnice"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Uporabniški slovar"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Osebni slovar"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osebni slovarji"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Osebni slovar"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Dodaj"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Dodaj v slovar"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Med polnjenjem se zaslon ne bo nikoli zaklenil"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Omogoči dnevnik vohljanja Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zajemi vse pakete Bluetooth HCI v datoteko"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Izbira izvajalnika"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Izbira izvajalnika"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Želite napravo znova zagnati, da se različica izvajalnika spremeni z <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Dovoli lažne lokacije"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Dovoli lažne lokacije"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Preveri, ali so aplikacije, nameščene prek ADB/ADT, škodljive."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Zaščiti shrambo USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplikacije morajo zahtevati dovoljenje za branje shrambe USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Želite zaščititi shrambo USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Če je shramba USB zaščitena, morajo aplikacije zahtevati dovoljenje za branje podatkov iz zunanje shrambe."\n\n"Nekatere aplikacije morda ne bodo delovale, dokler jih njihovi razvijalci ne posodobijo."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Če je shramba USB zaščitena, morajo aplikacije zahtevati dovoljenje za branje podatkov iz zunanje shrambe.\n\nNekatere aplikacije morda ne bodo delovale, dokler jih njihovi razvijalci ne posodobijo."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Zaščiti kartico SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikacije morajo zahtevati dovoljenje za branje kartice SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Želite zaščititi kartico SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Če je kartica SD zaščitena, morajo aplikacije zahtevati dovoljenje za branje podatkov iz zunanje shrambe."\n\n"Nekatere aplikacije morda ne bodo delovale, dokler jih njihovi razvijalci ne posodobijo."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Če je kartica SD zaščitena, morajo aplikacije zahtevati dovoljenje za branje podatkov iz zunanje shrambe.\n\nNekatere aplikacije morda ne bodo delovale, dokler jih njihovi razvijalci ne posodobijo."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokalni terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Omogočanje terminalske aplikacije za dostop do lokalne lupine"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Izberi pripomoček"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Izberite pripomoček"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Želite ustvariti pripomoček in dovoliti dostop?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Nastavitve pripomočkov za ljudi s posebnimi potrebami"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Storitve"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Veliko besedilo"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Gumb za vklop konča klic"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Izgovorite gesla"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Zapoznitev za dotik in pridržanje"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Izboljšanje dostopnosti do spleta"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Poteze za povečavo"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Če je ta funkcija vklopljena, lahko vsebino na zaslonu povečate ali pomanjšate tako, da se trikrat dotaknete zaslona.\n\nPri povečavi lahko:\n"<ul><li>"Pomikate vsebino na zaslonu: Dva prsta ali več povlecite po zaslonu."</li>\n<li>"Prilagodite stopnjo povečave/pomanjšave: Najmanj dva prsta približajte ali razširite."</li></ul>\n\n"Začasno lahko tisto, kar je pod vašim prstom, povečate tudi tako, da se zaslona trikrat dotaknete in ga pridržite. V tem načinu povečave lahko povlečete s prstom in raziščete različne dele zaslona. Dvignite prst, če se želite vrniti v prejšnje stanje.\n\nOpomba: Trojni dotik za povečavo deluje povsod, razen pri tipkovnici in v vrstici za krmarjenje"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Bližnj. prip. za ljudi s pos. pot."</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Vklopljeno"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Izklopljeno"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Če je ta funkcija vklopljena, lahko v dveh korakih hitro omogočite funkcije za ljudi s posebnimi potrebami:\n\n1. korak: Pritisnite in pridržite gumb za vklop, dokler ne zaslišite zvoka ali začutite vibracije.\n\n2. korak: Dotaknite se zaslona z dvema prstoma in pridržite, dokler ne zaslišite zvočne potrditve.\n\nČe napravo uporablja več uporabnikov, z uporabo te bližnjice na zaslonu za zaklepanje začasno omogočite funkcije za ljudi s posebnimi potrebami, dokler naprave ne odklenete."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Veliko besedilo"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Povečava zaslona"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Samodejno posodobi povečavo zaslona"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Posodabljanje povečave zaslona pri prehodih aplik."</string>
+    <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_menu_item_settings" msgid="3344942964710773365">"Nastavitve"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Vklopljeno"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Izklopljeno"</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="accessibility_feature_state_on" msgid="2864292320042673806">"Vklopljeno"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Izkloplj."</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="print_settings" msgid="4742428530112487843">"Tiskanje"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Nastavitve tiskanja"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Storitve"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Želite uporabiti storitev <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"Storitev <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> lahko prejema dokumente, ki jih natisnete. Ti dokumenti lahko vsebujejo občutljive podatke."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nameščena ni nobena storitev"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Nastavitve"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Dodajanje tiskalnikov"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Vklop"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Izklop"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterija"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Kaj porablja energijo baterije"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Podatki o porabi baterije niso na voljo."</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Podatki prejeti"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Podatki, poslani v mobilnih omr."</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Podatki, prejeti v mobilnih omr."</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Podatki, poslani v omr. Wi-Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Podatki, prejeti v omr. Wi-Fi"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Zvok"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Čas vklopa"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Ustavi ali odstrani program"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Ročno nadzirajte GPS in tako preprečite programom, da bi ga uporabljali"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Program morda omogoča nastavitve za zmanjšanje porabe energije"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Energija, ki jo je porabil uporabnik"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odklopa"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Po zadnjem odklopu za <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Skupna poraba"</string>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Višina tona"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Vpliva na ton govorjenega besedila"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Jezik"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Jezik ni izbran"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Nastavite glas, odvisen od jezika, za govorjeno besedilo"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Poslušaj primer"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Predvajaj kratko predstavitev sinteze govora"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Svetlost <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"samodejno"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"najsvetleje"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"polovično"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"izklopljeno"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Shramba poverilnic"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Namesti iz shrambe"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Pri vnovični namestitvi programa obnovite varnostno kopirane nastavitve in podatke"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Ustvari poročilo o napakah"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"S tem bodo zbrani podatki o trenutnem stanju naprave, ki bodo poslani v elektronskem sporočilu. Izvedba poročila o napakah in priprava trajata nekaj časa, zato bodite potrpežljivi."</string>
-    <string name="report" msgid="302437572240018342">"Poročilo"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Geslo za varn. kop. rač."</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Popolne varnostne kopije namizja trenutno niso zaščitene"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Dotaknite se, če želite spremeniti ali odstraniti geslo za popolno varnostno kopiranje namizja."</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Koledar"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Stiki"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Pozdravljeni v storitvi Google Sync."</font>" "\n"Googlov pristop k sinhroniziranju podatkov, s katerim lahko dostopate do stikov, koledarskih vnosov in drugih podatkov ne glede na to, kje ste."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Pozdravljeni v storitvi Google Sync."</font>" \nGooglov pristop k sinhroniziranju podatkov, s katerim lahko dostopate do stikov, koledarskih vnosov in drugih podatkov ne glede na to, kje ste."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Nastavitve sinhronizacije programov"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Podatki in sinhronizacija"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Spremeni geslo"</string>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Ob posodobitvi osvetli celotne površine oken"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Pokaži posod. pogleda GPE"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Osvetli poglede v oknih pri risanju z GPE"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Pokaži pos. sl. str. opr."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Obarvaj sloje strojne opreme zeleno ob posodobitvi"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Odpr. nap. ris. zunaj vidn. obm. za GPE"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Prikaži uporabo CPE-ja"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Prekrivanje zaslona prikazuje tren. uporabo CPE-ja"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Vsili upodabljanje z GPU-jem"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simul. sekund. prikazov."</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Programi"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ne obdrži dejavnosti"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Uniči vsako dejavnost, ko uporabnik preneha z njo"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Onem. prenos podat. v ozadju v mob. omr. Upor. bodo nemob. omr."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Če želite za ta program omejiti prenos podatkov v ozadju, nastavite omejitev prenosa podatkov v mobilnih omrežjih."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Želite omejiti podatke v ozadju?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ta funkcija lahko povzroči prenehanje delovanja aplikacije, ki je odvisna od podatkov v ozadju, če so na voljo samo mobilna omrežja."\n\n"Ustreznejši kontrolniki za uporabo podatkov so na voljo v nastavitvah v aplikaciji."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ta funkcija lahko povzroči prenehanje delovanja aplikacije, ki je odvisna od podatkov v ozadju, če so na voljo samo mobilna omrežja.\n\nUstreznejši kontrolniki za uporabo podatkov so na voljo v nastavitvah v aplikaciji."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Prenos podatkov v ozadju lahko omejite samo, če nastavite omejitev količine podatkov, prenesenih v mobilnih omrežjih."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Želite vklopiti samodejno sinhroniziranje podatkov?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Vse spremembe vaših računov v spletu bodo samodejno kopirane v tablični računalnik."\n\n"Nekateri računi lahko spremembe, narejene v tabličnem računalniku, samodejno kopirajo v splet. Na ta način deluje Google Račun."\n\n"Če želite izbrati, katere vrste podatkov sinhronizirati v katerem računu, pojdite na Nastavitve &gt; Računi."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Vse spremembe vaših računov v spletu bodo samodejno kopirane v telefon."\n\n"Nekateri računi lahko spremembe, narejene v telefonu, samodejno kopirajo v splet. Na ta način deluje Google Račun."\n\n"Če želite izbrati, katere vrste podatkov sinhronizirati v katerem računu, pojdite na Nastavitve &gt; Računi."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Vse spremembe vaših računov v spletu bodo samodejno kopirane v tablični računalnik.\n\nNekateri računi lahko spremembe, narejene v tabličnem računalniku, samodejno kopirajo v splet. Na ta način deluje Google Račun.\n\nČe želite izbrati, katere vrste podatkov sinhronizirati v katerem računu, pojdite na Nastavitve &gt; Računi."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Vse spremembe vaših računov v spletu bodo samodejno kopirane v telefon.\n\nNekateri računi lahko spremembe, narejene v telefonu, samodejno kopirajo v splet. Na ta način deluje Google Račun.\n\nČe želite izbrati, katere vrste podatkov sinhronizirati v katerem računu, pojdite na Nastavitve &gt; Računi."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Želite izklopiti samodejno sinhroniziranje podatkov?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"S tem zmanjšate količino prenesenih podatkov in porabo akumulatorja, vendar boste morali vsak posamezen račun sinhronizirati ročno, da dobite najnovejše podatke. Prav tako ne boste dobili obvestil o posodobitvah."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum ponastavitve cikla porabe"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Nastavi opozorilo o uporabi podatkov"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nastavitev omejitve količine prenesenih podatkov"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Omejitev porabe podatkov"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Vaša mobilna podatkovna povezava bo onemogočena, ko dosežete omejitev.\n\nKer 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\nKer 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" 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\nNastavitev 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\nNastavitev 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Odstranjene aplikacije in uporabniki"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"prejeto: <xliff:g id="RECEIVED">%1$s</xliff:g>, poslano: <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>: približna količina prenesenih podatkov: <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>: 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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Dodajanje profila VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Urejanje profila"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Brisanja profila"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Stalno vklopljeno navidez. zaseb. omrež."</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Izberite profil za navidezno zasebno omrežje, s katerim boste vedno povezani. Omrežni promet bo dovoljen samo prek tega navideznega zasebnega omrežja."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Brez"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Za stalno vklopljeno navidezno zasebno omrežje je potreben naslov IP tako za strežnik kot za DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Ni omrežne povezave. Poskusite pozneje."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Ni potrdila. Uredite profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistemska"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Prekliči"</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">"Dodatne posodobitve sistema"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Uporabniki in omejitve"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Uporabniki"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj uporabnika"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Urejanje podrobnosti"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Podatki o uporabniku"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Ime"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Omejitve vsebine"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Zahteva za kodo PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Ocena vsebine"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Sistemske aplikacije"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Nameščene aplikacije"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Zavrzi"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Odstrani uporabnika"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Nadležen otrok"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Onemogočeno"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Dopuščajoče"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Uveljavljajoče"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Uporabniki"</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="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\nKo ustvarite novega uporabnika, mora ta oseba opraviti postopek namestitve.\n\nVsak 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\nVsak 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_confirm_remove_message" msgid="5284111415714437285">"Ali ste prepričani, da želite iz naprave odstraniti uporabnika in vse povezane podatke?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Spremenjena velikost pisave"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Omejitve"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Odstranitev omejitev"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Sprememba kode PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Pokaži obvestila"</string>
     <string name="help_label" msgid="1107174367904110532">"Pomoč"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Račun za vsebino"</string>
+    <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="6160672982086584261">"Nastavitev omejitev za aplikacijo"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Nadzira aplikacija <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ta aplikacija ni podprta za profile z omejitvami"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ta aplikacija lahko dostopa do vaših računov"</string>
+    <string name="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 6652d97..e78eb2b 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,16 +218,127 @@
     <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="886742181977884584">"Медији"</item>
+    <item msgid="7924928667052300589">"Уређај"</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>
+    <item msgid="5124443975763747838">"дугмад за медије"</item>
+    <item msgid="4547883971364273343">"аудио фокус"</item>
+    <item msgid="2603878814882344450">"главна јачина звука"</item>
+    <item msgid="7136963238377062018">"јачина звука гласа"</item>
+    <item msgid="4270236897655923007">"јачина звука звона"</item>
+    <item msgid="6325739889222559394">"јачина звука медија"</item>
+    <item msgid="5762123934816216821">"јачина звука аларма"</item>
+    <item msgid="785049718065337473">"јачина звука обавештења"</item>
+    <item msgid="6700305533746877052">"јачина звука Bluetooth-а"</item>
+    <item msgid="2029227495214047094">"задржавање ван стања спавања"</item>
+    <item msgid="26109888160231211">"праћење локације"</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>
+    <item msgid="5753789168376302997">"Дугмад за медије"</item>
+    <item msgid="3265262911688671938">"Аудио фокус"</item>
+    <item msgid="2098976479485046797">"Главна јачина звука"</item>
+    <item msgid="5660213838861789350">"Јачина звука гласа"</item>
+    <item msgid="7983336752371254444">"Јачина звука звона"</item>
+    <item msgid="7878027809189330917">"Јачина звука медија"</item>
+    <item msgid="7260546305036218513">"Јачина звука аларма"</item>
+    <item msgid="9103719301075748925">"Јачина звука обавештења"</item>
+    <item msgid="7025966722295861512">"Јачина звука Bluetooth-а"</item>
+    <item msgid="4665183401128289653">"Задржи ван стања спавања"</item>
+    <item msgid="8584357129746649222">"Локација"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кратко"</item>
     <item msgid="2560532955514699713">"Средње"</item>
     <item msgid="2372711992605524591">"Дугачко"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (отклањање грешака)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Коришћење Dalvik-а"</item>
+    <item msgid="5131846588686178907">"Коришћење ART-а"</item>
+    <item msgid="4530003713865319928">"Коришћење ART верзије за отклањање грешака"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Никад не проверавај"</item>
     <item msgid="6042769699089883931">"Потражи само DRM садржај"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Размера анимације 5x"</item>
     <item msgid="1069584980746680398">"Размера анимације 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Ниједно"</item>
+    <item msgid="688482401508173818">"720×480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280×720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920×1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280×720 tvdpi и 1920×1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Ниједан"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Искључи"</item>
+    <item msgid="7688197031296835369">"Прикажи области преклапања"</item>
+    <item msgid="8332661909019981149">"Прикажи бројач преклапања"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандардно ограничење"</item>
     <item msgid="4071574792028999443">"Без позадинских процеса"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Време чекања"</item>
     <item msgid="7664124146786465092">"Неуспешно"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Питај"</item>
+    <item msgid="5077768429488260031">"Никада не дозволи"</item>
+    <item msgid="1417929597727989746">"Увек дозволи"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e5fe25e..ba760e5 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Да"</string>
     <string name="no" msgid="6731231425810196216">"Не"</string>
     <string name="create" msgid="3578857613172647409">"Направи"</string>
+    <string name="allow" msgid="3349662621170855910">"Дозволи"</string>
+    <string name="deny" msgid="6947806159746484865">"Одбиј"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Непознато"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Треба да обавите још <xliff:g id="STEP_COUNT">%1$d</xliff:g> корак да бисте постали програмер."</item>
+    <item quantity="other" msgid="6722953419953594148">"Треба да обавите још <xliff:g id="STEP_COUNT">%1$d</xliff:g> корака да бисте постали програмер."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Постали сте програмер!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Нема потребе, већ сте програмер."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"БЕЖИЧНА ВЕЗА И МРЕЖЕ"</string>
     <string name="header_category_device" msgid="5781174212691167553">"УРЕЂАЈ"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"ЛИЧНО"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Пуњење"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Пражњење"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(бежично)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Не пуни се"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не пуни се"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Пуно"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Акустично"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"бежично"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Непознато"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Непознато"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Непозната грешка"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Незанимљиво"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Видљив"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Видљиво за све оближње Bluetooth уређаје (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Видљиво за све оближње Bluetooth уређаје"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Није видљиво за друге Bluetooth уређаје"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Видљиво само за упарене уређаје"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Нека уређај буде видљив"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Време чекања за видљивост"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Подешавање периода у коме ће уређај бити видљив"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Закључај говорно бирање"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Спречи коришћење bluetooth програма за бирање бројева када је екран закључан"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth уређаји"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Приказ примљених датотека"</string>
     <string name="device_picker" msgid="8398232791303186677">"Бирач Bluetooth уређаја"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Захтев за Bluetooth дозволу"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Апликација жели да укључи Bluetooth. Желите ли то да дозволите?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Апликација на таблету жели да учини таблет видљивим за друге Bluetooth уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> секунде(и). Желите ли то да дозволите?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Апликација на телефону жели да учини телефон видљивим за друге Bluetooth уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> секунде(и). Желите ли то да дозволите?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Апликација на таблету жели да учини таблет „увек видљивим“ за друге Bluetooth уређаје. Желите ли то да дозволите?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Апликација на телефону жели да учини телефон „увек видљивим“ за друге Bluetooth уређаје. Желите ли то да дозволите?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Апликација на таблету жели да укључи Bluetooth и учини таблет видљивим за друге уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> секунде(и). Желите ли то да дозволите?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Апликација на телефону жели да укључи Bluetooth и учини телефон видљивим за друге уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> секунде(и). Желите ли то да дозволите?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Апликација на таблету жели да укључи Bluetooth и учини таблет видљивим за друге уређаје. Желите ли то да дозволите?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Апликација на телефону жели да укључи Bluetooth и учини телефон видљивим за друге уређаје. Желите ли то да дозволите?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Апликација жели да укључи Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Апликација жели да учини таблет видљивим за друге Bluetooth уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Апликација жели да учини телефон видљивим за друге Bluetooth уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Апликација жели да учини таблет видљивим за друге Bluetooth уређаје. Ово можете касније да промените у подешавањима Bluetooth-а."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Апликација жели да учини телефон видљивим за друге Bluetooth уређаје. Ово можете касније да промените у подешавањима Bluetooth-а."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Апликација жели да укључи Bluetooth и учини таблет видљивим за друге уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Апликација жели да укључи Bluetooth и учини телефон видљивим за друге уређаје на <xliff:g id="TIMEOUT">%1$d</xliff:g> сек."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Апликација жели да укључи Bluetooth и учини таблет видљивим за друге уређаје. Ово можете касније да промените у подешавањима Bluetooth-а."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Апликација жели да укључи Bluetooth и учини телефон видљивим за друге уређаје. Ово можете касније да промените у подешавањима Bluetooth-а."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Укључивање Bluetooth-а…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Искључивање Bluetooth-а…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Аутоматско повезивање"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Прегледач користи HTTP прокси, али друге апликације не могу да га користе."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Локација:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Суседни ИД клијента:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Информације о ћелији:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Покушаји преноса података:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS услуга:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роминг:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Веза за пренос података је прекинута зато што сте напустили матичну мрежу са искљученим преносом података у ромингу."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Укључи"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Када омогућите пренос података у ромингу, могу да настану велики трошкови роминга!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Када омогућите пренос података у ромингу, можете да направите велике трошкове у ромингу!\n\nОво подешавање утиче на све кориснике овог таблета."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Када омогућите пренос података у ромингу, можете да направите велике трошкове у ромингу!\n\nОво подешавање утиче на све кориснике овог телефона."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Желите ли да дозволите пренос података у ромингу?"</string>
     <string name="networks" msgid="6333316876545927039">"Избор оператера"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Избор мрежног оператера"</string>
@@ -297,6 +307,10 @@
     <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>
@@ -308,8 +322,8 @@
     <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">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када будете шифровали таблет, потребно је да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључите. Не можете да дешифрујете таблет осим ако га не вратите на фабричке податке, чиме ћете избрисати све податке."\n\n"Шифровање траје сат времена или дуже. Потребно је да почнете са напуњеном батеријом и да не искључујете таблет док се шифровање не доврши. Ако прекинете процес шифровања, изгубићете све податке или део њих."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када будете шифровали телефон, потребно је да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључите. Не можете да дешифрујете телефон осим ако га не вратите на фабричке податке, чиме ћете избрисати све податке."\n\n"Шифровање траје сат времена или дуже. Потребно је да почнете са напуњеном батеријом и да не искључујете телефон док се шифровање не доврши. Ако прекинете процес шифровања, изгубићете све податке или део њих."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када будете шифровали таблет, потребно је да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључите. Не можете да дешифрујете таблет осим ако га не вратите на фабричке податке, чиме ћете избрисати све податке.\n\nШифровање траје сат времена или дуже. Потребно је да почнете са напуњеном батеријом и да не искључујете таблет док се шифровање не доврши. Ако прекинете процес шифровања, изгубићете све податке или део њих."</string>
+    <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>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Покушајте поново за <xliff:g id="DELAY">^1</xliff:g> секунди."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Унесите лозинку"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифровање није успело"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на таблету више нису доступни. "\n\n" Да бисте наставили да користите таблет, потребно је да га вратите на фабричка подешавања. Када подесите таблет након враћања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на телефону више нису доступни. "\n\n"Да бисте наставили да користите телефон, потребно је да га вратите на фабричка подешавања. Када подесите телефон након враћања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на таблету више нису доступни. \n\n Да бисте наставили да користите таблет, потребно је да га вратите на фабричка подешавања. Када подесите таблет након враћања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на телефону више нису доступни. \n\nДа бисте наставили да користите телефон, потребно је да га вратите на фабричка подешавања. Када подесите телефон након враћања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Пребаци методе уноса"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Избор закључав. екрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Закључавање рез. коп."</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промена PIN-а за откључавање"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Промена лозинке за откључавање"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Минимални број знакова који лозинка мора да садржи је %d"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Минимални број знакова у PIN коду је %d"</string>
+    <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>
@@ -406,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>
@@ -480,6 +503,28 @@
     <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_empty_list_wifi_display_off" msgid="1225626898926363100">"Да бисте видели уређаје, укључите бежични екран."</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_paired_devices" msgid="7395326840730024303">"Упарени екрани"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Доступни уређаји"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Повезивање"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Повезан"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Доступан"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"У употреби"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Подешавања екрана"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Желите ли да прекинете везу?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Овим ћете прекинути везу са уређајем:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Опције бежичног екрана"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Заборави"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Готово"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Назив"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Укључен"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Искључен"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Онемогућен"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Омогућавање размене података када таблет додирне други уређај"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Омогућавање размене података када телефон додирне други уређај"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Искључено"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Недоступно зато што је NFC искључен"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Када је ова функција укључена, можете да преносите садржај апликација на други уређај на коме је омогућен NFC тако што ћете приближити уређаје један другоме. На пример, можете да преносите странице прегледача, YouTube видео снимке, контакте из апликације Људи и још пуно тога."\n\n"Само прислоните уређаје један на други (обично са задње стране), а затим додирните екран. Апликација одређује шта ће бити пренето."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Када је ова функција укључена, можете да преносите садржај апликација на други уређај на коме је омогућен NFC тако што ћете приближити уређаје један другоме. На пример, можете да преносите странице прегледача, YouTube видео снимке, контакте из апликације Људи и још пуно тога.\n\nСамо прислоните уређаје један на други (обично са задње стране), а затим додирните екран. Апликација одређује шта ће бити пренето."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Откривање мрежне услуге"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Дозвољава апликацијама на другим уређајима да откривају апликације на овом уређају"</string>
-    <string name="wifi_quick_toggle_title" msgid="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="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="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="8116564886303972764">"Унесите 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_in_progress" msgid="2944576520214787628">"WPS је већ покренут и биће довршен за највише два минута"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Успостављена је веза са Wi-Fi мрежом <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS је већ покренут и биће довршен за највише два минута"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS није успео. Покушајте поново за неколико минута."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Безбедносно подешавање бежичног рутера (WEP) није подржано"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Безбедносно подешавање бежичног рутера (TKIP) није подржано"</string>
     <string name="wifi_wps_failed_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>
@@ -564,6 +621,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>
@@ -571,8 +631,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_advanced_titlebar" msgid="1627063574532930090">"Напредна Wi-Fi подешавања"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi опсег фреквенција"</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="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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Претраживање…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Преименуј уређај"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Равноправни уређаји"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Запамћене групе"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Повезивање није могуће."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Преименовање уређаја није успело."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Желите ли да прекинете везу?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Ако прекинете везу, окончаћете везу са уређајем <xliff:g id="PEER_NAME">%1$s</xliff:g> и другим уређајима (<xliff:g id="PEER_COUNT">%2$s</xliff:g>)."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Желите ли да откажете позивницу?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Желите ли да откажете позивницу за повезивање са уређајем <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Преносна Wi-Fi приступна тачка"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Желите ли да заборавите ову групу?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Преносни Wi-Fi хотспот"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Музички ефекти"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Јачина звука звона"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вибрација у нечујном режиму"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Подразумевано обавештење"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Лампица за обавештења која трепери"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Подразумевани звук обавештења"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Пулсирајуће обавештење"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Звук звона"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Обавештење"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Користи јачину звука долазног позива за обавештења"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Избор мелодије звона обавештења"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Подразумевани звук обавештења"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Медији"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Подешавање јачине звука за музику и видео снимке"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Аларм"</string>
@@ -671,15 +743,16 @@
     <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="3848608373818910549">"Бомбона на екрану"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Активираће се када пређе у стање спавања ако је прикључен на напајање"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Онемогућен"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Изабрана бомбона"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Када да се активира"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Након стања неактивности од <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Никада"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Испробај!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Активирај и када је на постољу"</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">"Да бисте контролисали шта се дешава када је телефон на базној станици и/или у стању спавања, укључите Сањарење."</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>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Нетачан PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN-ови се не подударају"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Није могуће променити PIN."\n"Могуће је да је PIN нетачан."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Није могуће променити PIN.\nМогуће је да је PIN нетачан."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN је успешно промењен"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Није могуће променити стање закључавања SIM картице."\n"Могуће је да је PIN нетачан."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Није могуће променити стање закључавања SIM картице.\nМогуће је да је PIN нетачан."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Потврди"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Откажи"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Статус таблета"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Верзија основног пропусног опсега"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Верзија језгра"</string>
     <string name="build_number" msgid="3075795840572241758">"Број верзије"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux статус"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Није доступно"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Статус"</string>
     <string name="device_status" msgid="607405385799807324">"Статус"</string>
@@ -733,12 +807,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">"Тип мобилне мреже"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Информације о мобилном оператеру"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Стање мобилне мреже"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Стање услуге"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"Јачина сигнала"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB меморија"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD картица"</string>
     <string name="memory_available" msgid="5052397223077021181">"Доступно"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Доступно (само за читање)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Укупан простор"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Прорачунавање..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Апликације (подаци апликација и медијски садржај)"</string>
@@ -756,6 +832,7 @@
     <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_cache_usage" msgid="6704293333141177910">"Кеширани подаци"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Искљ. дељене меморије"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Ослобађање SD картице"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Искљ. интерне USB меморије"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Брисање SD картице"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Брише све податке из интерне USB меморије, као што су музика и фотографије"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Брише све податке са SD картице, као што су музика и фотографије"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Само за читање)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Желите ли да обришете кеширане податке?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Биће обрисани кеширани подаци за све апликације."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Функција MTP или PTP је активна"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Желите да искључите USB меморију?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Желите ли да извадите SD картицу?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Ако искључите USB меморију, неке апликације које користите ће се зауставити и можда неће бити доступне док поново не прикључите USB меморију."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Камера (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Омогућава вам да преносите фотографије помоћу софтвера за камеру и да преносите датотеке на рачунаре који не подржавају MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Инсталирај алатке за пренос датотека"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Остали корисници"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Статус батерије"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Ниво батерије"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Називи приступних тачака"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Враћање фабричких података"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Брише све податке са таблета"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Брише све податке у телефону"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Овим бришете све податке из "<b>"интерне меморије"</b>" таблета, укључујући:"\n\n<li>"Google налог"</li>\n<li>"Податке и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Овим бришете све податке из "<b>"интерне меморије"</b>" телефона, укључујући:"\n\n<li>"Google налог"</li>\n<li>"Податке и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Тренутно сте пријављени на следеће налоге:"\n</string>
+    <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>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Да бисте обрисали музику, слике и друге корисничке податке, потребно је да избришете садржај "<b>"SD картице"</b>"."</string>
@@ -897,10 +979,15 @@
     <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="manage_mobile_plan_title" msgid="7588182101738043593">"Управљање тарифним пакетом"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Непознати SIM оператер"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s нема познатих веб-сајтова за доделу"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Убаците SIM картицу и поново покрените"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Повежите се са интернетом"</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>
@@ -917,6 +1004,7 @@
     <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="copyright_title" msgid="865906688917260647">"Ауторска права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лиценца"</string>
     <string name="terms_title" msgid="7697580845616764642">"Услови и одредбе"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Промени PIN за откључавање"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Потврдите сачувани шаблон"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Покушајте поново:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Нацртајте шаблон за откључавање"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Нацртајте шаблон за откључавање:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Притисните „Мени“ да бисте добили помоћ."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Пустите прст када завршите."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Повежите се са најмање <xliff:g id="NUMBER">%d</xliff:g> тачке(ака). Покушајте поново:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Како нацртати шаблон за откључавање"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Превише нетачних покушаја!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Покушајте поново за <xliff:g id="NUMBER">%d</xliff:g> секунде(и)."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Откажи"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Следеће"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Обезбеђивање таблета"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Обезбеђивање телефона"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Заштитите таблет од неовлашћене употребе тако што ћете направити лични шаблон за откључавање екрана. На следећем екрану превлачите прстом да бисте повезали тачке било којим редоследом. Потребно је да повежете најмање четири тачке. "\n\n"Да ли сте спремни да почнете? Додирните Даље."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Заштитите телефон од неовлашћене употребе тако што ћете направити лични шаблон за откључавање екрана. На следећем екрану повежите прстом најмање четири тачке било којим редоследом. "\n\n"Спремни сте да почнете? Додирните Следеће."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Апликација није инсталирана на телефону."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Управљај апликацијама"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Управљање инсталираним апликацијама и њихово уклањање"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Апликације"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Дозволи инсталацију апликација из непознатих извора"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Таблет и лични подаци су подложнији нападу апликација из непознатих извора. Сагласни сте да сте само ви одговорни за сву штету на таблету или губитак података до којих може да дође услед коришћења ових апликација."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Телефон и лични подаци су подложнији нападу апликација из непознатих извора. Сагласни сте да сте само ви одговорни за сву штету на телефону или губитак података до којих може да дође услед коришћења ових апликација."</string>
+    <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="application_info_label" msgid="5736524913065714880">"Информације о апликацији"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Подаци о USB меморији"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD картица"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Деинсталирај"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Деинсталирај за све кориснике"</string>
+    <string name="install_text" msgid="884360662922471113">"Инсталирај"</string>
     <string name="disable_text" msgid="6544054052049395202">"Онемогући"</string>
     <string name="enable_text" msgid="9217362512327828987">"Омогући"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Обриши податке"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Прикажи кеширане процесе"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Ресетуј подешавања аплик."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Жел. да ресет. под. апл.?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Овим ћете ресетовати сва подешавања за:"\n\n" "<li>"Онемогућене апликације"</li>\n" "<li>"Обавештења о онемогућеним апликацијама"</li>\n" "<li>"Подразумеване апликације за радње"</li>\n" "<li>"Ограничења података у позадини за апликације"</li>\n\n" Нећете изгубити никакве податке о апликацијама."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Овим ћете ресетовати сва подешавања за:\n\n "<li>"Онемогућене апликације"</li>\n" "<li>"Обавештења о онемогућеним апликацијама"</li>\n" "<li>"Подразумеване апликације за радње"</li>\n" "<li>"Ограничења података у позадини за апликације"</li>\n\n" Нећете изгубити никакве податке о апликацијама."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Ресетуј апликације"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Управљај простором"</string>
     <string name="filter" msgid="2018011724373033887">"Филтрирај"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Избор опција филтера"</string>
     <string name="filter_apps_all" msgid="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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На SD картици"</string>
     <string name="disabled" msgid="9206776641295849915">"Онемогућено"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Није инсталирано"</string>
     <string name="no_applications" msgid="7336588977497084921">"Нема апликација."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Интерна меморија"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB меморија"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> и <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Ова апликација ће вам можда бити наплаћена:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Слање премијум SMS порука"</string>
     <string name="computing_size" msgid="1599186977475211186">"Израчунавање..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Није могуће израчунати величину пакета."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Нисте инсталирали ниједну апликацију независног произвођача."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Мењање жељене локације за инсталацију нових апликација"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Желите да онемогућите уграђену апл.?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Ако онемогућите уграђену апликацију, друге апликације ће се можда неочекивано понашати."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Желите ли да избришете податке и онемогућите апликацију?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Корисник: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Уклоњени корисник"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> процес и <xliff:g id="NUMSERVICES">%2$d</xliff:g> услуга"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> процес и <xliff:g id="NUMSERVICES">%2$d</xliff:g> услуге"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> процеса и <xliff:g id="NUMSERVICES">%2$d</xliff:g> услуга"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Подешавања физичке тастатуре"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Притисните тастер за размак двапут да бисте уметнули „.“"</string>
     <string name="show_password" msgid="3001113966880559611">"Учини лозинке видљивим"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></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>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Да бисте пребацили, притисните Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Подразумевано"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Распореди тастатуре"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Кориснички речник"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Лични речник"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Лични речници"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Лични речник"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Додај"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Додавање у речник"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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="bt_hci_snoop_log" msgid="3340699311158865670">"Омогући snoop евиденцију за Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Сними све Bluetooth HCI пакете у датотеци"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Избор времена извршавања"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Избор времена извршавања"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Желите ли да поново покренете уређај да бисте променили време извршавања из <xliff:g id="OLD">%1$s</xliff:g> у <xliff:g id="NEW">%2$s</xliff:g>?"</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>
+    <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>
-    <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_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="enable_terminal_title" msgid="95572094356054120">"Локални терминал"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Омогући аплик. терминала за приступ локалном командном окружењу"</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>
@@ -1234,29 +1345,43 @@
     <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_toggle_large_text_title" msgid="6618674985313017711">"Велики текст"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Дугме за напајање прекида позив"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Изговорите лозинке"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Одлагање притискa и задржавањa"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Побољшајте приступачност Веба"</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>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Искључено"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Када је ова функција укључена, функције приступачности можете брзо да омогућите у два корака:\n\n1. корак: Притисните и задржите дугме за напајање док не чујете звук или осетите вибрацију.\n\n2. корак: Додирните и задржите са два прста док не чујете звучну потврду.\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_toggle_speak_password_preference_title" msgid="5986628515113204844">"Изговарај лозинке"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Одлагање додира и задржавањa"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Подешавања"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Укључено"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Искључено"</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="accessibility_feature_state_on" msgid="2864292320042673806">"Укључено"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Искључено"</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="print_settings" msgid="4742428530112487843">"Штампање"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Подешавања штампања"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Услуге"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Желите ли да користите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> може да прима документе које штампате. Такви документи могу да садрже осетљиве податке."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Ниједна услуга није инсталирана"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Подешавања"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Додај штампаче"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Укључено"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Искључено"</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>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Подаци су примљени"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Подаци за мобилне уређ. су посл."</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Подаци за мобил. уређ. су примљ."</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Wi‑Fi подаци су послати"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Wi‑Fi подаци су примљени"</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>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <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="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>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ниво"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Утиче на тон изговореног текста"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Језик"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Језик није изабран"</string>
     <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>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Осветљење: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"аутоматскo"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"пуно"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"половично"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"искључено"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Складиште акредитива"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Инсталирање из меморије"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Прављење резервне копије и враћање"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Лични подаци"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Прављење резервних копија мојих података"</string>
-    <string name="backup_data_summary" msgid="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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Када поново инсталирате апликацију, вратите резервне копије подешавања и података"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Направи извештај о грешци"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Ово ће прикупити информације о тренутном стању уређаја и послати их у виду поруке е-поште. Од започињања извештаја о грешци до тренутка за његово слање проћи ће неко време; будите стрпљиви."</string>
-    <string name="report" msgid="302437572240018342">"Направи извештај"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Рез. копија лоз. рачунара"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Резервне копије читавог система тренутно нису заштићене"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Додирните да бисте променили или уклонили лозинку за прављење резервних копија читавог система на рачунару"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Осветли све површине прозора када се ажурирају"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Прикажи ажур. GPU приказа"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Осветли приказе у прозор. када се црта са GPU-ом"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Прикажи ажурирања хардверских слојева"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Хардверски слојеви трепере зелено када се ажурирају"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Отклони грешке GPU преклапања"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Прик. употребу процесора"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Постав. елемент са тренутном употребом процесора"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Принудни приказ пом. GPU"</string>
     <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>
+    <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>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Уништи сваку активност чим је корисник напусти"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <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" msgid="1466689968707308512">"Ова функција може да заустави апликацију која зависи од позадинских података када су доступне само мобилне мреже."\n\n"Адекватније контроле за коришћење података можете да пронађете у подешавањима доступним у оквиру апликације."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ова функција може да заустави апликацију која зависи од позадинских података када су доступне само мобилне мреже.\n\nАдекватније контроле за коришћење података можете да пронађете у подешавањима доступним у оквиру апликације."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="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>
@@ -1620,22 +1769,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" 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_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>
+    <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_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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Додавање VPN профила"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Измени профил"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Избриши профил"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Стално укључени VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Изаберите VPN профил са којим ћете увек бити повезани. Мрежни садржај ће бити дозвољен само када сте повезани са овим VPN-ом."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Ниједан"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Стално укључени VPN захтева IP адресу за сервер и DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Није успостављена мрежна веза. Покушајте поново касније."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Недостаје сертификат. Измените профил."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Систем"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Откажи"</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">"Додатна ажурирања система"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Корисници и ограничења"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Корисници"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Додај корисника"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Измена детаља"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Информације о кориснику"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Име"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Ограничења садржаја"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Захтева PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Оцена садржаја"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Системске апликације"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Инсталиране апликације"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Одбаци"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Уклони корисника"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Несташно дете"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Онемогућено"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Омогућено"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Спровођење"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Корисници"</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="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_confirm_remove_message" msgid="5284111415714437285">"Желите ли заиста да уклоните корисника и све повезане податке са уређаја?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Промена величине фонта"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Ограничења"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Уклони ограничења"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Промени PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Прикажи обавештења"</string>
     <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="user_restrictions_title" msgid="7745810037152772035">"Ограничења апликација и садржаја"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ПРЕИМЕНУЈ"</string>
+    <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Подеси ограничења за апликацију"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Контролише <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ова апликација није подржана на ограниченим профилима"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ова апликација може да приступа налозима"</string>
+    <string name="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 c6afcbf..802a30f 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,16 +218,127 @@
     <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="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"medieknappar"</item>
+    <item msgid="4547883971364273343">"ljudinställning"</item>
+    <item msgid="2603878814882344450">"mastervolym"</item>
+    <item msgid="7136963238377062018">"röstvolym"</item>
+    <item msgid="4270236897655923007">"ringvolym"</item>
+    <item msgid="6325739889222559394">"medievolym"</item>
+    <item msgid="5762123934816216821">"alarmvolym"</item>
+    <item msgid="785049718065337473">"meddelandevolym"</item>
+    <item msgid="6700305533746877052">"bluetooth-volym"</item>
+    <item msgid="2029227495214047094">"behåll aktiv"</item>
+    <item msgid="26109888160231211">"övervaka plats"</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>
+    <item msgid="5753789168376302997">"Medieknappar"</item>
+    <item msgid="3265262911688671938">"Ljudinställning"</item>
+    <item msgid="2098976479485046797">"Huvudvolym"</item>
+    <item msgid="5660213838861789350">"Röstvolym"</item>
+    <item msgid="7983336752371254444">"Ringvolym"</item>
+    <item msgid="7878027809189330917">"Medievolym"</item>
+    <item msgid="7260546305036218513">"Alarmvolym"</item>
+    <item msgid="9103719301075748925">"Meddelandevolym"</item>
+    <item msgid="7025966722295861512">"Bluetooth-volym"</item>
+    <item msgid="4665183401128289653">"Behåll aktiv"</item>
+    <item msgid="8584357129746649222">"Plats"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Mellan"</item>
     <item msgid="2372711992605524591">"Lång"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (felsökning)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Använd Dalvik"</item>
+    <item msgid="5131846588686178907">"Använd ART"</item>
+    <item msgid="4530003713865319928">"Använd felsökningsversionen av ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Kontrollera aldrig"</item>
     <item msgid="6042769699089883931">"Kontrollera bara DRM-innehåll"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Animering i skala 5x"</item>
     <item msgid="1069584980746680398">"Animering i skala 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Inga"</item>
+    <item msgid="688482401508173818">"720 x 480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280 x 720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920 x 1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280 x 720 tvdpi och 1920 x 1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Inga"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Av"</item>
+    <item msgid="7688197031296835369">"Visa områden som överskrider gränsen"</item>
+    <item msgid="8332661909019981149">"Visa antal som överskrider gränsen"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardgräns"</item>
     <item msgid="4071574792028999443">"Inga bakgrundsprocesser"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Tidsgräns"</item>
     <item msgid="7664124146786465092">"Misslyckades"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Fråga"</item>
+    <item msgid="5077768429488260031">"Tillåt aldrig"</item>
+    <item msgid="1417929597727989746">"Tillåt alltid"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 28b3373..4e2273c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Ja"</string>
     <string name="no" msgid="6731231425810196216">"Nej"</string>
     <string name="create" msgid="3578857613172647409">"Skapa"</string>
+    <string name="allow" msgid="3349662621170855910">"Tillåt"</string>
+    <string name="deny" msgid="6947806159746484865">"Neka"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Okänd"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Du är nu <xliff:g id="STEP_COUNT">%1$d</xliff:g> steg från att bli utvecklare."</item>
+    <item quantity="other" msgid="6722953419953594148">"Du är nu <xliff:g id="STEP_COUNT">%1$d</xliff:g> steg från att bli utvecklare."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Nu är du en utvecklare!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Det behövs inte. Du är redan utvecklare."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"TRÅDLÖST OCH NÄTVERK"</string>
     <string name="header_category_device" msgid="5781174212691167553">"UTRUSTNING"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PERSONLIGT"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Laddar"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Laddar ur"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(trådlös)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Laddar inte"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Laddar inte"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Fullt"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Urkopplad"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"trådlös"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Okänd"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Okänd"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Okänt fel"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Sval"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Synlighet"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Synlig för alla Bluetooth-enheter i närheten (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visas för alla närliggande Bluetooth-enheter"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Inte synlig för andra Bluetooth-enheter"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Bara synlig för kopplade enheter"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gör enheten synlig"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tidsgräns för synlighet"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Ange hur länge enheten ska vara synlig"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Röstuppringning med låsskärm"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Förhindra att bluetooth-uppringningsfunktionen används när skärmen är låst"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth-enheter"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Visa mottagna filer"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth-enhetsväljare"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Begäran om Bluetooth-behörighet"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"En app vill aktivera Bluetooth. Vill du tillåta detta?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"En app på pekdatorn vill göra pekdatorn synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta detta?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"En app på mobilen vill göra mobilen synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta detta?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"En app på pekdatorn vill att pekdatorn alltid ska vara synlig för andra Bluetooth-enheter. Vill du tillåta detta?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"En app på mobilen vill att mobilen alltid ska vara synlig för andra Bluetooth-enheter. Vill du tillåta detta?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"En app på pekdatorn vill aktivera Bluetooth och göra pekdatorn synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta detta?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"En app på mobilen vill aktivera Bluetooth så att mobilen blir synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder. Vill du tillåta detta?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"En app på pekdatorn vill aktivera Bluetooth och göra pekdatorn synlig för andra enheter. Vill du tillåta detta?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"En app på mobilen vill aktivera Bluetooth så att mobilen blir synlig för andra enheter. Vill du tillåta detta?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"En app vill aktivera Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"En app vill göra din surfplatta synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"En app vill göra din mobil synlig för andra Bluetooth-enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"En app vill göra din surfplatta synlig för andra Bluetooth-enheter. Du kan ändra detta senare i inställningarna för Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"En app vill göra din mobil synlig för andra Bluetooth-enheter. Du kan ändra detta senare i inställningarna för Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"En app vill aktivera Bluetooth och göra din surfplatta synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"En app vill aktivera Bluetooth och göra din mobil synlig för andra enheter i <xliff:g id="TIMEOUT">%1$d</xliff:g> sekunder."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"En app vill aktivera Bluetooth och göra din surfplatta synlig för andra enheter. Du kan ändra detta senare i inställningarna för Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"En app vill aktivera Bluetooth och göra din mobil synlig för andra enheter. Du kan ändra detta senare i inställningarna för Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth aktiveras"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Vill du stänga av Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatisk anslutning"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-proxyn används av webbläsaren men får inte användas av de andra apparna."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Plats:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Närliggande CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Cellinfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataförsök:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-tjänst:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -248,7 +256,7 @@
     <string name="device_info_label" msgid="6551553813651711205">"Enhetsinfo"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Batteriinformation"</string>
     <string name="display_label" msgid="8074070940506840792">"Skärm"</string>
-    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Information om pekdatorn"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Information om surfplattan"</string>
     <string name="phone_info_label" product="default" msgid="2127552523124277664">"Telefoninformation"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB-lagring"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-kort"</string>
@@ -260,14 +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_reenable_title" msgid="6068100976707316772">"Vill du tillåta roaming?"</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\nDen 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\nDen här inställningen påverkar samtliga användare."</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>
@@ -297,36 +307,40 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Ägaruppgifter"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ställ in Min plats, skärmupplåsning, lås för uppgiftslagring"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Lösenord"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kryptera pekdatorn"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kryptera surfplattan"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Kryptera telefonen"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Ange PIN-kod eller lösenord för att dekryptera pekdatorn varje gång du slår på den"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Ange PIN-kod eller lösenord för att dekryptera surfplattan varje gång du slår på den"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Ange PIN-kod eller lösenord för att dekryptera telefonen varje gång du slår på den"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krypterad"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Du kan kryptera dina konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du krypterar pekdatorn måste du ange en numerisk PIN-kod eller ett lösenord och dekryptera enheten varje gång du startar den. Det går endast att ta bort krypteringen genom att återställa standardinställningarna, vilket raderar alla dina data."\n\n"Krypteringen tar en timme eller mer. Ladda batteriet helt innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter den pågående krypteringen kommer du att förlora delar av eller alla dina data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Du kan kryptera dina konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du krypterar mobilen måste du ange en numerisk PIN-kod eller ett lösenord och dekryptera enheten varje gång du startar den. Det går endast att ta bort krypteringen genom att återställa standardinställningarna, vilket raderar alla dina data."\n\n"Krypteringen tar en timme eller mer. Ladda batteriet helt innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter den pågående krypteringen kommer du att förlora delar av eller alla dina data."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Kryptera pekdatorn"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Du kan kryptera dina konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du krypterar surfplattan måste du ange en numerisk PIN-kod eller ett lösenord och dekryptera enheten varje gång du startar den. Det går endast att ta bort krypteringen genom att återställa standardinställningarna, vilket raderar alla dina data.\n\nKrypteringen tar en timme eller mer. Ladda batteriet helt innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter den pågående krypteringen kommer du att förlora delar av eller alla dina data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Du kan kryptera dina konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du krypterar mobilen måste du ange en numerisk PIN-kod eller ett lösenord och dekryptera enheten varje gång du startar den. Det går endast att ta bort krypteringen genom att återställa standardinställningarna, vilket raderar alla dina data.\n\nKrypteringen tar en timme eller mer. Ladda batteriet helt innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter den pågående krypteringen kommer du att förlora delar av eller alla dina data."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Kryptera surfplattan"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Kryptera telefonen"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Ladda batteriet och försök igen."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Anslut laddaren och försök igen."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"PIN-kod eller lösenord saknas för skärmlåset"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Du måste ange en PIN-kod eller ett lösenord för skärmlåset innan du påbörjar krypteringen."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Vill du kryptera?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Krypteringen kan inte ångras och om du avbryter den kan data försvinna. Det kan ta en timme eller mer och under tiden startas pekdatorn om flera gånger."</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Krypteringen kan inte ångras och om du avbryter den kan data försvinna. Det kan ta en timme eller mer och under tiden startas surfplattan om flera gånger."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Krypteringen kan inte ångras och om du avbryter den kan data försvinna. Det kan ta en timme eller mer och under tiden startas mobilen om flera gånger."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Krypterar"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Vänta medan pekdatorn krypteras. <xliff:g id="PERCENT">^1</xliff:g> % klart."</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Vänta medan surfplattan krypteras. <xliff:g id="PERCENT">^1</xliff:g> % klart."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Vänta medan mobilen krypteras. <xliff:g id="PERCENT">^1</xliff:g> % klart."</string>
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Försök igen om <xliff:g id="DELAY">^1</xliff:g> sekunder."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Ange ditt lösenord"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Krypteringen misslyckades"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krypteringen avbröts och kan inte slutföras. Data på pekdatorn är därför inte tillgängliga längre."\n\n" Om du vill fortsätta använda pekdatorn måste du återställa standardinställningarna. När du konfigurerar pekdatorn efter återställningen kan du välja att återställa alla data som du har säkerhetskopierat i ditt Google-konto."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krypteringen avbröts och kan inte slutföras. Data på mobilen är därför inte tillgängliga längre."\n\n"Om du vill fortsätta använda mobilen måste du återställa standardinställningarna. När du konfigurerar enheten efter återställningen kan du välja att återställa alla data som du har säkerhetskopierat i ditt Google-konto."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krypteringen avbröts och kan inte slutföras. Data på surfplattan är därför inte tillgängliga längre.\n\n Om du vill fortsätta använda surfplattan måste du återställa standardinställningarna. När du konfigurerar surfplattan efter återställningen kan du välja att återställa alla data som du har säkerhetskopierat i ditt Google-konto."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krypteringen avbröts och kan inte slutföras. Data på mobilen är därför inte tillgängliga längre.\n\nOm du vill fortsätta använda mobilen måste du återställa standardinställningarna. När du konfigurerar enheten efter återställningen kan du välja att återställa alla data som du har säkerhetskopierat i ditt Google-konto."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Växla inmatningsmetod"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Välj skärmlås"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Välj lås för säkerhetskopiering"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Ändra PIN-kod för upplåsning"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ändra lösenord för upplåsning"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Lösenordet måste innehålla minst %d tecken"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koden måste innehålla minst %d tecken"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-koden måste innehålla minst %d siffror"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Tryck på Fortsätt när du är färdig"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsätt"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Lösenordet får inte innehålla mer än  <xliff:g id="NUMBER">%d</xliff:g> tecken."</string>
@@ -406,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>
@@ -480,64 +503,98 @@
     <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">"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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Parkopplade enheter visas"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Tillgängliga enheter"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Ansluter"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Anslutna"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Tillgängliga"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Används"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Skärminställningar"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Vill du koppla från?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Detta avslutar din anslutning till:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Visningsalternativ för trådlösa skärmar"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Glöm"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Klar"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Namn"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"På"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Av"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Inaktiverat"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tillåt datautbyte när pekdatorn vidrör en annan enhet"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Tillåt datautbyte när surfplattan vidrör en annan enhet"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Tillåt datautbyte när mobilen vidrör en annan enhet"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Redo att överföra appinnehåll via NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Av"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Inte tillgängligt eftersom NFC är inaktiverat"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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\nHå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="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="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="8116564886303972764">"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_in_progress" msgid="2944576520214787628">"WPS pågår redan och kan ta upp till två minuter att slutföra"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Säkerhetsinställningen för den trådlösa routern (TKIP) stöds inte"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentiseringsfel. Försök igen."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"En annan WPS-session upptäcktes. Försök igen om några minuter."</string>
     <string name="wifi_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>
@@ -558,12 +615,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\nVill 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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Spara"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Det gick inte att spara närverket"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Avbryt"</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_skip_anyway" msgid="6965361454438011190">"Hoppa över ändå"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"Hoppa inte över"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"VARNING! Eventuella operatörsavgifter för datatrafik kan tillkomma.\n\nKonfigurationen 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\nKonfigurationen kan kräva betydande nätverksaktivitet."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Söker …"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Byt namn på enheten"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Anslutna enheter"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Sparade grupper"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Det gick inte att ansluta."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Det gick inte att byta namn på enheten."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Vill du koppla från?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Om du kopplar från avbryts din anslutning till <xliff:g id="PEER_NAME">%1$s</xliff:g> och <xliff:g id="PEER_COUNT">%2$s</xliff:g> andra enheter."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Mobil Wi-Fi-surfpunkt"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vill du glömma den här gruppen?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Mobil Wi-Fi-surfzon"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Musikeffekter"</string>
     <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="312032901303146002">"Standardmeddelande"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulserande ljusavisering"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Standardljud för meddelanden"</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="9052854168612951170">"Välj ringsignal för meddelande"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Standardljud för meddelanden"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Media"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Ställ in volym för musik och video"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
@@ -645,25 +717,25 @@
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Ljud"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Inställningar för ansluten skrivbordsdocka"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Inställningar för dockningsstation för bil"</string>
-    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Pekdatorn är inte dockad"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Surfplattan är inte dockad"</string>
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefonen är inte dockad"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Inställningar för ansluten dockningsenhet"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Ingen dockningsenhet hittades"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Du måste docka pekdatorn innan du konfigurerar ljudet för dockning."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Du måste docka surfplattan innan du konfigurerar ljudet för dockning."</string>
     <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Du måste docka mobilen innan du konfigurerar ljudet för dockning."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Ljud för placering i docka"</string>
-    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Spela upp ljud när pekdatorn placeras i eller tas bort från dockningsstation"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Spela upp ljud när surfplattan placeras i eller tas bort från dockningsstation"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Spela upp ljud när telefonen placeras i eller tas bort från dockningsstation"</string>
-    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Spela inte upp ljud när pekdatorn placeras i eller tas bort från dockningsstation"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Spela inte upp ljud när surfplattan placeras i eller tas bort från dockningsstation"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Spela inte upp ljud när telefonen placeras i eller tas bort från dockningsstation"</string>
     <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 pekdatorn"</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>
-    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Växla riktning automatiskt när du roterar pekdatorn"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Växla riktning automatiskt när du roterar surfplattan"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Byt riktning automatiskt när du roterar telefonen"</string>
     <string name="brightness" msgid="2354961343555249270">"Ljusstyrka"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Ändra skärmens ljusstyrka"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Bakgrund"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Välj bakgrund från"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Alternativ för skärmsläckare"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Skärmsläckaren aktiveras när enheten sätts i viloläge om den är ansluten till en strömkälla"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Inaktiverad"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Valt alternativ"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Tidsgräns för skärmsläckare"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Aldrig"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Testa!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Starta även när enheten är dockad"</string>
+    <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">"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">"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>
     <string name="title_font_size" msgid="4405544325522105222">"Teckenstorlek"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Teckenstorlek"</string>
@@ -687,9 +760,9 @@
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ställ in lås för SIM-kort"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Lås för SIM-kort"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Lås SIM-kort"</string>
-    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"PIN-kod krävs för att använda pekdatorn"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"PIN-kod krävs för att använda surfplattan"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"PIN-kod krävs för att använda telefonen"</string>
-    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"PIN-kod krävs för att använda pekdatorn"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"PIN-kod krävs för att använda surfplattan"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"PIN-kod krävs för att använda telefonen"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Byt PIN-kod"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN-kod för SIM-kort"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN-kod för SIM-kort"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Fel PIN-kod"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN-koderna matchar inte"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Det går inte att ändra PIN-koden."\n" Du kan ha angett fel PIN-kod."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Det går inte att ändra PIN-koden.\n Du kan ha angett fel PIN-kod."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-kortets PIN-kod har ändrats"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Det gick inte att ändra SIM-kortets låsstatus."\n"Du kan ha angett fel PIN-kod."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Det gick inte att ändra SIM-kortets låsstatus.\nDu kan ha angett fel PIN-kod."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Avbryt"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Pekdatorns status"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Basbandsversion"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernel-version"</string>
     <string name="build_number" msgid="3075795840572241758">"Version"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Inte tillgänglig"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
     <string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -733,12 +807,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">"Mobil nätverkstyp"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Operatörsinfo"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Status för mobilt nätverk"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Tjänststatus"</string>
     <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>
@@ -748,14 +823,16 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB-lagring"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD-kort"</string>
     <string name="memory_available" msgid="5052397223077021181">"Tillgängligt"</string>
+    <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>
     <string name="memory_music_usage" msgid="1363785144783011606">"Ljud (musik, ringsignaler, poddsändningar m.m.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Misc."</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Cachelagrade data"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Montera bort enhet"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Montera bort SD-kort"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Demontera intern USB-lagring"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Radera SD-kort"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Raderar alla data på den interna USB-lagringsenheten, som musik och foton"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Alla data tas bort från på SD-kortet, bland annat musik och foton"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Skrivskyddad)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Vill du ta bort cachelagrade data?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Cachelagrade data tas bort i alla appar."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP- eller PTP-funktionen är aktiv"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Ta bort USB-enheten?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Vill du ta bort SD-kortet?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Om du tar bort USB-lagringsenheten avbryts några av de appar som körs och de kanske inte blir tillgängliga igen förrän du sätter tillbaka USB-enheten."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Gör att du kan överföra foton med kameraprogrammet och överföra filer på datorer som inte har stöd för MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installera filöverföringsverktyg"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Andra användare"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batterinivå"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN:er"</string>
@@ -822,6 +902,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>
@@ -835,11 +917,11 @@
     <string name="menu_restore" msgid="8260067415075573273">"Återställ standardinst."</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Återställning av standardinställningar för APN har slutförts."</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Återställ standardinst."</string>
-    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Raderar alla data på pekdatorn"</string>
+    <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Raderar alla data på surfplattan"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Raderar alla data på telefonen"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Detta raderar alla data från pekdatorns "<b>"interna lagringsutrymme"</b>", bland annat:"\n\n<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"hämtade appar"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Detta raderar alla data från pekdatorns "<b>"interna lagringsutrymme"</b>", bland annat:"\n\n<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"hämtade appar"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du är inloggad på följande konton:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Detta raderar alla data från pekdatorns "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"hämtade appar"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Detta raderar alla data från pekdatorns "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"hämtade appar"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du är inloggad på följande konton:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Foton"</li>\n<li>"Andra användardata"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Om du vill ta bort musik, bilder och andra användardata måste du radera "<b>"USB-lagringsenheten"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Om du vill ta bort musik, bilder och andra användardata måste du radera "<b>"SD-kortet"</b>"."</string>
@@ -847,7 +929,7 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Radera SD-kort"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Radera alla data på den interna USB-lagringsenheten, som musik och foton."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Radera alla data på SD-kortet, som musik och foton."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Återställ pekdatorn"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Återställ surfplattan"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Återställ telefonen"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"Vill du radera all personlig information och alla hämtade appar? Åtgärden kan inte ångras."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Radera allt"</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas från."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjälp"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobila nätverk"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Hantera mobilplan"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Okänd SIM-operatör"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s har ingen känd administrationswebbplats"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"För in SIM-kortet och starta om"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Anslut till internet"</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>
@@ -912,11 +999,12 @@
     <string name="location_access_title" msgid="7064108942964081243">"Åtkomst till min plats"</string>
     <string name="location_access_summary" msgid="69031404093194341">"Ge appar som har bett om tillstånd möjlighet att använda din platsinformation"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Platskällor"</string>
-    <string name="about_settings" product="tablet" msgid="593457295516533765">"Om pekdatorn"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"Om surfplattan"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Om telefonen"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Visa juridisk information, status, programversion"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridisk information"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Medarbetare"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Föreskrifter"</string>
     <string name="copyright_title" msgid="865906688917260647">"Upphovsrätt"</string>
     <string name="license_title" msgid="1990487604356037871">"Licens"</string>
     <string name="terms_title" msgid="7697580845616764642">"Användarvillkor"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Ändra PIN-kod för upplåsning"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Bekräfta sparat grafiskt lösenord"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Försök igen:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Rita ett grafiskt lösenord"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Rita ett grafiskt lösenord:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Tryck på Menu om du vill ha hjälp."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Lyft fingret när du är klar."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Anslut minst <xliff:g id="NUMBER">%d</xliff:g> punkter. Försök igen:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Så här ritar du ett grafiskt lösenord"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"För många felaktiga försök!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Försök igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Avbryt"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Nästa"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Skydda din surfplatta"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Skydda din telefon"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Skydda pekdatorn från obehörig användning genom att skapa ett personligt grafiskt lösenord. Anslut punkterna med fingret i valfri ordning på nästa sida. Du måste ansluta minst fyra punkter."\n\n"Tryck på Nästa när du är redo att sätta igång."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Skydda mobilen från obehörig användning genom att skapa ett personligt grafiskt lösenord på skärmen. Anslut minst fyra punkter i valfri ordning med fingret på nästa skärm."\n\n"Tryck på Nästa när du är redo att sätta igång."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Appen är inte installerad på mobilen."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Hantera appar"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Hantera och ta bort installerade appar"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Appar"</string>
@@ -979,8 +1062,10 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Appinställningar"</string>
     <string name="install_applications" msgid="4872012136210802181">"Okända källor"</string>
     <string name="install_unknown_applications" msgid="176855644862942064">"Tillåt installation av appar från okända källor"</string>
-    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Pekdatorn och dina personliga data är mer sårbara för angrepp av appar från okända källor. Du godkänner att du ensam är ansvarig för eventuella skador på pekdatorn eller förlust av data som kan uppstå när du använder dessa appar."</string>
+    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Surfplattan och dina personliga data är mer sårbara för angrepp av appar från okända källor. Du godkänner att du ensam är ansvarig för eventuella skador på surfplattan eller förlust av data som kan uppstå när du använder dessa appar."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Mobilen och dina personuppgifter är sårbara för angrepp av appar från okända källor. Du godkänner att du ensam är ansvarig för eventuella skador på mobilen eller förlust av data som orsakats av att du använt dessa appar."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Verifiera appar"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Tillåt inte installation av appar som kan orsaka skada eller varna innan"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Avancerade inställningar"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktivera fler inställningsalternativ"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Info om appen"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Data på USB-lagringsenhet"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kort"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Avinstallera"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Avinstallera för alla användare"</string>
+    <string name="install_text" msgid="884360662922471113">"Installera"</string>
     <string name="disable_text" msgid="6544054052049395202">"Inaktivera"</string>
     <string name="enable_text" msgid="9217362512327828987">"Aktivera"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Rensa data"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Visa cachade processer"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Återställ inställningarna"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vill du återställa?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Detta återställer alla inställningar för:"\n\n" "<li>"inaktiverade appar"</li>\n" "<li>"meddelanden om inaktiverade appar"</li>\n" "<li>"standardappar för olika åtgärder"</li>\n" "<li>"begränsningar för bakgrundsdata i appar."</li>\n\n" Inga appdata går förlorade."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Detta återställer alla inställningar för:\n\n "<li>"inaktiverade appar"</li>\n" "<li>"meddelanden om inaktiverade appar"</li>\n" "<li>"standardappar för olika åtgärder"</li>\n" "<li>"begränsningar för bakgrundsdata i appar."</li>\n\n" Inga appdata går förlorade."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Återställ appar"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Hantera utrymme"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På SD-kort"</string>
     <string name="disabled" msgid="9206776641295849915">"Inaktiverat"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Inte installerade"</string>
     <string name="no_applications" msgid="7336588977497084921">"Inga appar."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Intern lagring"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-lagring"</string>
@@ -1046,7 +1135,7 @@
     <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Alla uppdateringar för Android-systemappen kommer att avinstalleras."</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Ta bort data"</string>
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Det gick inte att ta bort data för appen."</string>
-    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Appen har åtkomst till följande på pekdatorn:"</string>
+    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Appen har åtkomst till följande på surfplattan:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Appen har åtkomst till följande på mobilen:"</string>
     <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Den här appen har åtkomst till följande på din surfplatta. I syfte att förbättra prestandan och minska minnesanvändningen är några av dessa behörigheter tillgängliga för <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, eftersom den körs i samma process som <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> :"</string>
     <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Den här appen har åtkomst till följande på din mobil. I syfte att förbättra prestandan och minska minnesanvändningen är några av dessa behörigheter tillgängliga för <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, eftersom den körs i samma process som <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> och <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Du kan behöva betala för den här appen:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Vill du skicka premium-SMS?"</string>
     <string name="computing_size" msgid="1599186977475211186">"Beräknar…"</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Det gick inte att beräkna paketstorleken."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Du har inte installerat några appar från tredje part."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Ändra önskad installationsplats för nya appar."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Inaktivera den inbyggda appen?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Om du inaktiverar en inbyggd app kanske andra appar inte fungerar som de ska."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Vill du radera uppgifterna och inaktivera appen?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Användare: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Borttagen användare"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process och <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjänst"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> process och <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjänster"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processer och <xliff:g id="NUMSERVICES">%2$d</xliff:g> tjänst"</string>
@@ -1112,7 +1210,7 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Tjänsten <xliff:g id="COMP_NAME">%1$s</xliff:g> används."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Leverantören <xliff:g id="COMP_NAME">%1$s</xliff:g> används."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Avsluta systemtjänst?"</string>
-    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Om du avslutar tjänsten kanske vissa funktioner i pekdatorn inte fungerar korrekt förrän du stänger av och slår på den igen."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Om du avslutar tjänsten kanske vissa funktioner i surfplattan inte fungerar korrekt förrän du stänger av och slår på den igen."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Om du avslutar tjänsten kanske vissa funktioner i mobilen inte fungerar korrekt förrän du stänger av och slår på den igen."</string>
     <string name="language_settings" msgid="5292716747264442359">"Språk och inmatning"</string>
     <string name="language_keyboard_settings_title" msgid="243220021717425813">"Språk och inmatning"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Inställningar för fysiskt tangentbord"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Tryck på blanksteg två gånger om du vill infoga \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Gör lösenord synliga"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Den här inmatningsmetoden kan samla all text som du skriver, inklusive personliga uppgifter som lösenord och kreditkortsnummer. Den kommer från appen <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Vill du använda inmatningsmetoden?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Stavningskontrollen kan samla in all text du skriver, inklusive personliga uppgifter som lösenord och kreditkortsuppgifter. Den kommer från appen <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Vill du använda stavningskontrollen?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Inställningar"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Växla genom att trycka på Ctrl-Mellanslag"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standard"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tangentbordslayouter"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Användarens ordlista"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Egen ordlista"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Egna ordlistor"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Egen ordlista"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Lägg till"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Lägg till i ordlista"</string>
@@ -1157,6 +1252,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>
@@ -1164,7 +1261,7 @@
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"För alla språk"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Fler språk ..."</string>
     <string name="testing" msgid="6584352735303604146">"Testa"</string>
-    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Information om pekdatorn"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Information om surfplattan"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Telefoninformation"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Batteriinformation"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Snabbstart"</string>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skärmen vilar aldrig när laddning pågår"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktivera HCI snoop-logg för Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Samla alla HCI-paket för Bluetooth i en fil"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Välj körningstid"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Välj körningstid"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Vill du starta om och ändra körningstiden från <xliff:g id="OLD">%1$s</xliff:g> till <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Tillåt skenplatser"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillåt skenplatser"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Kontrollera om appar som installeras via ADB/ADT kan vara skadliga."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Skydda USB-lagringsenheten"</string>
-    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apparmåste få tillstånd för att kunna läsa USB-enheten"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Appar måste få tillstånd för att kunna läsa USB-enheten"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vill du skydda USB-enheten?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"När USB-lagringsenheten är skyddad måste apparna begära tillstånd för att kunna läsa data som lagras externt."\n\n"En del appar måste eventuellt uppdateras av utvecklaren för att fungera."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"När USB-lagringsenheten är skyddad måste apparna begära tillstånd för att kunna läsa data som lagras externt.\n\nEn del appar måste eventuellt uppdateras av utvecklaren för att fungera."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Skydda SD-kortet"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Appar måste få tillstånd för att kunna läsa SD-kortet"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vill du skydda SD-kortet?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"När SD-kortet är skyddat måste apparna begära tillstånd för att kunna läsa data som lagras externt."\n\n"En del appar måste eventuellt uppdateras av utvecklaren för att fungera."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"När SD-kortet är skyddat måste apparna begära tillstånd för att kunna läsa data som lagras externt.\n\nEn del appar måste eventuellt uppdateras av utvecklaren för att fungera."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokal terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktivera en terminalapp som ger åtkomst till hyllor lokalt"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Välj gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Välj widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Skapa widget och tillåta åtkomst?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Tillgänglighetsinställningar"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Tjänster"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Stor text"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Använd knapp för att avsluta samtal"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Läs upp lösenord"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Fördröjning för håll ned"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Gör webben mer tillgänglig"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Förstoringsrörelser"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"När den här funktionen är aktiverad kan du zooma in och ut genom att trycka tre gånger på skärmen.\n\nNär du har zoomat in kan du göra följande saker:\n"<ul><li>"Panorera: Dra minst två fingrar över skärmen."</li>\n<li>"Justera zoomen: Nyp eller dra isär med minst två fingrar."</li></ul>\n\n"Du kan också förstora något tillfälligt genom att trycka tre gånger på det och hålla kvar. I det förstorade läget kan du utforska olika delar av skärmen genom att dra med fingret. Återgå till föregående läge genom att släppa fingret.\n\nObs! Det går att förstora genom att trycka tre gånger överallt utom på tangentbordet och navigeringsfältet."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Aktivera tillgänglighet snabbt"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"På"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Av"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"När den här funktionen är aktiverad kan du snabbt aktivera tillgänglighetsfunktioner i två steg:\n\nSteg 1: Tryck länge på strömbrytaren tills du hör ett ljud eller känner en vibration.\n\nSteg 2: Tryck länge med två fingrar tills en bekräftelse läses upp.\n\nOm genvägen på den låsta skärmen används och flera personer använder enheten, aktiveras tillgänglighetsalternativen tillfälligt tills enheten låses upp."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Stor text"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Skärmförstoring"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Uppdatera skärmförstoring automatiskt"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Uppdatera skärmförstoring på appövergångar"</string>
+    <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_menu_item_settings" msgid="3344942964710773365">"Inställningar"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"På"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"På"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Av"</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="print_settings" msgid="4742428530112487843">"Skriver ut"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Utskriftsinställningar"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Tjänster"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vill du använda <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> kan ta emot dokument som du skriver ut. Sådana dokument kan innehålla känsliga uppgifter."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Inga tjänster är installerade"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Inställningar"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Lägg till skrivare"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"På"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Av"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Appar som har förbrukat batteriet"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Batteriinfo ej tillgänglig."</string>
@@ -1268,14 +1393,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>
@@ -1283,40 +1408,42 @@
     <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>
-    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Pekdatorn är inaktiv"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Surfplattan är inaktiv"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen är inaktiv"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU totalt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU i förgrunden"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Behåll aktiv"</string>
     <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_data_send" msgid="3875198715268918671">"Mobildata har skickats"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobildata har mottagits"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Data via Wi-Fi har skickats"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Data via Wi-Fi har mottagits"</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 pekdatorn är inaktiv"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Batteri som förbrukas när surfplattan är inaktiv"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Batteri som förbrukas när telefonen är inaktiv"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Batteri som förbrukats av radion"</string>
     <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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Avsluta eller avinstallera appen"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Kontrollera GPS manuellt så att appen inte kan använda funktionen"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Appen erbjuder eventuellt inställningar som minskar batteriförbrukningen"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Batteri som förbrukats av användaren"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sedan bortkoppling"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Sedan senaste bortkoppling <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Total förbrukning"</string>
@@ -1339,7 +1467,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>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ton"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Påverkar den talade textens ton"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Språk"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Inget språk valt"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ange språkspecifik röst för den talade texten"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Lyssna på ett exempel"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Spela upp en kort demonstration av talsyntes"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Ljusstyrka <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatiskt"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"max"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"halvt"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"av"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Uppgiftslagring"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installera från lagringsenhet"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"När du installerar om en app återställs säkerhetskopierade inställningar och data"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Skapa felrapport"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Nu hämtas information om aktuell status för enheten, som sedan skickas i ett e-postmeddelade. Det tar en liten stund innan felrapporten är färdig och kan skickas, så vi ber dig ha tålamod."</string>
-    <string name="report" msgid="302437572240018342">"Rapportera"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Lösenord för säkerhetskopia av datorn"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"De fullständiga säkerhetskopiorna av datorn är för närvarande inte skyddade"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Tryck om du vill ändra eller ta bort lösenordet för fullständig säkerhetskopiering av datorn"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nTryck 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>
@@ -1506,10 +1650,10 @@
     <string name="header_add_an_account" msgid="756108499532023798">"Lägg till ett konto"</string>
     <string name="finish_button_label" msgid="481587707657751116">"Avsluta"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"Vill du ta bort kontot?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Om du tar bort kontot tar du också bort alla meddelanden, kontakter och andra data från pekdatorn!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Om du tar bort kontot tar du också bort alla meddelanden, kontakter och andra data från surfplattan!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Om du tar bort kontot tar du också bort alla meddelanden, kontakter och andra data från mobilen!"</string>
-    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Det här kontot krävs för vissa appar. Du kan bara ta bort det genom att återställa pekdatorn till fabriksinställningarna (alla dina personliga data tas bort) i Inställningar &gt; Säkerhetskopiera och återställ."</string>
-    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Det här kontot krävs för vissa appar. Du kan bara ta bort det genom att återställa pekdatorn till fabriksinställningarna (alla dina personliga data tas bort) i Inställningar &gt; Säkerhetskopiera och återställ."</string>
+    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Det här kontot krävs för vissa appar. Du kan bara ta bort det genom att återställa surfplattan till fabriksinställningarna (alla dina personliga data tas bort) i Inställningar &gt; Säkerhetskopiera och återställ."</string>
+    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Det här kontot krävs för vissa appar. Du kan bara ta bort det genom att återställa surfplattan till fabriksinställningarna (alla dina personliga data tas bort) i Inställningar &gt; Säkerhetskopiera och återställ."</string>
     <string name="provider_label" msgid="7724593781904508866">"Push-prenumerationer"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Hela fönstret blinkar vid uppdatering"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Visa GPU-visningsuppdateringar"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Visningar blinkar i fönster vid GPU-ritningar"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Visa maskinvaruskiktuppd."</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Låt maskinvaruskikt blinka grönt vid uppdateringar"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Felsök överskriden GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Visa CPU-användning"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Överlägg på skärmen med aktuell CPU-användning"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Framtvinga GPU-rendering"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simulera sekundär skärm"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Appar"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Behåll inte aktiviteter"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Förstör aktiviteter så fort användaren lämnar dem"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Inaktivera bakgrundsdata i mobildatanät. Fasta nätverksuppkopplingar används om sådana finns."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Om du vill begränsa bakgrundsdata för appen måste du först ange en gräns för mobildata."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Vill du begränsa bakgrundsdata?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Den här funktionen kan medföra att en app som använder bakgrundsdata slutar fungera när endast mobila nätverk är tillgängliga."\n\n"Du kan hitta fler alternativ för dataanvändning i inställningarna i appen."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Den här funktionen kan medföra att en app som använder bakgrundsdata slutar fungera när endast mobila nätverk är tillgängliga.\n\nDu kan hitta fler alternativ för dataanvändning i inställningarna i appen."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Det går bara att begränsa bakgrundsdata när du har angett en gräns för mobildata."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Aktivera automatisk datasynk.?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Alla kontoändringar som görs på webben kopieras automatiskt till pekdatorn."\n\n"För vissa konton kopieras även alla ändringar som görs på pekdatorn automatiskt till webben. Google-konton fungerar på det sättet."\n\n"Du kan ange vilken typ av information som ska synkroniseras för varje konto under Inställningar &gt; Konton."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Alla kontoändringar som görs på webben kopieras automatiskt till mobilen."\n\n"För vissa konton kopieras även alla ändringar som görs på mobilen automatiskt till webben. Google-konton fungerar på det sättet."\n\n"Du kan ställa in vilken typ av information som ska synkroniseras för varje konto under Inställningar &gt; Konton."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Alla kontoändringar som görs på webben kopieras automatiskt till surfplattan.\n\nFör vissa konton kopieras även alla ändringar som görs på surfplattan automatiskt till webben. Google-konton fungerar på det sättet.\n\nDu kan ange vilken typ av information som ska synkroniseras för varje konto under Inställningar &gt; Konton."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Alla kontoändringar som görs på webben kopieras automatiskt till mobilen.\n\nFör vissa konton kopieras även alla ändringar som görs på mobilen automatiskt till webben. Google-konton fungerar på det sättet.\n\nDu kan ställa in vilken typ av information som ska synkroniseras för varje konto under Inställningar &gt; Konton."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Inaktivera automatisk datasynk.?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Detta minskar dataanvändningen och sparar batteri, men varje konto måste synkroniseras manuellt varje gång du vill samla in aktuell information. Du får inte heller några meddelanden om uppdateringar."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Återställningsdag för användningscykel"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Ange varning för dataanvändning"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Ange gräns för dataanvändning"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Begränsa dataanvändningen"</string>
-    <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 pekdatorn, 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_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" 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\nDen 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\nDen 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Borttagna appar och användare"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> mottagna, <xliff:g id="SENT">%2$s</xliff:g> skickade"</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> har använts."</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> 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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Lägg till VPN-profil"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Redigera profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Ta bort profil"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Always-on VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Välj en VPN-profil som du alltid vill vara ansluten till. Nätverkstrafik tillåts bara när du är ansluten till detta VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Inga"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Funktionen Always-on VPN kräver en IP-adress för både server och DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Det finns ingen nätverksanslutning. Försök igen senare."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Det saknas ett certifikat. Redigera profilen."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Avbryt"</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">"Ytterligare systemuppdateringar"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Användare &amp; begränsningar"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Användare"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Lägg till användare"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Redigera informationen"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Användarinformation"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Namn"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Innehållsbegränsningar"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Kräver PIN-kod"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Innehållsklassificering"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Systemappar"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Installerade appar"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Stäng"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Ta bort användare"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Busunge"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Inaktiverad"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Tillåtande"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Genomdrivande"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Användare"</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="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\nNär du skapar en ny användare måste han eller hon genomgå en konfigureringsprocess.\n\nAlla 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\nAlla 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_confirm_remove_message" msgid="5284111415714437285">"Är du säker på att du vill ta bort användaren och alla användarens data från enheten?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Ändra teckenstorlek"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Begränsningar"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Ta bort begränsningar"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Ändra PIN-koden"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Visa meddelanden"</string>
     <string name="help_label" msgid="1107174367904110532">"Hjälp"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Konto för innehåll"</string>
+    <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="6160672982086584261">"Konfigurera appbegränsningar"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Styrs av <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Den här appen stöds inte i begränsade profiler"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Den här appen har åtkomst till dina konton"</string>
+    <string name="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 04623b3..5525a54 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -31,7 +31,7 @@
   </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"Sekunde 15"</item>
-    <item msgid="8881760709354815449">"sekunde 30"</item>
+    <item msgid="8881760709354815449">"Sekunde 30"</item>
     <item msgid="7589406073232279088">"Dakika 1"</item>
     <item msgid="7001195990902244174">"Dakika 2"</item>
     <item msgid="7489864775127957179">"Dakika 5"</item>
@@ -41,7 +41,7 @@
   <string-array name="dream_timeout_entries">
     <item msgid="3149294732238283185">"Katu"</item>
     <item msgid="2194151041885903260">"Sekunde 15"</item>
-    <item msgid="5892295237131074341">"sekunde 30"</item>
+    <item msgid="5892295237131074341">"Sekunde 30"</item>
     <item msgid="3538441365970038213">"Dakika 1"</item>
     <item msgid="412343871668955639">"Dakika 2"</item>
     <item msgid="5076853889688991690">"Dakika 5"</item>
@@ -55,7 +55,7 @@
     <item msgid="1822002388249545488">"Sekunde 30"</item>
     <item msgid="8538071621211916519">"Dakika 1"</item>
     <item msgid="5663439580228932882">"Dakika 2"</item>
-    <item msgid="49888496216106852">"dakika 5"</item>
+    <item msgid="49888496216106852">"Dakika 5"</item>
     <item msgid="9002737361305019353">"Dakika 10"</item>
     <item msgid="4322676235684793329">"Dakika 30"</item>
   </string-array>
@@ -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>
@@ -134,7 +141,7 @@
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="8151962652413645395">"Dakika 2"</item>
-    <item msgid="8675215713017289017">"dakika 5"</item>
+    <item msgid="8675215713017289017">"Dakika 5"</item>
     <item msgid="477015974247590543">"Saa 1"</item>
     <item msgid="5198271470953124739">"Kamwe muda usiishe"</item>
   </string-array>
@@ -146,23 +153,23 @@
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Daima"</item>
-    <item msgid="844721238536786870">"Wakati imechopekwa ndani"</item>
-    <item msgid="2990218920631468642">"Kamwe ( huongeza utumizi wa data)"</item>
+    <item msgid="844721238536786870">"Wakati inachaji pekee"</item>
+    <item msgid="2990218920631468642">"Kamwe (huongeza matumizi ya data)"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Daima"</item>
-    <item msgid="7433294150916905997">"Wakati imechopekwa ndani"</item>
+    <item msgid="7433294150916905997">"Wakati inachaji pekee"</item>
     <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>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Muda wa utumiaji"</item>
     <item msgid="3703676222230317933">"Zindua hesabu"</item>
-    <item msgid="2502754479975776899">"Jina la Prog"</item>
+    <item msgid="2502754479975776899">"Jina la Programu"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
     <item msgid="8615575908717909498">"PEAP"</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">"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,16 +218,127 @@
     <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="886742181977884584">"Vyombo vya Habari"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"vitufe vya vyombo vya habari"</item>
+    <item msgid="4547883971364273343">"mkazo wa sauti"</item>
+    <item msgid="2603878814882344450">"sauti kuu"</item>
+    <item msgid="7136963238377062018">"kiwango cha sauti"</item>
+    <item msgid="4270236897655923007">"sauti ya mlio"</item>
+    <item msgid="6325739889222559394">"sauti ya midia"</item>
+    <item msgid="5762123934816216821">"sauti ya kengele"</item>
+    <item msgid="785049718065337473">"sauti ya arifa"</item>
+    <item msgid="6700305533746877052">"sauti ya bluetooth"</item>
+    <item msgid="2029227495214047094">"kaa chonjo"</item>
+    <item msgid="26109888160231211">"fuatilia eneo"</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>
+    <item msgid="5753789168376302997">"Vitufe vya media"</item>
+    <item msgid="3265262911688671938">"Kotovu cha sauti"</item>
+    <item msgid="2098976479485046797">"Sauti kuu"</item>
+    <item msgid="5660213838861789350">"Kiwango cha sauti"</item>
+    <item msgid="7983336752371254444">"Sauti ya mlio"</item>
+    <item msgid="7878027809189330917">"Sauti ya media"</item>
+    <item msgid="7260546305036218513">"Sauti ya kengele"</item>
+    <item msgid="9103719301075748925">"Sauti ya arifa"</item>
+    <item msgid="7025966722295861512">"Sauti ya Bluetooth"</item>
+    <item msgid="4665183401128289653">"Kaa chonjo"</item>
+    <item msgid="8584357129746649222">"Eneo"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Fupi"</item>
     <item msgid="2560532955514699713">"Wastani"</item>
     <item msgid="2372711992605524591">"Ndefu"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (rekebisha hitilafu)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Tumia Dalvik"</item>
+    <item msgid="5131846588686178907">"Tumia ART"</item>
+    <item msgid="4530003713865319928">"Tumia ART kurekebisha muundo"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Katu usikague"</item>
     <item msgid="6042769699089883931">"Chunguza maudhui ya DRM pekee"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Mizani 5x ya uhuishaji"</item>
     <item msgid="1069584980746680398">"Mizani 10x ya uhuishaji"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Hamna"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi na 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Hamna"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Zima"</item>
+    <item msgid="7688197031296835369">"Onyesha maeneo yaliyoondolewa"</item>
+    <item msgid="8332661909019981149">"Onyesha kihesabu kilichoondolewa"</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>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Muda wa umeisha"</item>
     <item msgid="7664124146786465092">"Haijafanikiwa"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Uliza"</item>
+    <item msgid="5077768429488260031">"Usiruhusu kamwe"</item>
+    <item msgid="1417929597727989746">"Ruhusu kila wakati"</item>
+  </string-array>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 901d793..b730808 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Ndiyo"</string>
     <string name="no" msgid="6731231425810196216">"Hapana"</string>
     <string name="create" msgid="3578857613172647409">"Unda"</string>
+    <string name="allow" msgid="3349662621170855910">"Ruhusu"</string>
+    <string name="deny" msgid="6947806159746484865">"Kana"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Haijulikani"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Sasa uko katika hatua ya <xliff:g id="STEP_COUNT">%1$d</xliff:g> kutoka kuwa msanidi programu."</item>
+    <item quantity="other" msgid="6722953419953594148">"Sasa uko katika hatua ya <xliff:g id="STEP_COUNT">%1$d</xliff:g> kutoka kuwa msanidi programu."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Sasa wewe ni msanidi programu!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Hakuna haja, tayari wewe ni msanidi programu."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"MITANDAO NA MITANDAO-HEWA"</string>
     <string name="header_category_device" msgid="5781174212691167553">"KIFAA"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"BINAFSI"</string>
@@ -40,7 +48,7 @@
     <string name="radioInfo_service_out" msgid="5238736759641916278">"Haitoi huduma"</string>
     <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Simu za dharura pekee"</string>
     <string name="radioInfo_service_off" msgid="1434084741785525415">"Radio imezimwa"</string>
-    <string name="radioInfo_roaming_in" msgid="9045363884600341051">"urandaji"</string>
+    <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Uko nje ya mtandao wako wa kawaida"</string>
     <string name="radioInfo_roaming_not" msgid="2851853244069662307">"Hairandi"</string>
     <string name="radioInfo_phone_idle" msgid="7489244938838742820">"Hafanyi kitu"</string>
     <string name="radioInfo_phone_ringing" msgid="4883724645684297895">"Inalia"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Inachaji"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Inaondoa"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(pasiwaya)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Haichaji"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Haichaji"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Imejaa"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Imechopolewa"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"pasiwaya"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Haijulikani"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Haijulikani"</string>
@@ -100,28 +110,25 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Hitilafu isiyojulikana"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Baridi"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Inagundulika"</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_not_discoverable" msgid="128269993123955177">"Fanya kifaa kiweze kutambuliwa"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Muda wa kuonekana"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Weka ni kwa muda kiasi gani ambao kifaa kitagundulika"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Funga sauti ya upigaji simu"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Zuia matumizi yakibonyezi cha bluetooth wakati skrini imefungwa"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Vifaa vya Bluetooth"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"Jina la kifaa"</string>
     <string name="bluetooth_device_details" msgid="4594773497930028085">"Mipangilio ya kifaa"</string>
-    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Mipangilio ya maelezo mafupi"</string>
+    <string name="bluetooth_profile_details" msgid="6823621790324933337">"Mipangilio ya wasifu"</string>
     <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>
-    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Lemaza maelezo mafupi?"</string>
+    <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Wasifu ulemazwe?"</string>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"Hii italemaza:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Kutoka:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_connected" msgid="6038755206916626419">"Umeunganishwa"</string>
     <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Imeunganishwa (hakuna simu)"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Onyesha faili zilizopokewa"</string>
     <string name="device_picker" msgid="8398232791303186677">"Kichagua kifaa cha Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Ombi la kibali cha Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Prog inataka kuwasha Bluetooth. Kubali?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Prog katika kompyuta yako ndogo inataka kufanya kompyuta yako ndogo igundulike na vifaa vingine vya Bluetooth kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>. Kubali?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Prog katika simu yako inataka kufanya kompyuta yako ndogo igundulike na vifaa vingine vya Bluetooth kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>. Kubali?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Prog katika kompyuta yako ndogo inataka kufanya kompyuta yako ndogo igundulike na vifaa vingine vya Bluetooth. Kubali?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Prog katika simu yako inataka kuwasha Bluetooth na kufanya simu yako \"igundulike daima\" na vifaa vingine. Kubali?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Prog katika kompyuta yako ndogo inataka kufanya kompyuta yako ndogo igundulike na vifaa vingine vya Bluetooth kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>. Kubali?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Prog katika simu yako inataka kuwasha Bluetooth na kufanya simu yako igundulike na vifaa vingine kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>. Kubali?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Prog katika kompyuta yako ndogo inataka kufanya kompyuta yako ndogo igundulike na vifaa vingine vya Bluetooth kwa sekunde. Kubali?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Prog katika simu yako inataka kuwasha Bluetooth na kufanya simu yako igundulike na vifaa vingine. Kubali?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Programu inataka kuwasha Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Programu inataka kufanya kompyuta yako ndogo ionekane kwenye vifaa vingine vya Bluetooth kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Programu inataka kufanya simu yako ionekane kwenye vifaa vingine vya Bluetooth kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Programu inataka kufanya kompyuta yako ndogo ionekane kwenye vifaa vingine vya Bluetooth. Unaweza kubadilisha hii baadaye kwenye mipangilio ya Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Programu inataka kufanya simu yako ionekane kwenye vifaa vingine vya Bluetooth. Unaweza kubadilisha hii baadaye kwenye mipangilio ya Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Programu inataka kuwasha Bluetooth na kufanya kompyuta yako ndogo ionekane kwa vifaa vingine kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Programu inataka kuwasha Bluetooth na kufanya simu yako ionekane kwa vifaa vingine kwa sekunde <xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Programu inataka kuwasha Bluetooth na kufanya kompyuta yako ndogo ionekane kwenye vifaa vingine. Unaweza kubadilisha hii baadaye kwenye mipangilio ya Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Programu inataka kuwasha Bluetooth na kufanya simu yako ionekane kwenye vifaa vingine. Unaweza kubadilisha hii baadaye kwenye mipangilio ya Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Inawasha Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Inazima Bluetooth..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Unganisha-kiotomatiki"</string>
@@ -162,7 +169,7 @@
     <skip />
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"Usiniulize tena"</string>
     <string name="date_and_time" msgid="4114084177056654663">"Mipangilio ya tarehe na saa"</string>
-    <string name="choose_timezone" msgid="1362834506479536274">"Chagua ukanda wa saa"</string>
+    <string name="choose_timezone" msgid="1362834506479536274">"Chagua saa za eneo"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"Mkoa ( <xliff:g id="DATE">%s</xliff:g> )"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Hakiki:"</string>
     <string name="display_font_size_label" msgid="8941851418397475389">"Ukubwa wa maandishi:"</string>
@@ -192,6 +199,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proksi ya HTTP inayotumiwa na kivinjari lakini haiwezi kutumika na programu zingine."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Mahali:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID ya ujirani:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Maelezo ya Simu:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Majaribio ya data:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Huduma ya GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"urandaji:"</string>
@@ -201,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>
@@ -250,7 +258,7 @@
     <string name="device_info_label" msgid="6551553813651711205">"Maelezo ya kifaa"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"Maelezo ya betri"</string>
     <string name="display_label" msgid="8074070940506840792">"Skrini"</string>
-    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Maelezo ya kompyuta ndogo"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Maelezo kuhusu kompyuta kibao"</string>
     <string name="phone_info_label" product="default" msgid="2127552523124277664">"Maelezo ya simu"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Hifadhi ya USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Kadi ya SD"</string>
@@ -262,32 +270,34 @@
     <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\nMpangilio huu unaathiri watumiaji wote kwenye kompyuta hii ndogo."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Unaporuhusu data kupitia mitandao mingine, huenda ukatozwa gharama kubwa za matumizi ya nje!\n\nMpangilio huu unaathiri watumiaji wote kwenye simu hii."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Ruhusu data kupitia mitandao mingine?"</string>
     <string name="networks" msgid="6333316876545927039">"Uchaguzi wa mtoa huduma"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Chagua mtoa huduma ya mtandao"</string>
     <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_and_time_settings_summary" msgid="7095318986757583584">"Weka tarehe, saa, saa za eneo na fomati"</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_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="zone_auto" msgid="334783869352026648">"Saa za eneo, kiotomatiki"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Tumia saa za eneo zilizotolewa na mtandao"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Tumia saa za eneo zilizotolewa na mtandao"</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_timezone" msgid="5045627174274377814">"Chagua saa za eneo"</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="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Panga kulingana na saa za eneo"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Tarehe"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Saa"</string>
     <string name="biometric_weak_improve_matching_title" msgid="8754080894393195194">"Boresha ulinganishaji sura"</string>
@@ -299,25 +309,29 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Maelezo ya mmiliki"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Andika maandishi ya kuonyeshwa kwenye skrini ya kufunga"</string>
-    <string name="location_settings_title" msgid="4483843407328665068">"Ufikivu wa eneo"</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="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>
     <string name="security_passwords_title" msgid="2930627259125138363">"Manenosiri"</string>
     <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="tablet" msgid="1060273569887301457">"Simba kompyuta kibao kwa njia fiche"</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>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Usimbaji fiche wa kompyuta ndogo"</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\nUsimbaji 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\nUsimbaji 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>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Simba kompyuta kibao kwa njia fiche"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Simba fiche simu"</string>
     <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>
@@ -327,10 +341,10 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Jaribu tena baada ya sekunde <xliff:g id="DELAY">^1</xliff:g>."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Andika nenosiri yako"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Usimbaji fiche haujafanikiwa"</string>
-    <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_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>
@@ -341,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>
@@ -352,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>
@@ -364,7 +378,9 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Badilisha PIN ya kufungua"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Badilisha nenosiri la kufungua"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Nenosiri lazima iwe angalau na vibambo %d"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN lazima iwe angalau na vibambo %d"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for lockpassword_pin_too_short (1677649103470518953) -->
+    <skip />
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Gusa Endelea wakati imekamilaka"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Endelea"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Nenosiri lazima liwe na vibambo chini ya <xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -395,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>
@@ -431,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>
@@ -470,64 +495,98 @@
     <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">"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="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 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>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Vimeunganishwa"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Inapatikana"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Vinavyotumika"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Onyesha mipangilio"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Kata muunganisho?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Hii itaukata muunganisho wako kwa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Chaguo za uonyeshaji bila kutumia waya"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Sahau"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Imekamilika"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Jina"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Imewashwa"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Imezimwa"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Imelemazwa"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Ruhusu ubadilishanaji wa data wakati kompyuta kibao inagusa kifaa kingine"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Ruhusu ubadilishanaji wa data wakati simu inagusa kifaa kingine"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Prog iko tayari kusambaza maudhui ya prog kupitia NFC"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Programu iko tayari kusambaza maudhui ya programu kupitia NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Imezimwa"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Hazipatikani kwa sababu NFC imezimwa"</string>
     <string name="android_beam_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, wasiliani wa Watu, na zaidi. "\n" "\n" Leta tu vifaa pamoja (kawaida nyuma kwa nyuma) na kisha gusa kioo chako. Prog 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 \nShika 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="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_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_more_options" msgid="2448097861752719396">"Chaguo zaidi"</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_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="8116564886303972764">"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 kisambaza data 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_in_progress" msgid="2944576520214787628">"WPS tayari inaendelea na inaweza kuchukua hadi dakika mbili kukamilika"</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>
-    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Mpangilio wa usalama wa kipanga njia pasiwaya (TKIP) hauauniwi."</string>
+    <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Mpangilio wa usalama wa kisambaza data kisichotumia waya (WEP) hauwezi kutumika."</string>
+    <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Mpangilio wa usalama wa kisambaza data kisichotumia waya (TKIP) hauwezi kutumika."</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Imeshindwa kuthibitisha. Tafadhali jaribu tena."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Kipindi kingine cha WPS kimegunduliwa. Tafadhali jaribu tena baada ya dakika chache."</string>
     <string name="wifi_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>
@@ -551,9 +610,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\nJe, 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>
@@ -561,8 +623,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Hifadhi"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Imeshindwa kuhifadhi mtandao"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Ghairi"</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_skip_anyway" msgid="6965361454438011190">"Ruka t"</string>
+    <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\nUsanidi 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\nUsanidi wa simu unaweza kuhitaji huduma muhimu ya mtandao."</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>
@@ -578,13 +648,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_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>
@@ -592,13 +663,16 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Ukitenganisha, muunganisho wako na <xliff:g id="PEER_NAME">%1$s</xliff:g> na vifaa vingine <xliff:g id="PEER_COUNT">%2$s</xliff:g> utakoma."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Ubebezi wa Mipangilo ya ubebezi wa eneo maalum la Wi-Fi"</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_p2p_delete_group_message" msgid="834559380069647086">"Sahau kikundi hiki?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Sambaza intaneti ya Wi-Fi"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Inawezesha mtandao-hewa…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Inazima intaneti..."</string>
+    <string name="wifi_tether_enabled_subtext" msgid="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>
@@ -606,29 +680,29 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Athari za muziki"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Sauti ya Mlio"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Tetema wakati imenyamaza"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Taarifa msingi"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Sauti chaguo-msingi ya arifa"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Arifu ya mwangaza wa palsi"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Mlio wa simu"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Arifa"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Tumia sauti ya simu inayoingia kwa arifa"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Chagua toni ya mlio ya arifa"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Sauti chaguo-msingi ya arifa"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Vyombo vya Mawasiliano"</string>
     <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>
     <string name="volume_notification_description" msgid="5810902320215328321">"Arifa"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"Kengele"</string>
-    <string name="volume_ring_mute" msgid="3018992671608737202">"Nyamazisha mlio wa simu &amp; arifa"</string>
-    <string name="volume_media_mute" msgid="3399059928695998166">"Nyamazisha muziki &amp; midia nyingine"</string>
-    <string name="volume_notification_mute" msgid="7955193480006444159">"Nyamazisha arifa"</string>
-    <string name="volume_alarm_mute" msgid="4452239420351035936">"Nyamazisha kengele"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"Zima mlio wa simu na arifa"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Zima sauti ya muziki na midia nyingine"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"Puuza arifa"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"Zima kengele"</string>
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Tetema wakati wa kutoa mlio"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Gati"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Mipangilio ya gati"</string>
@@ -650,26 +724,27 @@
     <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="3848608373818910549">"Screen Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Itaanza ikilala ikiwa imeunganishwa kwenye nguvu"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Imelemazwa"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Pipi iliyochaguliwa"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Wakati wa kuamilisha"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> uliotumika bila kufanya kitu"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Kamwe"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Ijaribu!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Pia anza wakati imewekwa kwenye kituo"</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">"Wakati imeambatishwa"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Imezimwa"</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>
     <string name="title_font_size" msgid="4405544325522105222">"Ukubwa wa maandishi"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Ukubwa wa fonti"</string>
@@ -677,8 +752,8 @@
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Weka mipangilio ya kufunga SIM kadi"</string>
     <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="tablet" msgid="5058355081270397764">"Inahitaji PIN ili kutumia kompyuta kibao"</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>
@@ -691,14 +766,14 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN ya SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN si sahihi!"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN hazilingani"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Hawezi kubadilika PIN. "\n" Inawezekana PIN si sahihi."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Hawezi kubadilika PIN. \n Inawezekana PIN si sahihi."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Umefaulu kubadilisha PIN ya SIM"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Hauwezi kubadilisha hali ya kifungio cha SIM kadi. "\n" Inawezekana PIN si sahihi."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Hauwezi kubadilisha hali ya kifungio cha SIM kadi. \n Inawezekana PIN si sahihi."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Sawa"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Ghairi"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Hadhi ya kompyuta ndogo"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Hali ya kompyuta kibao"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Hali ya simu"</string>
-    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Visasisho vya mfumo"</string>
+    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Masasisho ya mfumo"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Toleo la Android"</string>
     <string name="model_number" msgid="3765737700545384794">"Nambari ya mtindo"</string>
@@ -706,6 +781,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Toleo la Baseband"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Toleo la kiini"</string>
     <string name="build_number" msgid="3075795840572241758">"Nambari ya ujenzi"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Hali ya SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Haipatikani"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Hali"</string>
     <string name="device_status" msgid="607405385799807324">"Hali"</string>
@@ -723,12 +799,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">"Aina ya mtandao wa simu ya mkononi"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Maelezo ya mtoa huduma"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Hali ya mtandao wa simu ya mkononi"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Hali ya huduma"</string>
     <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>
@@ -737,15 +814,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 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 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>
@@ -760,7 +839,9 @@
     <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="read_only" msgid="6702420168629076340">" (Soma-pekee)"</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>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Ukiangua hifadhi ya USB, programu zingine unazotumia zitasitika na huenda zisipatikane hadi uweke upya hifadhi ya USB."</string>
@@ -774,15 +855,16 @@
     <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>
     <string name="battery_level_title" msgid="2965679202786873272">"Kiwango cha betri"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -812,6 +894,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>
@@ -822,14 +906,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 prog ya data na mipangilio "</li>" "\n" "<li>"prog 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 prog ya data na mipangilio "</li>" "\n" "<li>"prog 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>
@@ -837,14 +921,14 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Futa kadi ya SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Futa data zote kwenye hifadhi ya ndani ya USB, kama vile muziki au picha"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Futa data zote kwenye kadi ya SD, kama vile muziki au picha."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Weka upya kompyuta ndogo"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Rejesha mipangilio ya mwanzo ya kompyuta kibao"</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>
@@ -861,45 +945,52 @@
     <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">"Msaada"</string>
+    <string name="tethering_help_button_text" msgid="656117495547173630">"Usaidizi"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mitandao ya simu"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Dhibiti mpango wa simu ya mkononi"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Ishara maalum ya utagutaji ya SIM isiyojulikana"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for mobile_no_provisioning_url (2399426808423775711) -->
+    <skip />
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Tafadhali ingiza kadi ya SIM na uanze tena"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Tafadhali unganisha kwenye Intaneti"</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>
@@ -907,6 +998,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Angalia maelezo ya kisheria, hadhi, toleo la programu"</string>
     <string name="legal_information" msgid="5769301644270604095">"Maelezo ya kisheria"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Wachangiaji"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Maelezo ya udhibiti"</string>
     <string name="copyright_title" msgid="865906688917260647">"Hakimilki"</string>
     <string name="license_title" msgid="1990487604356037871">"Leseni"</string>
     <string name="terms_title" msgid="7697580845616764642">"Sheria na Masharti"</string>
@@ -932,9 +1024,9 @@
     <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="308287052221942814">"Mchoro wa kufungua"</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>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Ukimaliza achilia kidole"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Unganisha angalau vitone <xliff:g id="NUMBER">%d</xliff:g>. Jaribu tena:"</string>
@@ -949,154 +1041,164 @@
     <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>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Mjarabio mengi yasiyo sahihi"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Jaribu tena baada ya sekunde <xliff:g id="NUMBER">%d</xliff:g>."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Ghairi"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Ifuatayo"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Kulinda kompyuta yako ndogo"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Kulinda simu yako"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Linda kompyuta yako kibao dhidi ya matumizi ambayo hayajaidhinishwa kwa kuunda skrini ya kibinafsi ya mchoro wa kufungua. Sogeza kidole chako ili kuunganisha madoa katika mpangilio wowote kwenye skrini ifuatayo. Lazima uunganishe angalau madoa manne. "\n\n"Uko tayari kuanza? Gusa Ifuatayo."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Linda simu yako na matumizi yasiyoidhinishwa kwa kuunda umbizo la kufungua skrini ya kibinafsi. Tumia kidole chako kuunganisha angalau doti nne kwa mpangilio wowote kwenye skrini ifuatayo "\n\n"Tayari kuanza? Gusa “Ifuatayo”."</string>
-    <string name="manageapplications_settings_title" msgid="7041951105633616745">"Dhibiti prog"</string>
-    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Dhibiti na ondoa prog zilizosakinishwa"</string>
-    <string name="applications_settings" msgid="1721442176406964682">"Prog"</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Programu haijasakinishwa kwenye simu yako."</string>
+    <string name="manageapplications_settings_title" msgid="7041951105633616745">"Dhibiti programu"</string>
+    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Dhibiti na ondoa programu zilizosakinishwa"</string>
+    <string name="applications_settings" msgid="1721442176406964682">"Programu"</string>
     <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 prog"</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_all_warning" product="tablet" msgid="3263360446508268880">"Kompyuta yako ndogo na data ya kibinafsi iko hatarini kushambuliwa na prog kutoka kwa vyanzo visivyojulikana. Unakubali kuwa unawajibika mwenyewe kwa uharibifu wowote kwa kompyuta yako ndogo au kupoteza data ambayo inaweza kutokana kwa kutumia prog hizi."</string>
-    <string name="install_all_warning" product="default" msgid="8113734576826384682">"Simu yako na data ya kibinafsi inaweza kushambuliwa na prog kutoka kwa vyanzo visivyojulikana. Unakubali kuwa unawajibika mwenyewe kwa uharibifu wowote kwa simu yako au kupoteza data ambayo inaweza kusababishwa kutokana na kutumiwa na prog hizi."</string>
-    <string name="advanced_settings" msgid="1777249286757067969">"Mipangilio mahiri"</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>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Nyima ruhusa au onya kabla ya usakinishaji wa programu ambayo inaweza kusababisha madhara"</string>
+    <string name="advanced_settings" msgid="1777249286757067969">"Mipangilio ya kina"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Wezesha chaguo zaidi ya mipangilio."</string>
     <string name="application_info_label" msgid="5736524913065714880">"Maelezo ya programu"</string>
     <string name="storage_label" msgid="8700867073480107253">"Hifadhi"</string>
-    <string name="auto_launch_label" msgid="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">"Prog"</string>
+    <string name="application_size_label" msgid="8494609207373874267">"Programu"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"Programu ya hifadhi ya USB"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Data"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Hifadhi data ya USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Kadi ya SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Ondoa"</string>
-    <string name="disable_text" msgid="6544054052049395202">"Lemaza"</string>
-    <string name="enable_text" msgid="9217362512327828987">"Wezesha"</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">"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="auto_launch_enable_text" msgid="2652825923953591251">"Umechagua kuzindua prog hii kwa mbadala kwa baadhi ya vitendo."</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>
     <string name="clear_activities" msgid="7408923511535174430">"Futa chaguo-msingi"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Programu hii haiwezi kuundwa kwa skrini yako: Unaweza kudhibiti jinsi inavyojirekebidhwa kwa skrini yako hapa."</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"Uliza wakati imezinduliwa"</string>
-    <string name="enable_compatibility" msgid="5806819252068617811">"Pima prog"</string>
+    <string name="enable_compatibility" msgid="5806819252068617811">"Pima programu"</string>
     <string name="unknown" msgid="1592123443519355854">"Haijulikani"</string>
     <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_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_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>
-    <string name="no_applications" msgid="7336588977497084921">"Hakuna prog."</string>
+    <string name="not_installed" msgid="1475144352069281880">"Haijasakinishwa"</string>
+    <string name="no_applications" msgid="7336588977497084921">"Hakuna programu."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Hifadhi ya ndani"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Hifadhi ya USB"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Hifadhi ya kadi ya SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Kiwango cha kukadiria upya"</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Futa data za prog?"</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Futa data za programu?"</string>
     <string name="clear_data_dlg_text" msgid="8847257251846779938">"Data hizi zote za programu zitafutwa kabisa. Hii inajumuisha faili, mipangilio, akaunti, hifadhidata zote na kuendelea."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"Sawa"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Ghairi"</string>
     <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 prog."</string>
-    <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"Sanidua visasisho?"</string>
-    <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Usasisho zote kwa mfumo wa prog ya Android zitasakinishuliwa."</string>
+    <string name="clear_data_failed" msgid="1907582169616856698">"Haikuweza kufuta data ya programu."</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="tablet" msgid="1292421279262430109">"Programu hii inaweza kufikia yafuatayo kwenye kompyuta kibao 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>
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> na <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Huenda programu hii ikakutoza pesa:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Tuma SMS ya ada"</string>
     <string name="computing_size" msgid="1599186977475211186">"Inahesabu..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Haikuweza kuhesabu ukubwa wa furushi."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Hauna programu za wahusika wengine zilizosakinishwa."</string>
     <string name="version_text" msgid="9189073826278676425">"Toleo <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Songa"</string>
-    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Hamisha kwa kompyuta ndogo"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Hamisha hadi kompyuta kibao"</string>
     <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Sogeza kwa simu"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Hamisha kwa hifadhi ya USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Sogeza hadi kwa kadi ya SD"</string>
     <string name="moving" msgid="6431016143218876491">"Inaondoa"</string>
     <string name="insufficient_storage" msgid="481763122991093080">"Nafasi ya hifadhi haitoshi."</string>
-    <string name="does_not_exist" msgid="3476487214886606748">"Prog haipo."</string>
+    <string name="does_not_exist" msgid="3476487214886606748">"Programu haipo."</string>
     <string name="app_forward_locked" msgid="6331564656683790866">"Programu imelindwa-kunakiliwa."</string>
     <string name="invalid_location" msgid="2786030127356312746">"Eneo la kusakinisha si halali."</string>
     <string name="system_package" msgid="6222593098063037137">"Sasisho za mfumo haziwezi kusakinisha kwa media ya nje."</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Lazimisha kusitisha?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Ukilazimisha kusitisha prog, inaweza kutofanya vizuri."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Ukilazimisha kusitisha programu, inaweza kutofanya vizuri."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
-    <string name="move_app_failed_dlg_text" msgid="3465267182923054022">"Haikuweza kuhamisha prog. <xliff:g id="REASON">%1$s</xliff:g>"</string>
+    <string name="move_app_failed_dlg_text" msgid="3465267182923054022">"Haikuweza kuhamisha programu. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Eneo sakinishwa pendekezwa"</string>
     <string name="app_install_location_summary" msgid="5155453752692959098">"Badilisha usakinishaji wa eneo unalopenda ya programu mpya"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Lemaza programu zilizoundwa-ndani?"</string>
-    <string name="app_disable_dlg_text" msgid="3562567756362627323">"Ukilemaza prog iliyoundwa-ndani, prog zingine huenda zisifanye kazi."</string>
+    <string name="app_disable_dlg_text" msgid="3562567756362627323">"Ukilemaza programu iliyoundwa-ndani, programu zingine huenda zisifanye kazi."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Futa data na ulemaze programu?"</string>
+    <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 prog"</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 prog."</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_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_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">"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">"Prog 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 prog yake. Kuisitisha inaweza kusababisha prog kushindwa."</string>
-    <string name="heavy_weight_stop_description" msgid="2979218727598321095">"Prog 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 prog ambayo bado inaendeshwa iwapo itahitajika tena. Huwa hakuna sababu ya kuisitisha."</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>
     <string name="main_running_process_description" msgid="1130702347066340890">"Utaratibu kuu ambao unatumika."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Huduma inatumika <xliff:g id="COMP_NAME">%1$s</xliff:g>"</string>
@@ -1104,10 +1206,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>
@@ -1116,11 +1218,10 @@
     <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="show_password_summary" msgid="7345931695292850058"></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 prog <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Tumia kisasishaji hiki?"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"Kisasishaji hiki kinaweza kukusanya maandishi yote wakati unaangika, pamoja na data za kibinafsi kama nenosiri na namari za kadi ya mkopo. Inatoka kwa programu <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Tumia kisasishaji hiki?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Mipangilio"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Lugha"</string>
     <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Imeshindwa kufungua mipangilio ya <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
@@ -1134,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Ili kubadili, bonyeza Dhibiti-Kiweka nafasi"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Chaguo-msingi"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Mpangilio wa kibodi"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kamusi ya mtumiaji"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Kamusi binafsi"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"kamusi binafsi"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Kamusi binafsi"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Ongeza"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Ongeza kwenye kamusi"</string>
@@ -1147,6 +1246,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>
@@ -1159,14 +1260,14 @@
     <string name="testing_battery_info" msgid="3497865525976497848">"Maelezo ya betri"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Kufungua kwa kasi"</string>
     <string name="quick_launch_summary" msgid="8101133819188001190">"Weka mikato ya kibodi kuzindua programu"</string>
-    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Teua prog"</string>
+    <string name="quick_launch_assign_application" msgid="6240064079456617501">"Teua programu"</string>
     <string name="quick_launch_no_shortcut" msgid="5998005833838278693">"Hakuna njia za mkato"</string>
     <string name="quick_launch_shortcut" msgid="5090405067413522300">"Tafuta + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
     <string name="quick_launch_clear_dialog_title" msgid="5546543501250320220">"Futa"</string>
     <string name="quick_launch_clear_dialog_message" msgid="3921015601470260722">"Njia mkato yako ya (<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>(<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) itafutwa."</string>
     <string name="quick_launch_clear_ok_button" msgid="2634568926597586716">"Sawa"</string>
     <string name="quick_launch_clear_cancel_button" msgid="1892854652197747064">"Ghairi"</string>
-    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Prog"</string>
+    <string name="quick_launch_display_mode_applications" msgid="1734058461846126775">"Programu"</string>
     <string name="quick_launch_display_mode_shortcuts" msgid="4177934019174169042">"Njia za mkato"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"Uingizaji maandishi"</string>
     <string name="input_method" msgid="5434026103176856164">"Mbinu ya uingizaji"</string>
@@ -1186,26 +1287,40 @@
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Kibodi halisi"</string>
     <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 prog"</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="keep_screen_on" msgid="1146389631208760344">"Kaa ange"</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">"Weka skrini ikiwa imewashwa"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skrini haitawahi kuzima wakati unachaji"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Washa kumbukumbu ya Bluetooth HCI Snoop"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Nasa pakiti zote za Bluetooth HCI katika faili"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Chagua muda wa kuendesha"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Chagua muda wa kuendesha"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Fungua upya na ubadilishe muda wa kuendesha kutoka <xliff:g id="OLD">%1$s</xliff:g> hadi <xliff:g id="NEW">%2$s</xliff:g>?"</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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Kagua programu zilizosakinishwa kupitia ADB/ADT kwa tabia ya kudhuru."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Linda hifadhi ya USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Sharti programu iombe ruhusa ili kusoma hifadhi ya USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Linda hifadhi ya USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wakati hifadhi ya USB 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="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wakati hifadhi ya USB imelindwa, sharti programu ziombe ruhusa ya kusoma data kutoka kwenye hifadhi ya nje.\n\nBaadhi ya programu zinawezakosa kufanya kazi hadi zisasishwe na wasanidi wake."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Linda kadi ya SD"</string>
     <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="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\nBaadhi ya programu zinawezakosa kufanya kazi hadi zisasishwe na wasanidi wake."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Kituo cha karibu"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Washa programu ya mwisho inayotoa ufikiaji mkuu wa karibu"</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>
@@ -1217,36 +1332,50 @@
     <string name="usage_stats_label" msgid="5890846333487083609">"Takwimu za utumiaji"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Takwimu za utumiaji"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Panga kwa:"</string>
-    <string name="app_name_label" msgid="5440362857006046193">"Prog"</string>
+    <string name="app_name_label" msgid="5440362857006046193">"Programu"</string>
     <string name="launch_count_label" msgid="4019444833263957024">"Hesabu"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Muda wa utumiaji"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Ufikiaji"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Mipangilio ya ufikiaji"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Huduma"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Mfumo"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Maandishi makubwa"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"kitufe cha nguvu kinamaliza upigaji simu"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Zungumza manenosiri"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Gusa &amp; shikilia kuchelewa"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Boresha ufikiaji wavuti"</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\nUnapokuwa 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\nDokezo: 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>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kipengele hiki kinapowashwa, unaweza kuwezesha haraka vipengele vya ufikivu kwa hatua mbili:\n\nHatua ya 1: Bonyeza na ushikilie kitufe cha kuwasha/kuzima mpaka utakaposikia sauti au kuhisi mtetemo.\n\nHatua ya 2: Gusa na ushikilie vidole viwili mpaka utakaposikia uthibitishaji wa sauti.\n\nIkiwa kifaa kina watumiaji wengi, kuutumia mkato huu kwenye skrini ya kufunga kunawezesha ufikivu kwa muda mpaka kifaa kitakapofunguliwa."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Maandishi makubwa"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ukuzaji wa skrini"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Sasisha otomatiki ukuzaji wa skrini"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Sasisha ukuzaji wa skrini kwenye mipito ya  programu"</string>
+    <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_menu_item_settings" msgid="3344942964710773365">"Mipangilio"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Washa"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Zima"</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="accessibility_feature_state_on" msgid="2864292320042673806">"Imewashwa"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Imezimwa"</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 prog 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="print_settings" msgid="4742428530112487843">"Kuchapisha"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Mipangilio ya kuchapisha"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Huduma"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Je, ungependa kutumia <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> inaweza kupokea hati unazozichapisha. Hati kama hizo zinaweza kuwa na data nyeti."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Hakuna huduma zilizosakinishwa"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Mipangilio"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Ongeza printa"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Kimewashwa"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Kimezimwa"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Betri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Ni nini kimekuwa kikitumia betri"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Data ya matumizi ya betri haipatikani."</string>
@@ -1258,14 +1387,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>
@@ -1273,40 +1402,42 @@
     <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="tablet" msgid="4612478572401640759">"Kompyuta kibao haitumiki"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Simu haitumiki"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU kwa jumla"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Mandharimbele ya CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Weka chonjo"</string>
     <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_phone" product="tablet" msgid="262638572890253393">"Kompyuta ndogo"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Inaendesha Wi-Fi"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Kompyuta kibao"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Simu"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Data imetumwa"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Data iliyopokewa"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Daya ya kifaa cha mkononi imetumwa"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Data ya kifaa cha mkononi imepokelewa"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Data ya Wi‑Fi imetumwa"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Data ya Wi‑Fi imepokelewa"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Kusikika"</string>
     <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>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Betri inayotumiwa wakati kompyuta kibao haitumiki"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Betri imetumiwa wakati simu haitumiki"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Betri inayotumiwa na redio ya seli"</string>
     <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>
@@ -1314,6 +1445,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Kuacha au kufuta App"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Dhibiti kwa mkono GPS kwa kuzuia programu kutokana na kuitumia"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Huenda programu ikatoa mipangilio ya kupunguza utumiaji wa betri"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Betri imetumiwa na mtumiaji"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> tangu ilipoondolewa"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ilipochopolewa mara ya mwisho kwa <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Jumla ya utumiaji"</string>
@@ -1322,35 +1454,37 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Seva ya media"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Kiingizaji cha sauti &amp; kutoa nje"</string>
     <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="voice_search_settings_title" msgid="2775469246913196536">"Tafuta kwa kutamka"</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_lang_not_selected" msgid="7395787019276734765">"Lugha haijachaguliwa"</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>
@@ -1368,8 +1502,22 @@
     <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="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">"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>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"nusu"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"zima"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Hifadhi ya hati-tambulishi"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Sakinisha kutoka kwa hifadhi"</string>
@@ -1378,52 +1526,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_configure_account_title" msgid="3790872965773196615">"Akaunti ya chelezo"</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 prog, rejeza mipangilio iliyohifadhiwa na data"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Chukua ripoti ya hitilafu"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Hii itakusanya maelezo kuhusu hali yako ya sasa ya kifaa, na kutuma kama barua pepe. Itachukua muda mfupi kuanzisha ripoti ya hitilafu hadi iwe tayari kutumwa; tafadhali vumilia."</string>
-    <string name="report" msgid="302437572240018342">"Ripoti"</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>
@@ -1432,10 +1580,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>
@@ -1457,28 +1605,28 @@
     <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\nGusa"<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>
     <string name="last_synced" msgid="4242919465367022234">"Ilisawazishwa mwisho <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"Inasawazisha sasa..."</string>
-    <string name="settings_backup" msgid="2274732978260797031">"Mipangilio ya chelezo"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Mipangilio ya kuhifadhi nakala rudufu"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Cheleza mipangilio yangu"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Sawazisha sasa"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Ghairi usawazishaji"</string>
@@ -1487,8 +1635,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>" \nNjia 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>
@@ -1496,15 +1644,15 @@
     <string name="header_add_an_account" msgid="756108499532023798">"Ongeza akaunti"</string>
     <string name="finish_button_label" msgid="481587707657751116">"Maliza"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"Ondoa akaunti?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Kuondoa hii akaunti kufuta ujumbe zake zote, wasiliani, na data zingine kutoka kwa kompyuta ndogo"</string>
-    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Kuondoa hii akaunti hii kutafuta ujumbe zake zote, wasiliani, na data zingine kutoka kwa simu!"</string>
-    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Akaunti hii inahitajika na baadhi ya prog. Unaweza tu kuiondoa kwa kuseti upya kompyuta ndogo kwa mbadala ya kiwanda (ambayo itafuta data zako zote za kibinafsi) katika Mipangilio &gt; Hifadhi &amp;amp, seti upya."</string>
-    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Akaunti hii inahitajika na baadhi ya prog. Unaweza tu kuiondoa kwa kuseti upya simu kwa mbadala ya kiwanda (ambayo itafuta data zako zote za kibinafsi) katika Mipangilio &gt; Hifadhi &amp;amp, seti upya."</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Kuondoa hii akaunti kutafuta mazungumzo yako yote, anwani, na data zingine kutoka kwa kompyuta kibao!"</string>
+    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Kuondoa hii akaunti hii kutafuta mazungumzo yako yote, anwani, na data zingine kutoka kwa simu!"</string>
+    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Akaunti hii inahitajika na baadhi ya programu. Unaweza tu kuiondoa kwa kuseti upya kompyuta ndogo kwa mbadala ya kiwanda (ambayo itafuta data zako zote za kibinafsi) katika Mipangilio &gt; Hifadhi &amp;amp, seti upya."</string>
+    <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Akaunti hii inahitajika na baadhi ya programu. Unaweza tu kuiondoa kwa kuseti upya simu kwa mbadala ya kiwanda (ambayo itafuta data zako zote za kibinafsi) katika Mipangilio &gt; Hifadhi &amp;amp, seti upya."</string>
     <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>
@@ -1527,6 +1675,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>
@@ -1534,55 +1683,59 @@
     <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>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Onyesha sasisho za safu za maunzi"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Angaza kijani safu za maunzi zinaposasisha"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Tatua uondoaji wa GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Onyesha matumizi ya CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Kuegeshwa kwa skrini ikionyesha matumizi ya sasa ya CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Lazimisha kutungiliza  GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Lazimisha matumizi ya GPU kwa uchoraji wa 2d"</string>
-    <string name="track_frame_time" msgid="6146354853663863443">"Utungilizaji wa GPU ya maelezo mafupi"</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="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="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="debug_applications_category" msgid="4206913653849771549">"Prog"</string>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Iga maonyesho ya upili"</string>
+    <string name="debug_applications_category" msgid="4206913653849771549">"Programu"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Usihifadhi shughuli"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Haribu kila shughuli pindi tu mtumiaji anapoondoka"</string>
     <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>
@@ -1592,16 +1745,16 @@
     <string name="data_usage_enable_mobile" msgid="986782622560157977">"Data ya simu"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"Data ya 2G-3G"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"Data ya 4G"</string>
-    <string name="data_usage_app_settings" msgid="8430240158135453271">"Tazama mipangilio ya prog"</string>
+    <string name="data_usage_app_settings" msgid="8430240158135453271">"Tazama mipangilio ya programu"</string>
     <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Zuia data ya mandharinyuma"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Lemaza data ya usuli kwenye mitandao ya simu. Mitandao isiyo ya simu itatumika kama itapatikana."</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Kuzuia data ya usuli kwa prog hii, kwanza weka kikomo cha data ya simu ya mkono."</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Kuzuia data ya usuli kwa programu hii, kwanza weka kikomo cha data ya simu ya mkono."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Zuia data ya mandhari nyuma?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Kipengee hiki kinaweza kusababisha programu inayotegemea data ya usuli kuacha kufanya kazi wakati ni mitandao ya simu tu inayopatikana."\n\n"Unaweza kupata vidhibiti faafu zaidi vya matumizi ya data katika mipangilio inayopatikana ndani ya programu."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Kipengee hiki kinaweza kusababisha programu inayotegemea data ya usuli kuacha kufanya kazi wakati ni mitandao ya simu tu inayopatikana.\n\nUnaweza kupata vidhibiti faafu zaidi vya matumizi ya data katika mipangilio inayopatikana ndani ya programu."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Kuzuia data za usuli inawezekana tu wakati umeweka kikomo cha data ya simu ya mkono."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Je, usawazishaji data kiotomatiki uwashwe?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Mabadiliko yote unayoyafanya katika akaunti zako kwenye wavuti yatanakiliwa kiotomatiki katika kompyuta kibao yako."\n\n"Baadhi ya akaunti pia zinaweza kunakili kiotomatiki mabadiliko yoyote unayoyafanya kwenye kompyuta kibao hadi kwenye wavuti. Akaunti ya Google hufanyakazi kwa namna hii."\n\n"Ili kuchagua ni aina zipi za taarifa za kusawazisha katika kila akaunti, nenda kwenye Mipangilio &gt; Akaunti."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Mabadiliko yote unayoyafanya katika akaunti zako kwenye wavuti yatanakiliwa kiotomatiki katika simu yako."\n\n"Baadhi ya akaunti pia zinaweza kunakili kiotomatiki mabadiliko yoyote unayoyafanya kwenye simu hadi katika wavuti. Akaunti ya Google hufanyakazi kwa namna hii."\n\n"Ili kuchagua aina zipi za taarifa za kusawazisha katika kila akaunti, nenda kwenye Mipangilio &gt; Akaunti."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Mabadiliko yote unayoyafanya katika akaunti zako kwenye wavuti yatanakiliwa kiotomatiki katika kompyuta kibao yako.\n\nBaadhi ya akaunti pia zinaweza kunakili kiotomatiki mabadiliko yoyote unayoyafanya kwenye kompyuta kibao hadi kwenye wavuti. Akaunti ya Google hufanyakazi kwa namna hii.\n\nIli kuchagua ni aina zipi za taarifa za kusawazisha katika kila akaunti, nenda kwenye Mipangilio &gt; Akaunti."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Mabadiliko yote unayoyafanya katika akaunti zako kwenye wavuti yatanakiliwa kiotomatiki katika simu yako.\n\nBaadhi ya akaunti pia zinaweza kunakili kiotomatiki mabadiliko yoyote unayoyafanya kwenye simu hadi katika wavuti. Akaunti ya Google hufanyakazi kwa namna hii.\n\nIli kuchagua aina zipi za taarifa za kusawazisha katika kila akaunti, nenda kwenye Mipangilio &gt; Akaunti."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Je, usawazishaji data kiotomatiki uzimwe?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Hii itahifadhi data na matumizi ya betri, lakini utahitajika kusawazisha kila akaunti wewe mwenyewe ili kukusanya taarifa ya hivi karibuni. Na hutapokea arifa wakati sasisho zinapotokea."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tarehe iliyowekwa upya ya msururu wa matumizi"</string>
@@ -1610,22 +1763,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Weka onyo kwa matumizi ya data"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Weka kikomo cha matumizi ya data"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"inapunguza matumizi ya data"</string>
-    <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_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" 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\nMpangilio 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\nMpangilio 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Watumiaji na programu ziilizoondolewa"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g>ilipokewa, <xliff:g id="SENT">%2$s</xliff:g>ilitumwa"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: karibu <xliff:g id="TOTAL">%1$s</xliff:g> zimetumika."</string>
     <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>
@@ -1638,7 +1794,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>
@@ -1651,18 +1807,22 @@
     <string name="vpn_cancel" msgid="1979937976123659332">"Ghairi"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Hifadhi"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Unganisha"</string>
-    <string name="vpn_edit" msgid="8647191407179996943">"Hariri maelezo mafupi kuhusu VPN"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"Hariri wasifu kuhusu VPN"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"Unganisha kwa <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">"Ongeza wasifu wa VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Hariri wasifu"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Futa wasifu"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN Iliyowashwa kila mara"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Chagua wasifu wa VPN ambapo utakuwa umeunganishwa kila mara. Trafiki ya mtandao itaruhusiwa tu unapounganishwa kwenye VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Hamna"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Kila mara VPN iliyowashwa inahitaji anwani ya Itifaki Wavuti za seva na DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Hakuna muunganisho wa mtandao. Tafadhali jaribu tena baadaye."</string>
     <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>
@@ -1675,24 +1835,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Ghairi"</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">"sasisho za ziada za mfumo"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Watumiaji na vizuizi"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Watumiaji"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Ongeza mtumiaji"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Hariri maelezo"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Maelezo ya mtumiaji"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Jina"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Vizuizi vya maudhui"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Inahitaji PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Ukadiriaji maudhui"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Programu za mfumo"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Programu zilizosakinishwa"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Tupa"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Ondoa mtumiaji"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Mtoto anayekera"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Imelemazwa"</string>
+    <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_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="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\nBaada ya kuweka mtumiaji mpya, mtu huyo anahitaji kupitia mchakato wa usanidi.\n\nMtumiaji 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\nMtumiaji 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_confirm_remove_message" msgid="5284111415714437285">"Je, una uhakika unataka kuondoa mtumiaji na data zote zinazohusika kutoka kwenye kifaa?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Badilisha ukubwa wa fonti"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Vikwazo"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Ondoa vikwazo"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Badilisha PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Onyesha arifa"</string>
-    <string name="help_label" msgid="1107174367904110532">"Msaada"</string>
+    <string name="help_label" msgid="1107174367904110532">"Usaidizi"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Akaunti ya maudhui"</string>
+    <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="6160672982086584261">"Weka vizuizi vya programu"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Inadhibitiwa na <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Programu hii haitumiki katika wasifu zilizowekewa vikwazo"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Programu hii inaweza kufikia akaunti zako"</string>
+    <string name="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-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
index 994d4bb..c0a79ad 100755
--- a/res/values-sw600dp-land/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -18,4 +18,6 @@
     <dimen name="screen_margin_sides">128dip</dimen>
     <dimen name="screen_margin_top">72dip</dimen>
     <dimen name="screen_margin_bottom">48dip</dimen>
+    <dimen name="appwidget_preview_height">80dip</dimen>
+    <dimen name="keyguard_appwidget_picker_width">720dip</dimen>
 </resources>
diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
new file mode 100644
index 0000000..645d1fe
--- /dev/null
+++ b/res/values-sw600dp-land/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <style name="KeyguardAppWidgetItem">
+        <item name="android:textSize">18sp</item>
+    </style>
+</resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index cf7ac6b..4f4a221 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -24,7 +24,7 @@
     <dimen name="content_margin_left">16dip</dimen>
     <dimen name="description_margin_top">26dip</dimen>
     <dimen name="crypt_clock_size">120sp</dimen>
-    <dimen name="setup_title_size">60sp</dimen>
+    <dimen name="setup_title_size">60dp</dimen>
     <item type="dimen" name="setup_title_height">20%</item>
     <item type="dimen" name="setup_border_width">10%</item>
     <dimen name="setup_margin_bottom">0dip</dimen>
@@ -32,4 +32,10 @@
     <dimen name="setup_item_margin">32dip</dimen>
     <dimen name="appwidget_min_width">325dip</dimen>
     <dimen name="appwidget_min_height">50dip</dimen>
+
+    <dimen name="appwidget_preview_width">120dip</dimen>
+    <dimen name="appwidget_preview_height">70dip</dimen>
+    <dimen name="keyguard_appwidget_picker_margin_left">2dip</dimen>
+    <dimen name="keyguard_appwidget_picker_margin_right">2dip</dimen>
+    <integer name="keyguard_appwidget_picker_cols">2</integer>
 </resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 2b01d7f..6862690 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -24,8 +24,8 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">8dip</item>
-        <item name="android:layout_marginLeft">16dip</item>
-        <item name="android:layout_marginRight">16dip</item>
+        <item name="android:layout_marginStart">16dip</item>
+        <item name="android:layout_marginEnd">16dip</item>
         <item name="android:orientation">horizontal</item>
         <item name="android:gravity">center_vertical</item>
     </style>
@@ -44,6 +44,13 @@
         <item name="android:textSize">18sp</item>
     </style>
 
+    <style name="wifi_item_edit_content">
+        <item name="android:layout_width">0dip</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">7</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
     <style name="wifi_section">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -57,4 +64,9 @@
         <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
         <item name="android:textSize">20sp</item>
     </style>
+
+    <style name="KeyguardAppWidgetItem">
+        <item name="android:textSize">16sp</item>
+    </style>
+
 </resources>
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
new file mode 100644
index 0000000..05914df
--- /dev/null
+++ b/res/values-sw720dp-land/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <dimen name="settings_side_margin">150dp</dimen>
+</resources>
diff --git a/res/drawable/wifi_signal.xml b/res/values-sw720dp/dimens.xml
similarity index 60%
copy from res/drawable/wifi_signal.xml
copy to res/values-sw720dp/dimens.xml
index 86c1ab0..9c6cc25 100644
--- a/res/drawable/wifi_signal.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- 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.
@@ -14,9 +14,10 @@
      limitations under the License.
 -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock" />
-    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open" />
-</selector>
-
+<resources>
+    <dimen name="pager_tabs_padding">0dp</dimen>
+    <dimen name="appwidget_preview_height">80dip</dimen>
+    <integer name="keyguard_appwidget_picker_cols">2</integer>
+    <dimen name="keyguard_appwidget_picker_width">720dip</dimen>
+    <dimen name="settings_side_margin">32dp</dimen>
+</resources>
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
new file mode 100644
index 0000000..645d1fe
--- /dev/null
+++ b/res/values-sw720dp/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <style name="KeyguardAppWidgetItem">
+        <item name="android:textSize">18sp</item>
+    </style>
+</resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 6efdda2..1a68c71 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,16 +218,127 @@
     <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="886742181977884584">"สื่อ"</item>
+    <item msgid="7924928667052300589">"อุปกรณ์"</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>
+    <item msgid="5124443975763747838">"ปุ่มสื่อ"</item>
+    <item msgid="4547883971364273343">"โฟกัสอัตโนมัติ"</item>
+    <item msgid="2603878814882344450">"ระดับเสียงหลัก"</item>
+    <item msgid="7136963238377062018">"ระดับเสียงสนทนา"</item>
+    <item msgid="4270236897655923007">"ระดับเสียงเรียกเข้า"</item>
+    <item msgid="6325739889222559394">"ระดับเสียงของสื่อ"</item>
+    <item msgid="5762123934816216821">"ระดับเสียงปลุก"</item>
+    <item msgid="785049718065337473">"ระดับเสียงการแจ้งเตือน"</item>
+    <item msgid="6700305533746877052">"ระดับเสียงบลูทูธ"</item>
+    <item msgid="2029227495214047094">"ทำงานตลอดเวลา"</item>
+    <item msgid="26109888160231211">"ตำแหน่งจอภาพ"</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>
+    <item msgid="5753789168376302997">"ปุ่มสื่อ"</item>
+    <item msgid="3265262911688671938">"โฟกัสอัตโนมัติ"</item>
+    <item msgid="2098976479485046797">"ระดับเสียงหลัก"</item>
+    <item msgid="5660213838861789350">"ระดับเสียงสนทนา"</item>
+    <item msgid="7983336752371254444">"ระดับเสียงเรียกเข้า"</item>
+    <item msgid="7878027809189330917">"ระดับเสียงของสื่อ"</item>
+    <item msgid="7260546305036218513">"ระดับเสียงปลุก"</item>
+    <item msgid="9103719301075748925">"ระดับเสียงของการแจ้งเตือน"</item>
+    <item msgid="7025966722295861512">"ระดับบลูทูธ"</item>
+    <item msgid="4665183401128289653">"ทำงานตลอดเวลา"</item>
+    <item msgid="8584357129746649222">"ตำแหน่ง"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"สั้น"</item>
     <item msgid="2560532955514699713">"ปานกลาง"</item>
     <item msgid="2372711992605524591">"ยาว"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (ดีบัก)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"ใช้ Dalvik"</item>
+    <item msgid="5131846588686178907">"ใช้ ART"</item>
+    <item msgid="4530003713865319928">"ใช้บิวด์ดีบัก ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"ไม่ต้องตรวจสอบ"</item>
     <item msgid="6042769699089883931">"ตรวจสอบเนื้อหา DRM เท่านั้น"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"ความเร็วภาพเคลื่อนไหว 5 เท่า"</item>
     <item msgid="1069584980746680398">"ความเร็วภาพเคลื่อนไหว 10 เท่า"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"ไม่มี"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi และ 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"ไม่มี"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"ปิด"</item>
+    <item msgid="7688197031296835369">"แสดงพื้นที่การวาดทับ"</item>
+    <item msgid="8332661909019981149">"แสดงตัวนับการวาดทับ"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"ขีดจำกัดมาตรฐาน"</item>
     <item msgid="4071574792028999443">"ไม่มีกระบวนการพื้นหลัง"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"ระยะหมดเวลา"</item>
     <item msgid="7664124146786465092">"ไม่สำเร็จ"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"ถาม"</item>
+    <item msgid="5077768429488260031">"ไม่อนุญาตเลย"</item>
+    <item msgid="1417929597727989746">"อนุญาตเสมอ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 2c0e398..844c428 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"ใช่"</string>
     <string name="no" msgid="6731231425810196216">"ไม่"</string>
     <string name="create" msgid="3578857613172647409">"สร้าง"</string>
+    <string name="allow" msgid="3349662621170855910">"อนุญาต"</string>
+    <string name="deny" msgid="6947806159746484865">"ปฏิเสธ"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ไม่ทราบ"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"คุณเหลืออีกเพียง <xliff:g id="STEP_COUNT">%1$d</xliff:g> ขั้นตอนเพื่อเป็นนักพัฒนาซอฟต์แวร์"</item>
+    <item quantity="other" msgid="6722953419953594148">"คุณเหลืออีกเพียง <xliff:g id="STEP_COUNT">%1$d</xliff:g> ขั้นตอนเพื่อเป็นนักพัฒนาซอฟต์แวร์"</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"ตอนนี้คุณเป็นนักพัฒนาซอฟต์แวร์แล้ว!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"ไม่จำเป็น คุณเป็นนักพัฒนาซอฟต์แวร์อยู่แล้ว"</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"ระบบไร้สายและเครือข่าย"</string>
     <string name="header_category_device" msgid="5781174212691167553">"อุปกรณ์"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"ส่วนบุคคล"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"กำลังชาร์จ"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"ไม่ได้กำลังชาร์จแบต"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(ระบบไร้สาย)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"ไม่ได้ชาร์จ"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"ไม่ได้ชาร์จ"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"เต็ม"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"ไม่ได้เสียบปลั๊ก"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"ระบบไร้สาย"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"ไม่ทราบ"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"ไม่ทราบ"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"เย็น"</string>
     <string name="bluetooth" msgid="5549625000628014477">"บลูทูธ"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"ค้นพบได้"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"อุปกรณ์บลูทูธใกล้เคียงทั้งหมดมองเห็นได้ (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"อุปกรณ์บลูทูธใกล้เคียงทั้งหมดมองเห็นได้"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"ไม่ให้อุปกรณ์บลูทูธอื่นเห็น"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"อุปกรณ์ที่จับคู่เท่านั้นที่มองเห็น"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"ทำให้ค้นพบอุปกรณ์ได้"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"ระยะหมดเวลาการมองเห็น"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"ตั้งค่าระยะเวลาที่ให้สามารถค้นพบอุปกรณ์ได้"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ล็อกการโทรด้วยเสียง"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ป้องกันการใช้โปรแกรมโทรออกผ่านบลูทูธเมื่อล็อกหน้าจอไว้"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"อุปกรณ์บลูทูธ"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"แสดงไฟล์ที่ได้รับ"</string>
     <string name="device_picker" msgid="8398232791303186677">"ตัวเลือกอุปกรณ์บลูทูธ"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"คำขออนุญาตใช้บลูทูธ"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"แอปพลิเคชันต้องการเปิดบลูทูธ อนุญาตหรือไม่"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"แอปพลิเคชันบนแท็บเล็ตของคุณต้องการทำให้อุปกรณ์บลูทูธอื่นค้นพบแท็บเล็ตของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที คุณจะอนุญาตหรือไม่"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"แอปพลิเคชันบนโทรศัพท์ของคุณต้องการทำให้อุปกรณ์บลูทูธอื่นค้นพบโทรศัพท์ของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที คุณจะอนุญาตหรือไม่"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"แอปพลิเคชันบนแท็บเล็ตของคุณต้องการทำให้อุปกรณ์บลูทูธอื่น \"ค้นพบแท็บเล็ตของคุณได้เสมอ\" คุณจะอนุญาตหรือไม่"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"แอปพลิเคชันบนโทรศัพท์ของคุณต้องการทำให้อุปกรณ์บลูทูธอื่น \"ค้นพบโทรศัพท์ของคุณได้เสมอ\" คุณจะอนุญาตหรือไม่"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"แอปพลิเคชันบนแท็บเล็ตของคุณต้องการเปิดบลูทูธและทำให้อุปกรณ์อื่นค้นพบแท็บเล็ตของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที คุณจะอนุญาตหรือไม่"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"แอปพลิเคชันบนโทรศัพท์ของคุณต้องการเปิดบลูทูธ และทำให้อุปกรณ์อื่นค้นพบโทรศัพท์ของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที คุณจะอนุญาตหรือไม่"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"แอปพลิเคชันบนแท็บเล็ตของคุณต้องการเปิดบลูทูธและทำให้อุปกรณ์อื่นค้นพบแท็บเล็ตของคุณได้ คุณจะอนุญาตหรือไม่"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"แอปพลิเคชันบนโทรศัพท์ของคุณต้องการเปิดบลูทูธ และทำให้อุปกรณ์อื่นค้นพบโทรศัพท์ของคุณได้ คุณจะอนุญาตหรือไม่"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"แอปพลิเคชันต้องการเปิดบลูทูธ"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"แอปพลิเคชันต้องการทำให้อุปกรณ์บลูทูธอื่นสามารถมองเห็นแท็บเล็ตของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"แอปพลิเคชันต้องการทำให้อุปกรณ์บลูทูธอื่นสามารถมองเห็นโทรศัพท์ของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"แอปพลิเคชันต้องการทำให้อุปกรณ์บลูทูธอื่นสามารถมองเห็นแท็บเล็ตของคุณได้ คุณสามารถเปลี่ยนการตั้งค่านี้ได้ในภายหลังในการตั้งค่าบลูทูธ"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"แอปพลิเคชันต้องการทำให้อุปกรณ์บลูทูธอื่นสามารถมองเห็นโทรศัพท์ของคุณได้ คุณสามารถเปลี่ยนการตั้งค่านี้ได้ในภายหลังในการตั้งค่าบลูทูธ"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"แอปพลิเคชันต้องการเปิดบลูทูธและทำให้อุปกรณ์อื่นสามารถมองเห็นแท็บเล็ตของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"แอปพลิเคชันต้องการเปิดบลูทูธและทำให้อุปกรณ์อื่นสามารถมองเห็นโทรศัพท์ของคุณได้เป็นเวลา <xliff:g id="TIMEOUT">%1$d</xliff:g> วินาที"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"แอปพลิเคชันต้องการเปิดบลูทูธและทำให้อุปกรณ์อื่นสามารถมองเห็นแท็บเล็ตของคุณได้ คุณสามารถเปลี่ยนการตั้งค่านี้ได้ในภายหลังในการตั้งค่าบลูทูธ"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"แอปพลิเคชันต้องการเปิดบลูทูธและทำให้อุปกรณ์อื่นสามารถมองเห็นโทรศัพท์ของคุณได้ คุณสามารถเปลี่ยนการตั้งค่านี้ได้ในภายหลังในการตั้งค่าบลูทูธ"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"กำลังเปิดบลูทูธ..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"กำลังปิดบลูทูธ…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"เชื่อมต่ออัตโนมัติ"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"พร็อกซี HTTP มีการใช้งานโดยเบราว์เซอร์ แต่อาจไม่มีการใช้งานโดยแอปพลิเคชันอื่น"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"ตำแหน่ง:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID ใกล้เคียง:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"ข้อมูลเซลล์:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"ความพยายามใช้ข้อมูล:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"บริการ GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"โรมมิ่ง:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"การเชื่อมต่อข้อมูลของคุณหายไปเนื่องจากคุณออกจากเครือข่ายที่บ้านโดยปิดการโรมมิ่งข้อมูลไว้"</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"เปิด"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"การอนุญาตการโรมมิ่งข้อมูล อาจทำให้คุณเสียค่าใช้จ่ายมาก!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"เมื่อคุณอนุญาตการโรมมิ่งข้อมูล อาจมีการเรียกเก็บค่าใช้จ่ายเพิ่มเติมจำนวนมากในการโรมมิ่ง!\n\nการตั้งค่านี้ส่งผลต่อผู้ใช้แท็บเล็ตนี้ทุกราย"</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"เมื่อคุณอนุญาตการโรมมิ่งข้อมูล อาจมีการเรียกเก็บค่าใช้จ่ายเพิ่มเติมจำนวนมากในการโรมมิ่ง!\n\nการตั้งค่านี้ส่งผลต่อผู้ใช้โทรศัพท์นี้ทุกราย"</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"อนุญาตการโรมมิ่งข้อมูลหรือไม่"</string>
     <string name="networks" msgid="6333316876545927039">"การเลือกผู้ให้บริการ"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"เลือกผู้ให้บริการเครือข่าย"</string>
@@ -297,6 +307,10 @@
     <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">"ตั้งค่าตำแหน่งของฉัน ปลดล็อกหน้าจอ ล็อกซิมการ์ด ล็อกที่จัดเก็บข้อมูลรับรอง"</string>
@@ -308,8 +322,8 @@
     <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">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมาและข้อมูล สื่อ และไฟล์อื่นๆ ของแอปพลิเคชันนั้นได้ เมื่อคุณเข้ารหัสแท็บเล็ตแล้ว คุณจะต้องพิมพ์รหัส PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสในแต่ละครั้งที่คุณเปิดเครื่อง คุณไม่สามารถถอดรหัสแท็บเล็ตได้เว้นแต่จะทำการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะเป็นการลบข้อมูลทั้งหมด"\n\n"การเข้ารหัสใช้เวลาอย่างน้อยหนึ่งชั่วโมง คุณต้องเริ่มต้นด้วยการใช้แบตเตอรี่ที่ชาร์จไฟแล้วและเสียบปลั๊กแท็บเล็ตไว้จนกว่าการเข้ารหัสจะเสร็จสมบูรณ์ หากมีการขัดจังหวะกระบวนการเข้ารหัส คุณจะสูญเสียข้อมูลบางส่วนหรือทั้งหมดไป"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมาและข้อมูล สื่อ และไฟล์อื่นๆ ของแอปพลิเคชันนั้นได้ เมื่อคุณเข้ารหัสโทรศัพท์แล้ว คุณจะต้องพิมพ์รหัส PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสในแต่ละครั้งที่คุณเปิดเครื่อง คุณไม่สามารถถอดรหัสโทรศัพท์ได้เว้นแต่จะรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะเป็นการลบข้อมูลทั้งหมด"\n\n"การเข้ารหัสใช้เวลาอย่างน้อยหนึ่งชั่วโมง คุณต้องเริ่มต้นด้วยการใช้แบตเตอรี่ที่ชาร์จไฟแล้วและเสียบปลั๊กโทรศัพท์ไว้จนกว่าการเข้ารหัสจะเสร็จสมบูรณ์ หากมีการขัดจังหวะกระบวนการเข้ารหัส คุณจะสูญเสียข้อมูลบางส่วนหรือทั้งหมดไป"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมาและข้อมูล สื่อ และไฟล์อื่นๆ ของแอปพลิเคชันนั้นได้ เมื่อคุณเข้ารหัสแท็บเล็ตแล้ว คุณจะต้องพิมพ์รหัส PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสในแต่ละครั้งที่คุณเปิดเครื่อง คุณไม่สามารถถอดรหัสแท็บเล็ตได้เว้นแต่จะทำการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะเป็นการลบข้อมูลทั้งหมด\n\nการเข้ารหัสใช้เวลาอย่างน้อยหนึ่งชั่วโมง คุณต้องเริ่มต้นด้วยการใช้แบตเตอรี่ที่ชาร์จไฟแล้วและเสียบปลั๊กแท็บเล็ตไว้จนกว่าการเข้ารหัสจะเสร็จสมบูรณ์ หากมีการขัดจังหวะกระบวนการเข้ารหัส คุณจะสูญเสียข้อมูลบางส่วนหรือทั้งหมดไป"</string>
+    <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>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"ลองใหม่อีกครั้งใน <xliff:g id="DELAY">^1</xliff:g> วินาที"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"พิมพ์รหัสผ่านของคุณ"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"การเข้ารหัสไม่สำเร็จ"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณจึงไม่สามารถเข้าถึงข้อมูลในแท็บเล็ตได้อีกต่อไป"\n\n"ในการใช้งานแท็บเล็ตต่อ คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าแท็บเล็ตหลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณจึงไม่สามารถเข้าถึงข้อมูลในโทรศัพท์ได้อีกต่อไป"\n\n"ในการใช้งานโทรศัพท์ต่อ คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าโทรศัพท์หลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณจึงไม่สามารถเข้าถึงข้อมูลในแท็บเล็ตได้อีกต่อไป\n\nในการใช้งานแท็บเล็ตต่อ คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าแท็บเล็ตหลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณจึงไม่สามารถเข้าถึงข้อมูลในโทรศัพท์ได้อีกต่อไป\n\nในการใช้งานโทรศัพท์ต่อ คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าโทรศัพท์หลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"สลับวิธีการป้อนข้อมูล"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"เลือกการล็อกหน้าจอ"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"เลือกการล็อกข้อมูลสำรอง"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"เปลี่ยน PIN สำหรับปลดล็อก"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"เปลี่ยนรหัสผ่านสำหรับปลดล็อก"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"รหัสผ่านจะต้องมีอักขระอย่างน้อย %d ตัว"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN จะต้องมีอักขระอย่างน้อย %d ตัว"</string>
+    <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>
@@ -406,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>
@@ -480,6 +503,28 @@
     <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_empty_list_wifi_display_off" msgid="1225626898926363100">"หากต้องการดูอุปกรณ์ ให้เปิดจอแสดงผลไร้สาย"</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>
+    <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>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"เชื่อมต่อแล้ว"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"มีอยู่"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"กำลังใช้งาน"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"การตั้งค่าการแสดงผล"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"หากต้องการตัดการเชื่อมต่อ"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"การทำเช่นนี้จะยุติการเชื่อมต่อของคุณกับ :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"ตัวเลือกจอแสดงผลไร้สาย"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"ไม่จำ"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"เสร็จสิ้น"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"ชื่อ"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"เปิด"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"ปิด"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"ปิดใช้งานแล้ว"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"อนุญาตให้มีการแลกเปลี่ยนข้อมูลเมื่อแตะแท็บเล็ตกับอุปกรณ์อื่น"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"อนุญาตให้มีการแลกเปลี่ยนข้อมูลเมื่อแตะโทรศัพท์กับอุปกรณ์อื่น"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"ปิด"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"ใช้งานไม่ได้เนื่องจากปิด NFC อยู่"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"เมื่อคุณลักษณะนี้เปิดอยู่ คุณสามารถส่งคลื่นสัญญาณของเนื้อหาของแอปพลิเคชันไปยังอุปกรณ์ที่สามารถใช้ NFC อีกอุปกรณ์หนึ่งได้โดยถืออุปกรณ์ไว้ใกล้กัน ตัวอย่างเช่น คุณสามารถส่งคลื่นสัญญาณของหน้าเบราว์เซอร์, วิดีโอ YouTube, ที่อยู่ติดต่อใน People และอื่นๆ"\n\n"เพียงแค่นำอุปกรณ์มาไว้ใกล้กัน (โดยปกติจะให้ด้านหลังชนกัน) จากนั้นแตะที่หน้าจอ แอปพลิเคชันจะตัดสินใจว่าจะรับคลื่นสัญญาณสำหรับสิ่งใด"</string>
+    <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="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="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="8116564886303972764">"ป้อน 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_in_progress" msgid="2944576520214787628">"WPS กำลังดำเนินการอยู่และอาจใช้เวลานานถึงสองนาทีจึงจะเสร็จสิ้น"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"ไม่สนับสนุนการตั้งค่าความปลอดภัยของเราเตอร์ไร้สาย (TKIP)"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"การตรวจสอบสิทธิ์ล้มเหลว โปรดลองอีกครั้ง"</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"พบเซสชัน WPS อีกหนึ่งเซสชัน โปรดลองอีกครั้งในอีกสักครู่"</string>
     <string name="wifi_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>
@@ -564,6 +621,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>
@@ -571,8 +631,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_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi ขั้นสูง"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"ย่านความถี่ Wi-Fi"</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="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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"กำลังค้นหา…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"เปลี่ยนชื่ออุปกรณ์"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"อุปกรณ์สำหรับ Peer"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"กลุ่มที่จดจำ"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"ไม่สามารถเชื่อมต่อ"</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"ไม่สามารถเปลี่ยนชื่ออุปกรณ์"</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"ตัดการเชื่อมต่อหรือไม่"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"หากคุณตัดการเชื่อมต่อ จะเป็นการสิ้นสุดการเชื่อมต่อของคุณกับ <xliff:g id="PEER_NAME">%1$s</xliff:g> และอุปกรณ์อื่นอีก <xliff:g id="PEER_COUNT">%2$s</xliff:g> รายการ"</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ยกเลิกข้อความเชิญหรือไม่"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"คุณต้องการยกเลิกข้อความเชิญเพื่อเชื่อมต่อกับ <xliff:g id="PEER_NAME">%1$s</xliff:g> หรือไม่"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Wi-Fi ฮอตสปอตแบบพกพา"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ไม่จำกลุ่มนี้ใช่หรือไม่"</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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"เอฟเฟ็กต์เพลง"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"ระดับความดังเสียงเรียกเข้า"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"สั่นเตือนเมื่อปิดเสียง"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"ค่าการแจ้งเตือนเริ่มต้น"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"เสียงแจ้งเตือนเริ่มต้น"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"ไฟแจ้งเตือนพัลซ์"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"เสียงเรียกเข้า"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"การแจ้งเตือน"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"ใช้ระดับเสียงของสายเรียกเข้าเพื่อแจ้งเตือน"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"เลือกเสียงสำหรับการแจ้งเตือน"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"เสียงแจ้งเตือนเริ่มต้น"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"สื่อ"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"ตั้งค่าระดับเสียงสำหรับเพลงและวิดีโอ"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"ปลุก"</string>
@@ -671,15 +743,16 @@
     <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="3848608373818910549">"หน้าจอ Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"จะเริ่มเมื่อเข้าสู่โหมดสลีปหากชาร์จไฟ"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"ปิดใช้งานแล้ว"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Candy ที่เลือก"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"เวลาที่เปิดใช้งาน"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"หลังจากไม่มีกิจกรรมเป็นเวลา <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"ไม่เลย"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"ลองใช้!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"เริ่มต้นเมื่อวางบนแท่นชาร์จด้วย"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</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_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>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN ของซิม"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN ไม่ถูกต้อง"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN ไม่ตรงกัน"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"ไม่สามารถเปลี่ยน PIN"\n"PIN อาจไม่ถูกต้อง"</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"ไม่สามารถเปลี่ยน PIN\nPIN อาจไม่ถูกต้อง"</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"เปลี่ยนซิม PIN สำเร็จแล้ว"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"เปลี่ยนสถานะการล็อกซิมการ์ดไม่ได้"\n"PIN อาจไม่ถูกต้อง"</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"เปลี่ยนสถานะการล็อกซิมการ์ดไม่ได้\nPIN อาจไม่ถูกต้อง"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"ตกลง"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ยกเลิก"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"สถานะแท็บเล็ต"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"เวอร์ชันเบสแบนด์"</string>
     <string name="kernel_version" msgid="9192574954196167602">"เวอร์ชันเคอร์เนล"</string>
     <string name="build_number" msgid="3075795840572241758">"หมายเลขบิวด์"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"สถานะ SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"ใช้งานไม่ได้"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"สถานะ"</string>
     <string name="device_status" msgid="607405385799807324">"สถานะ"</string>
@@ -733,12 +807,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">"ประเภทเครือข่ายมือถือ"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"ข้อมูลผู้ให้บริการ"</string>
     <string name="status_data_state" msgid="5503181397066522950">"สถานะเครือข่ายมือถือ"</string>
     <string name="status_service_state" msgid="2323931627519429503">"สถานะบริการ"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"ความแรงสัญญาณ"</string>
     <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>
@@ -748,14 +823,16 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"ที่เก็บข้อมูล USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"การ์ด SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"ว่าง"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"สามารถใช้งานได้ (แบบอ่านอย่างเดียว)"</string>
     <string name="memory_size" msgid="6629067715017232195">"พื้นที่ทั้งหมด"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"กำลังคำนวณ..."</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>
-    <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>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"ยกเลิกการต่อเชื่อมการ์ด SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"ยกเลิกการต่อเชื่อมที่เก็บข้อมูล USB ภายใน"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"ลบการ์ด SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"ลบข้อมูลทั้งหมดบนที่เก็บข้อมูล USB ภายใน เช่น เพลงและรูปภาพ"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"ลบข้อมูลทั้งหมดบนการ์ด SD เช่น เพลงและรูปภาพ"</string>
-    <string name="read_only" msgid="6702420168629076340">" (อ่านอย่างเดียว)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"ล้างข้อมูลในแคชหรือไม่"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"การทำงานนี้จะล้างข้อมูลในแคชของทุกแอปพลิเคชัน"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"เปิดใช้งานฟังก์ชัน MTP หรือ PTP อยู่"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"ถอดที่จัดเก็บ USB หรือไม่"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"ยกเลิกการต่อเชื่อมการ์ด SD หรือไม่"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"หากคุณยกเลิกการต่อเชื่อมที่จัดเก็บข้อมูล USB แอปพลิเคชันบางอย่างที่คุณใช้งานอยู่จะหยุดทำงานและอาจไม่สามารถใช้งานได้จนกว่าคุณจะต่อเชื่อมที่จัดเก็บข้อมูล USB อีกครั้ง"</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"กล้องถ่ายรูป (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"ช่วยให้คุณถ่ายโอนภาพได้โดยใช้ซอฟต์แวร์กล้องถ่ายรูปและถ่ายโอนไฟล์ใด ๆ บนคอมพิวเตอร์ที่ไม่สนับสนุน MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"ติดตั้งเครื่องมือถ่ายโอนไฟล์"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"ผู้ใช้รายอื่นๆ"</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>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"รีเซ็ตข้อมูลเป็นค่าเริ่มต้น"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"ลบข้อมูลทั้งหมดบนแท็บเล็ต"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"ลบข้อมูลทั้งหมดบนโทรศัพท์"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"ของแท็บเล็ตของคุณ ซึ่งประกอบด้วย"\n\n<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลด"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"ของโทรศัพท์ของคุณ ซึ่งประกอบด้วย"\n\n<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลด"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ขณะนี้คุณได้ลงชื่อเข้าใช้บัญชีต่อไปนี้แล้ว:"\n</string>
+    <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>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"หากต้องการล้างข้อมูลเพลง รูปภาพ และข้อมูลผู้ใช้อื่นๆ คุณต้องลบ"<b>"การ์ด SD"</b></string>
@@ -897,10 +979,15 @@
     <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="manage_mobile_plan_title" msgid="7588182101738043593">"จัดการแผนบริการข้อมูลบนมือถือ"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"ผู้ให้บริการซิมที่ไม่รู้จัก"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s ไม่มีเว็บไซต์การจัดสรรที่รู้จัก"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"โปรดใส่ซิมการ์ดและรีสตาร์ท"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"โปรดเชื่อมต่ออินเทอร์เน็ต"</string>
     <string name="location_title" msgid="1029961368397484576">"ตำแหน่งของฉัน"</string>
-    <string name="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>
@@ -910,13 +997,14 @@
     <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>
     <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="copyright_title" msgid="865906688917260647">"ลิขสิทธิ์"</string>
     <string name="license_title" msgid="1990487604356037871">"สัญญาอนุญาต"</string>
     <string name="terms_title" msgid="7697580845616764642">"ข้อกำหนดในการให้บริการ"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"เปลี่ยน PIN สำหรับปลดล็อก"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"ยืนยันรูปแบบที่บันทึก"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"ลองอีกครั้ง:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"วาดรูปแบบการปลดล็อก"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"ลากรูปแบบสำหรับปลดล็อก"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"กด เมนู เพื่อขอความช่วยเหลือ"</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"ปล่อยนิ้วเมื่อเสร็จแล้ว"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"โยงอย่างน้อย <xliff:g id="NUMBER">%d</xliff:g> จุด ลองใหม่อีกครั้ง:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"วิธีวาดรูปแบบการปลดล็อก"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"ลองผิดหลายครั้งมากเกินไป!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"ลองใหม่อีกครั้งใน <xliff:g id="NUMBER">%d</xliff:g> วินาที"</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"ยกเลิก"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"ถัดไป"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"การรักษาความปลอดภัยแท็บเล็ตของคุณ"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"การป้องกันโทรศัพท์ของคุณ"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"ปกป้องแท็บเล็ตของคุณจากการใช้งานที่ไม่ได้รับอนุญาตด้วยการสร้างรูปแบบการปลดล็อกหน้าจอส่วนบุคคล เลื่อนนิ้วเพื่อเชื่อมต่อจุดต่างๆ ในลำดับใดก็ได้บนหน้าจอถัดไป คุณต้องเชื่อมต่อจุดอย่างน้อยสี่จุด"\n\n"เมื่อพร้อมที่จะเริ่มแล้ว ให้แตะ \"ถัดไป\""</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"ปกป้องโทรศัพท์ของคุณจากการใช้งานที่ไม่ได้รับอนุญาต โดยสร้างรูปแบบการปลดล็อกหน้าจอส่วนบุคคล เลื่อนนิ้วของคุณเพื่อเชื่อมต่อจุดอย่างน้อยสี่จุดในลำดับใดก็ได้ในหน้าจอถัดไป"\n\n"เมื่อพร้อมที่จะเริ่มแล้ว ให้แตะ \"ถัดไป\""</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"ไม่ได้ติดตั้งแอปพลิเคชันบนโทรศัพท์ของคุณ"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"จัดการแอปพลิเคชัน"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"จัดการและนำแอปพลิเคชันที่ติดตั้งไว้ออก"</string>
     <string name="applications_settings" msgid="1721442176406964682">"แอปพลิเคชัน"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"อนุญาตให้ติดตั้งแอปพลิเคชันจากแหล่งที่ไม่รู้จัก"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"แท็บเล็ตและข้อมูลส่วนบุคคลของคุณมีความเสี่ยงสูงยิ่งขึ้นที่จะถูกโจมตีโดยแอปพลิเคชันที่มาจากแหล่งที่ไม่รู้จัก คุณยอมรับว่าคุณเป็นผู้รับผิดชอบแต่เพียงผู้เดียวต่อความเสียหายของแท็บเล็ตหรือการสูญหายของข้อมูลที่อาจเป็นผลจากการใช้แอปพลิเคชันเหล่านี้"</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"โทรศัพท์และข้อมูลส่วนบุคคลของคุณมีความเสี่ยงยิ่งขึ้นที่จะถูกโจมตีจากแอปพลิเคชันที่ไม่รู้จักแหล่งที่มา คุณยอมรับว่าคุณจะเป็นผู้รับผิดชอบแต่เพียงผู้เดียวต่อความเสียหายใดๆ ที่เกิดกับโทรศัพท์หรือหรือการสูญเสียข้อมูลที่เป็นผลจากการใช้แอปพลิเคชันเหล่านี้"</string>
+    <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="application_info_label" msgid="5736524913065714880">"ข้อมูลแอปพลิเคชัน"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"ข้อมูลที่จัดเก็บใน USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"การ์ด SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"ถอนการติดตั้ง"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"ถอนการติดตั้งสำหรับผู้ใช้ทั้งหมด"</string>
+    <string name="install_text" msgid="884360662922471113">"ติดตั้ง"</string>
     <string name="disable_text" msgid="6544054052049395202">"ปิดใช้งาน"</string>
     <string name="enable_text" msgid="9217362512327828987">"เปิดใช้งาน"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"ล้างข้อมูล"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"แสดงกระบวนการที่เก็บแคชไว้"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"รีเซ็ตค่ากำหนดแอปพลิเคชัน"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"รีเซ็ตค่ากำหนดแอปหรือไม่"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"คำสั่งนี้จะรีเซ็ตค่ากำหนดทั้งหมดของ:"\n\n<li>"แอปพลิเคชันที่ปิดใช้งาน"</li>\n<li>"การแจ้งเตือนของแอปพลิเคชันที่ปิดใช้งาน"</li>\n<li>"แอปพลิเคชันเริ่มต้นที่จะใช้งาน"</li>\n<li>"ข้อจำกัดของข้อมูลแบ็กกราวด์เกี่ยวกับการใช้แอปพลิเคชัน"</li>\n\n"ข้อมูลแอปพลิเคชันทั้งหมดของคุณจะยังคงอยู่เหมือนเดิม"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"คำสั่งนี้จะรีเซ็ตค่ากำหนดทั้งหมดของ:\n\n"<li>"แอปพลิเคชันที่ปิดใช้งาน"</li>\n<li>"การแจ้งเตือนของแอปพลิเคชันที่ปิดใช้งาน"</li>\n<li>"แอปพลิเคชันเริ่มต้นที่จะใช้งาน"</li>\n<li>"ข้อจำกัดของข้อมูลแบ็กกราวด์เกี่ยวกับการใช้แอปพลิเคชัน"</li>\n\n"ข้อมูลแอปพลิเคชันทั้งหมดของคุณจะยังคงอยู่เหมือนเดิม"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"รีเซ็ตแอปพลิเคชัน"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"จัดการพื้นที่"</string>
     <string name="filter" msgid="2018011724373033887">"ตัวกรอง"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"เลือกตัวเลือกตัวกรอง"</string>
     <string name="filter_apps_all" msgid="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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"บนการ์ด SD"</string>
     <string name="disabled" msgid="9206776641295849915">"ปิดใช้งานแล้ว"</string>
+    <string name="not_installed" msgid="1475144352069281880">"ไม่ได้ติดตั้ง"</string>
     <string name="no_applications" msgid="7336588977497084921">"ไม่มีแอปพลิเคชัน"</string>
     <string name="internal_storage" msgid="1584700623164275282">"ที่เก็บข้อมูลภายใน"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"ที่เก็บข้อมูล USB"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> และ <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"แอปพลิเคชันนี้อาจมีการเรียกเก็บเงิน:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"ส่ง SMS พรีเมียม"</string>
     <string name="computing_size" msgid="1599186977475211186">"กำลังคำนวณ..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"คำนวณขนาดแพคเกจไม่ได้"</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"คุณไม่ได้ติดตั้งแอปพลิเคชันของบุคคลที่สามไว้เลย"</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"เปลี่ยนตำแหน่งติดตั้งที่ต้องการสำหรับแอปพลิเคชันใหม่"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"ปิดแอปพลิเคชันในตัวหรือไม่"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"หากคุณปิดใช้งานแอปพลิเคชันในตัว แอปพลิเคชันอื่นๆ อาจทำงานผิดปกติได้"</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"ลบข้อมูลและปิดใช้งานแอปพลิเคชันหรือไม่"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"ผู้ใช้: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"นำผู้ใช้ออกแล้ว"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> กระบวนการและ <xliff:g id="NUMSERVICES">%2$d</xliff:g> บริการ"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> กระบวนการและ <xliff:g id="NUMSERVICES">%2$d</xliff:g> บริการ"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> กระบวนการและ <xliff:g id="NUMSERVICES">%2$d</xliff:g> บริการ"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"การตั้งค่าแป้นพิมพ์บนเครื่อง"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"กดปุ่ม Space สองครั้งเพื่อแทรก \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"กำหนดให้เห็นรหัสผ่านได้"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></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>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"หากต้องการสลับ กด Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"ค่าเริ่มต้น"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"รูปแบบแป้นพิมพ์"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"พจนานุกรมของผู้ใช้"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"พจนานุกรมส่วนบุคคล"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"พจนานุกรมส่วนบุคคล"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"พจนานุกรมส่วนตัว"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"เพิ่ม"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"เพิ่มลงในพจนานุกรม"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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="bt_hci_snoop_log" msgid="3340699311158865670">"เปิดใช้งานบันทึกสอดแนมบลูทูธ HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"บันทึกแพ็คเก็ตบลูทูธ HCI ทั้งหมดในไฟล์"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"เลือกรันไทม์"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"เลือกรันไทม์"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"รีบูตเพื่อเปลี่ยนรันไทม์จาก <xliff:g id="OLD">%1$s</xliff:g> เป็น <xliff:g id="NEW">%2$s</xliff:g> ไหม"</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>
+    <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>
-    <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_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="enable_terminal_title" msgid="95572094356054120">"เทอร์มินัลในตัวเครื่อง"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"เปิดใช้งานแอปเทอร์มินัลที่ให้การเข้าถึงเชลล์ในตัวเครื่อง"</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>
@@ -1234,29 +1345,43 @@
     <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_toggle_large_text_title" msgid="6618674985313017711">"ข้อความขนาดใหญ่"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"กดปุ่มเปิด/ปิดเพื่อวางสาย"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"พูดรหัสผ่าน"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"การหน่วงเวลาด้วยการแตะค้างไว้"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"ปรับปรุงการเข้าถึงเว็บให้ดียิ่งขึ้น"</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>
+    <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_toggle_speak_password_preference_title" msgid="5986628515113204844">"พูดรหัสผ่าน"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"การหน่วงเวลาด้วยการแตะค้างไว้"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"การตั้งค่า"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"เปิด"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"ปิด"</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="accessibility_feature_state_on" msgid="2864292320042673806">"เปิด"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"ปิด"</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="print_settings" msgid="4742428530112487843">"การพิมพ์"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"การตั้งค่าการพิมพ์"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"บริการ"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"ใช้ <xliff:g id="SERVICE">%1$s</xliff:g> หรือไม่"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> สามารถรับเอกสารที่คุณพิมพ์ เอกสารดังกล่าวอาจมีข้อมูลละเอียดอ่อน"</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"ไม่ได้ติดตั้งบริการใดไว้"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"การตั้งค่า"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"เพิ่มเครื่องพิมพ์"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"เปิด"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"ปิด"</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>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"ข้อมูลที่ได้รับ"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"ข้อมูลมือถือที่ส่ง"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"ข้อมูลมือถือที่ได้รับ"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"ข้อมูล WiFi ที่ส่ง"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"ข้อมูล WiFi ที่ได้รับ"</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>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"หยุดหรือถอนการติดตั้งแอปพลิเคชัน"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"ควบคุม GPS ด้วยตนเองเพื่อป้องกันไม่ให้แอปพลิเคชันใช้งาน GPS"</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>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"ความสูง-ต่ำของเสียง"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"มีผลต่อโทนเสียงของข้อความที่พูด"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"ภาษา"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"ไม่ได้เลือกภาษา"</string>
     <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>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"ความสว่าง <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"อัตโนมัติ"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"สูงสุด"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"ครึ่งหนึ่ง"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"ปิด"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"ที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ติดตั้งจากที่เก็บข้อมูล"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <string name="backup_section_title" msgid="7952232291452882740">"การสำรองและคืนค่าข้อมูล"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"ข้อมูลส่วนตัว"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"สำรองข้อมูลของฉัน"</string>
-    <string name="backup_data_summary" msgid="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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"เมื่อติดตั้งแอปพลิเคชันใหม่อีกครั้ง ให้คืนค่าการตั้งค่าและข้อมูลที่สำรองไว้"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"ใช้รายงานข้อผิดพลาด"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"การดำเนินการนี้จะรวบรวมข้อมูลเกี่ยวกับสถานะปัจจุบันของอุปกรณ์ของคุณ โดยจะส่งไปในรูปแบบข้อความอีเมล อาจใช้เวลาสักครู่ตั้งแต่เริ่มการสร้างรายงานข้อผิดพลาดจนกระทั่งเสร็จสมบูรณ์ โปรดอดทนรอ"</string>
-    <string name="report" msgid="302437572240018342">"รายงาน"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"รหัสผ่านการสำรองข้อมูลในเดสก์ท็อป"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"การสำรองข้อมูลเต็มรูปแบบในเดสก์ท็อปไม่ได้รับการป้องกันในขณะนี้"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"แตะเพื่อเปลี่ยนหรือลบรหัสผ่านสำหรับการสำรองข้อมูลเต็มรูปแบบในเดสก์ท็อป"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"แฟลชพื้นผิวหน้าต่างทั้งหมดเมื่อมีการอัปเดต"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"แสดงการอัปเดตมุมมอง GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"แฟลชมุมมองภายในหน้าต่างเมื่อวาดด้วย GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"แสดงอัปเดตเลเยอร์ฮาร์ดแวร์"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"เลเยอร์ฮาร์ดแวร์กะพริบเป็นสีเขียวเมื่อมีการอัปเดต"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"ดีบักการวาดทับ GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"แสดงการใช้ CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"การวางซ้อนหน้าจอที่แสดงการใช้ CPU ในปัจจุบัน"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"เร่งการแสดงผลของ GPU"</string>
     <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>
+    <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>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"ล้างทุกกิจกรรมทันทีที่ผู้ใช้ออกไป"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <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" msgid="1466689968707308512">"คุณลักษณะนี้อาจทำให้แอปพลิเคชันที่ต้องอาศัยข้อมูลแบ็กกราวด์หยุดทำงานเมื่อมีแต่เครือข่ายมือถือเท่านั้นที่ใช้งานได้"\n\n"คุณสามารถดูการควบคุมการใช้งานข้อมูลที่เหมาะสมกว่านี้ได้ในการตั้งค่าที่มีอยู่ภายในแอปพลิเคชัน"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"คุณลักษณะนี้อาจทำให้แอปพลิเคชันที่ต้องอาศัยข้อมูลแบ็กกราวด์หยุดทำงานเมื่อมีแต่เครือข่ายมือถือเท่านั้นที่ใช้งานได้\n\nคุณสามารถดูการควบคุมการใช้งานข้อมูลที่เหมาะสมกว่านี้ได้ในการตั้งค่าที่มีอยู่ภายในแอปพลิเคชัน"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="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>
@@ -1620,22 +1769,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">"หากคุณจำกัดข้อมูลแบ็กกราวด์บนมือถือ แอปพลิเคชันและบริการบางอย่างจะไม่ทำงานจนกว่าคุณจะเชื่อมต่อกับเครือข่าย WiFi"</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>
+    <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_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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"เพิ่มโปรไฟล์ VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"แก้ไขโปรไฟล์"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"ลบโปรไฟล์"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN แบบเปิดตลอดเวลา"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"เลือกโปรไฟล์ VPN เพื่อคงการเชื่อมต่อเอาไว้ตลอดเวลา การจราจรบนเครือข่ายจะได้รับอนุญาตเฉพาะเมื่อมีการเชื่อมต่อกับ VPN นี้เท่านั้น"</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"ไม่มี"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPN แบบเปิดตลอดเวลาจำเป็นต้องใช้ที่อยู่ IP ทั้งสำหรับเซิร์ฟเวอร์และ DNS"</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"ไม่มีการเชื่อมต่อเครือข่าย โปรดลองอีกครั้งในภายหลัง"</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"ไม่มีใบรับรอง โปรดแก้ไขโปรไฟล์"</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"ระบบ"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ยกเลิก"</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">"การอัปเดตระบบอื่นๆ"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"ผู้ใช้และข้อจำกัด"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"ผู้ใช้"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"เพิ่มผู้ใช้"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"แก้ไขรายละเอียด"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"ข้อมูลผู้ใช้"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"ชื่อ"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"การจำกัดเนื้อหา"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"ต้องใช้ PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"การให้คะแนนเนื้อหา"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"แอปพลิเคชันระบบ"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"แอปพลิเคชันที่ติดตั้ง"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"ยกเลิก"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"นำผู้ใช้ออก"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"เด็กงอแง"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"ปิดใช้งานแล้ว"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"อนุญาต"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"บังคับใช้งาน"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"ผู้ใช้"</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="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_confirm_remove_message" msgid="5284111415714437285">"คุณแน่ใจหรือไม่ว่าต้องการนำผู้ใช้นี้และข้อมูลทั้งหมดที่เกี่ยวข้องออกจากอุปกรณ์"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"เปลี่ยนขนาดแบบอักษร"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"ข้อจำกัด"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"ลบข้อจำกัด"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"เปลี่ยน PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"แสดงการแจ้งเตือน"</string>
     <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_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="6160672982086584261">"ตั้งข้อจำกัดแอป"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"ควบคุมโดย <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"แอปนี้ไม่ได้รับการสนับสนุนในโปรไฟล์ที่ถูกจำกัด"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"แอปนี้สามารถเข้าถึงบัญชีของคุณ"</string>
+    <string name="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 d305b78..80985ae 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,16 +218,127 @@
     <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="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"mga button ng media"</item>
+    <item msgid="4547883971364273343">"focus ng audio"</item>
+    <item msgid="2603878814882344450">"master na volume"</item>
+    <item msgid="7136963238377062018">"volume ng boses"</item>
+    <item msgid="4270236897655923007">"volume ng ring"</item>
+    <item msgid="6325739889222559394">"volume ng media"</item>
+    <item msgid="5762123934816216821">"volume ng alarma"</item>
+    <item msgid="785049718065337473">"volume ng notification"</item>
+    <item msgid="6700305533746877052">"volume ng bluetooth"</item>
+    <item msgid="2029227495214047094">"panatilihing bukas"</item>
+    <item msgid="26109888160231211">"subaybayan ang lokasyon"</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>
+    <item msgid="5753789168376302997">"Mga media button"</item>
+    <item msgid="3265262911688671938">"Focus ng audio"</item>
+    <item msgid="2098976479485046797">"Master volume"</item>
+    <item msgid="5660213838861789350">"Volume ng boses"</item>
+    <item msgid="7983336752371254444">"Volume ng pag-ring"</item>
+    <item msgid="7878027809189330917">"Volume ng media"</item>
+    <item msgid="7260546305036218513">"Volume ng alarm"</item>
+    <item msgid="9103719301075748925">"Volume ng notification"</item>
+    <item msgid="7025966722295861512">"Volume ng Bluetooth"</item>
+    <item msgid="4665183401128289653">"Panatilihing bukas"</item>
+    <item msgid="8584357129746649222">"Lokasyon"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Maikli"</item>
     <item msgid="2560532955514699713">"Katamtaman"</item>
     <item msgid="2372711992605524591">"Mahaba"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (debug)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Gamitin ang Dalvik"</item>
+    <item msgid="5131846588686178907">"Gamitin ang ART"</item>
+    <item msgid="4530003713865319928">"Gamitin ang build sa pag-debug ng ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Huwag kailanman suriin"</item>
     <item msgid="6042769699089883931">"Suriin lang para sa nilalamang DRM"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Scale ng animation 5x"</item>
     <item msgid="1069584980746680398">"Scale ng animation 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Wala"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi at 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Wala"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"I-off"</item>
+    <item msgid="7688197031296835369">"Tingnan ang mga overdraw na bahagi"</item>
+    <item msgid="8332661909019981149">"Ipakita ang overdraw na counter"</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>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Timeout"</item>
     <item msgid="7664124146786465092">"Hindi matagumpay"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Magtanong"</item>
+    <item msgid="5077768429488260031">"Huwag kailanman payagan"</item>
+    <item msgid="1417929597727989746">"Palaging payagan"</item>
+  </string-array>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index cd5fe0f..30f8865 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Oo"</string>
     <string name="no" msgid="6731231425810196216">"Hindi"</string>
     <string name="create" msgid="3578857613172647409">"Likhain"</string>
+    <string name="allow" msgid="3349662621170855910">"Payagan"</string>
+    <string name="deny" msgid="6947806159746484865">"Tanggihan"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Hindi Kilala"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> (na) hakbang na lang ang layo mo mula sa pagiging isang developer."</item>
+    <item quantity="other" msgid="6722953419953594148">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> (na) hakbang na lang ang layo mo mula sa pagiging isang developer."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Isa ka nang developer!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Hindi na kailangan, isa ka nang developer."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS &amp; MGA NETWORK"</string>
     <string name="header_category_device" msgid="5781174212691167553">"DEVICE"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Pag-charge"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Pagdiskarga"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(wireless)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Hindi nagcha-charge"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Hindi nagkakarga"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Buo"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Naka-unplug"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"wireless"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Hindi Kilala"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Hindi Kilala"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Hindi kilalang error"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Malamig"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Natutuklas"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Makikita ng lahat ng mga kalapit na device ng Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Makikita ng lahat ng kalapit na mga Bluetooth na device"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Hindi makikita ng iba pang mga device ng Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Makikita lamang ng mga nakapares na device"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Gawing natutuklas ang device"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Timeout ng visibility"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Itakda kung gaano katagal magiging natutuklasan ang aparato"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"I-lock ang pag-dial gamit ang boses"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Iwasan ang paggamit ng taga-dial ng bluetooth kapag naka-lock ang screen"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Mga device ng bluetooth"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Ipakita ang mga natanggap na file"</string>
     <string name="device_picker" msgid="8398232791303186677">"Tagapili ng device ng Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Kahilingan sa pahintulot ng bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Nais na i-on ng isang app ang Bluetooth. Payagan?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Nais ng isang app sa iyong tablet na gawing natutuklasan ng iba pang mga Bluetooth device ang iyong tablet sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo. Payagan?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Nais ng isang app sa iyong telepono na gawing natutuklasan ng iba pang mga Bluetooth device ang iyong telepono sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo. Payagan?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Nais ng isang app sa iyong tablet na gawing \"palaging natutuklasan\" ng iba pang mga Bluetooth device ang iyong tablet. Payagan?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Nais ng isang app sa iyong telepono na gawing \"palaging natutuklasan\" ang iyong telepono ng iba pang mga Bluetooth device. Payagan?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Nais ng isang app sa iyong tablet na i-on ang Bluetooth at gawing natutuklasan ng iba pang mga device ang iyong tablet sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo. Payagan?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Nais na i-on ng isang app sa iyong telepono ang Bluetooth at gawing natutuklasan ng iba pang mga device ang iyong telepono sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo. Payagan?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Nais ng isang app sa iyong tablet na i-on ang Bluetooth at gawing natutuklasan ng iba pang mga device ang iyong tablet. Payagan?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Nais na i-on ng isang app sa iyong telepono ang Bluetooth at gawing natutuklasan ng iba pang mga device ang iyong telepono. Payagan?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Gustong i-on ng isang app ang Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Gusto ng isang app na gawing nakikita ng iba pang mga Bluetooth device ang iyong tablet sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Gusto ng isang app na gawing nakikita ng iba pang mga Bluetooth device ang iyong telepono sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Gusto ng isang app na gawing nakikita ng iba pang mga Bluetooth device ang iyong tablet. Maaari mo itong palitan sa ibang pagkakataon sa mga setting ng Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Gusto ng isang app na gawing nakikita ng iba pang mga Bluetooth device ang iyong telepono. Maaari mo itong palitan sa ibang pagkakataon sa mga setting ng Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Gustong i-on ng isang app ang Bluetooth at gawing nakikita ng iba pang mga device ang iyong tablet sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Gustong i-on ng isang app ang Bluetooth at gawing nakikita ng iba pang mga device ang iyong telepono sa loob ng <xliff:g id="TIMEOUT">%1$d</xliff:g> (na) segundo."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Gustong i-on ng isang app ang Bluetooth at gawing nakikita ng iba pang mga device ang iyong tablet. Maaari mo itong palitan sa ibang pagkakataon sa mga setting ng Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Gustong i-on ng isang app ang Bluetooth at gawing nakikita ng iba pang mga device ang iyong telepono. Maaari mo itong palitan sa ibang pagkakataon sa mga setting ng Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Binubuksan ang Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"I-no-off ang Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Auto-connect"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Ang HTTP proxy ay ginagamit ng browser ngunit hindi maaaring gamitin ng iba pang apps."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasyon:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Katabing CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Mga pagtatangka ng data:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Serbisyong GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Nawala ang koneksyon ng data dahil iniwan mo ang iyong home network na naka-off ang roaming ng data."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"I-on ito"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Kapag pinayagan mo ang roaming ng data, maaari kang magkamit ng makabuluhang mga pagsingil sa roaming!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Kapag papayagan mo ang roaming ng data, maaari kang magkaroon ng malalaking singilin sa roaming!\n\nNakakaapekto ang setting na ito sa lahat ng user sa tablet na ito."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Kapag papayagan mo ang roaming ng data, maaari kang magkaroon ng malalaking singilin sa roaming!\n\nNakakaapekto ang setting na ito sa lahat ng user sa teleponong ito."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Payagan ang roaming ng data?"</string>
     <string name="networks" msgid="6333316876545927039">"Pagpipilian ng operator"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Pumili ng isang tagapagpatakbo ng network"</string>
@@ -279,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>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Impo ng may-ari"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Humiling ng numerong PIN o password upang i-decrypt ang iyong tablet sa bawat oras na i-on mo ito"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Humiling ng numerong PIN o password upang i-decrypt ang iyong telepono sa bawat oras na i-on mo ito"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Na-encrypt"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na apps at data ng mga ito, media, at iba pang mga file. Sa sandaling ma-encrypt mo ang iyong tablet, kailangan mong mag-type ng numeric na PIN o password upang i-decrypt ito sa tuwing i-o-on mo ito. Hindi mo maaaring i-decrypt ang iyong tablet maliban sa pamamagitan ng pagsasagawa ng pag-reset ng factory data, na bubura sa lahat ng iyong data."\n\n"Tumatagal nang isang oras o higit pa ang pag-encrypt. Dapat kang magsimula nang may naka-charge na baterya at panatilihing naka-plug in ang iyong tablet hanggang sa makumpleto ang pag-encrypt. Kung aantalahin mo ang proseso ng pag-encrypt, mawawala mo ang ilan o lahat ng iyong data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na apps at data ng mga ito, media, at iba pang mga file. Sa sandaling ma-encrypt mo ang iyong telepono, kailangan mong mag-type ng numeric na PIN o password upang i-decrypt ito sa tuwing i-o-on mo ito. Hindi mo maaaring i-decrypt ang iyong telepono maliban sa pamamagitan ng pagsasagawa ng pag-reset ng factory data, na bubura sa lahat ng iyong data."\n\n"Tumatagal nang isang oras o higit pa ang pag-encrypt. Dapat kang magsimula nang may naka-charge na baterya at panatilihing naka-plug in ang iyong telepono hanggang sa makumpleto ang pag-encrypt. Kung aantalahin mo ang proseso ng pag-encrypt, mawawala mo ang ilan sa o lahat ng iyong data."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na apps at data ng mga ito, media, at iba pang mga file. Sa sandaling ma-encrypt mo ang iyong tablet, kailangan mong mag-type ng numeric na PIN o password upang i-decrypt ito sa tuwing i-o-on mo ito. Hindi mo maaaring i-decrypt ang iyong tablet maliban sa pamamagitan ng pagsasagawa ng pag-reset ng factory data, na bubura sa lahat ng iyong data.\n\nTumatagal nang isang oras o higit pa ang pag-encrypt. Dapat kang magsimula nang may naka-charge na baterya at panatilihing naka-plug in ang iyong tablet hanggang sa makumpleto ang pag-encrypt. Kung aantalahin mo ang proseso ng pag-encrypt, mawawala mo ang ilan o lahat ng iyong data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na apps at data ng mga ito, media, at iba pang mga file. Sa sandaling ma-encrypt mo ang iyong telepono, kailangan mong mag-type ng numeric na PIN o password upang i-decrypt ito sa tuwing i-o-on mo ito. Hindi mo maaaring i-decrypt ang iyong telepono maliban sa pamamagitan ng pagsasagawa ng pag-reset ng factory data, na bubura sa lahat ng iyong data.\n\nTumatagal nang isang oras o higit pa ang pag-encrypt. Dapat kang magsimula nang may naka-charge na baterya at panatilihing naka-plug in ang iyong telepono hanggang sa makumpleto ang pag-encrypt. Kung aantalahin mo ang proseso ng pag-encrypt, mawawala mo ang ilan sa o lahat ng iyong data."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"I-encrypt ang tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"I-encrypt ang telepono"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"I-charge ang iyong baterya at subukang muli."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Subukang muli sa loob ng <xliff:g id="DELAY">^1</xliff:g> (na) segundo."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"I-type ang iyong password"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Hindi matagumpay ang pag-encrypt"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Nagambala at hindi makumpleto ang pag-encrypt. Bilang resulta, hindi na maa-access ang data sa iyong telepono. "\n\n"Upang patuloy na magamit ang iyong tablet, kailangan mong magsagawa ng factory reset. Kapag na-set up mo ang iyong tablet pagkatapos ng pag-reset, magkakaroon ka ng pagkakataong magbalik ng anumang data na na-back up sa iyong Google Account."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Nagambala at hindi makumpleto ang pag-encrypt. Bilang resulta, hindi na maa-access ang data sa iyong telepono. "\n\n"Upang patuloy na magamit ang iyong telepono, kailangan mong magsagawa ng factory reset. Kapag na-set up mo ang iyong telepono pagkatapos ng pag-reset, magkakaraoon ka ng pagkakataong magbalik ng anumang data na na-back up sa iyong Google Account."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Nagambala at hindi makumpleto ang pag-encrypt. Bilang resulta, hindi na maa-access ang data sa iyong telepono. \n\nUpang patuloy na magamit ang iyong tablet, kailangan mong magsagawa ng factory reset. Kapag na-set up mo ang iyong tablet pagkatapos ng pag-reset, magkakaroon ka ng pagkakataong magbalik ng anumang data na na-back up sa iyong Google Account."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Nagambala at hindi makumpleto ang pag-encrypt. Bilang resulta, hindi na maa-access ang data sa iyong telepono. \n\nUpang patuloy na magamit ang iyong telepono, kailangan mong magsagawa ng factory reset. Kapag na-set up mo ang iyong telepono pagkatapos ng pag-reset, magkakaraoon ka ng pagkakataong magbalik ng anumang data na na-back up sa iyong Google Account."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Magpalit ng pamamaraan ng pag-input"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pumili ng screen lock"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pumili ng backup na lock"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Palitan ang PIN na pang-unlock"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Baguhin ang naka-unlock na password"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Dapat hindi bababa sa %d (na) character ang password"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Dapat na hindi bababa sa %d (na) character ang PIN"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Ang PIN ay hindi dapat bababa sa %d (na) digit"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Pindutin ang Magpatuloy kapag tapos na"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Magpatuloy"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Dapat mas kaunti sa <xliff:g id="NUMBER">%d</xliff:g> (na) character ang password."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Bilang speaker phone"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para sa musika at media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Tandaan ang mga setting"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Mga nakapares na display"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Mga available na device"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Kumokonekta"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Nakakonekta"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Available"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Ginagamit"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Mga setting ng display"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Magdiskonekta?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Tatapusin nito ang iyong koneksyon sa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Mga pagpipilian sa wireless display"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Kalimutan"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Tapos na"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Pangalan"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Naka-on"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Naka-off"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Hindi pinagana"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Payagan ang palitan ng data kapag dumikit ang tablet sa isa pang device"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Payagan ang pagpapalitan ng data kapag nadikit ang telepono sa isa pang device"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"I-off"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Hindi available dahil naka-off ang NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Kapag in-on ang tampok na ito, maaari mong i-beam ang nilalaman ng app sa isa pang device na may kakayahan sa NFC sa pamamagitan ng paghawak sa mga device nang magkalapit. Halimbawa, maaari mong i-beam ang mga pahina sa Browser, video sa YouTube, contact sa People, at higit pa."\n\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="android_beam_explained" msgid="6981652347448777459">"Kapag in-on ang tampok na ito, maaari mong i-beam ang nilalaman ng app sa isa pang device na may kakayahan sa NFC sa pamamagitan ng paghawak sa mga device nang magkalapit. Halimbawa, maaari mong i-beam ang mga pahina sa Browser, video sa YouTube, contact sa People, at higit pa.\n\nPaglapitin lamang ang mga device (karaniwang magkatalikuran) at pagkatapos ay pindutin ang iyong screen. Tinutukoy ng app kung ano ang nabi-beam."</string>
     <string name="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="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="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="8116564886303972764">"Ilagay ang pin na <xliff:g id="NUMBER">%1$s</xliff:g> ng iyong Wi-Fi router. Maaaring tumagal nang hanggang dalawang minuto ang pag-setup upang matapos."</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_in_progress" msgid="2944576520214787628">"Umuusad na ang WPS at maaaring tumagal nang dalawang minuto upang makumpleto"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Hindi sinusuportahan ang setting ng seguridad ng wireless na router (TKIP)"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Pagkabigo sa pagpapatotoo. Pakisubukang muli."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Natunton ang isa pang sesyon ng WPS. Pakisubukang muli sa loob ng ilang minuto."</string>
     <string name="wifi_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>
@@ -564,6 +621,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\nPayagan 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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"I-save"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nabigong i-save ang network"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Kanselahin"</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_skip_anyway" msgid="6965361454438011190">"Laktawan pa rin"</string>
+    <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\nMaaaring 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\nMaaaring mangailangan ng malaking aktibidad ng network ang pag-setup ng telepono."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Naghahanap…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Palitan ang pangalan ng device"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Mga device ng kaibigan"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Mga naaalalang pangkat"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Hindi makakonekta."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Nabigong palitan ang pangalan ng device."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Idiskonekta?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Kung magdiskonekta ka, magtatapos ang iyong koneksyon kay <xliff:g id="PEER_NAME">%1$s</xliff:g> at <xliff:g id="PEER_COUNT">%2$s</xliff:g> (na) iba pang mga device."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Portable na Wi-Fi hotspot"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Kalimutan ang pangkat na ito?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Portable na Wi-Fi hotspot"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Mga effect sa musika"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume ng ringer"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"I-vibrate kapag naka-silent"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Default na notification"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Default na tunog ng notification"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse na ilaw ng notification"</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">"Gumamit ng lakas ng tunog ng papasok na tawag para sa mga notification"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Pumili ng ringtone ng notification"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Default na tunog ng notification"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Media"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Magtakda ng volume para sa musika at mga video"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ng kawalan ng aktibidad"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pumili ng wallpaper mula sa"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Candy sa Screen"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Magsisimula kapag naka-sleep kung nakakonekta sa kuryente"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Hindi pinagana"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Napiling candy"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Kailan isasaaktibo"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> na ginugol na idle"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Hindi kailanman"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Subukan ito!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Simulan din kapag naka-dock"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kapag naka-dock o naka-sleep at nagcha-charge"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Alinman"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Habang nagcha-charge"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Habang naka-dock"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Naka-off"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Upang kontrolin kung ano ang nangyayari kapag naka-dock at/o naka-sleep ang telepono, i-on ang Daydream."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kailan magde-daydream"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Magsimula ngayon"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Mga Setting"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Awtomatikong pagliwanag"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Laki ng font"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Laki ng font"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Maling PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Hindi tugma ang mga PIN"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Hindi mapalitan ang PIN."\n"Posibleng maling PIN."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Hindi mapalitan ang PIN.\nPosibleng maling PIN."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Matagumpay na binago ang PIN ng SIM"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Hindi mabago ang katayuan ng lock ng SIM card."\n"Posibleng maling PIN."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Hindi mabago ang katayuan ng lock ng SIM card.\nPosibleng maling PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Kanselahin"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Katayuan ng tablet"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Bersyon ng baseband"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Bersyon ng Kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Numero ng build"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Katayuan ng SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Hindi available"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Katayuan"</string>
     <string name="device_status" msgid="607405385799807324">"Katayuan"</string>
@@ -733,12 +807,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">"Uri ng network ng mobile"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Impormasyon ng operator"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Katayuan ng mobile network"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Katayuan ng serbisyo"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Imbakan na USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD card"</string>
     <string name="memory_available" msgid="5052397223077021181">"Available"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Available (read-only)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Kabuuang espasyo"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Kinakalkula..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Apps (data ng app &amp; nilalaman ng media)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Mga larawan, video"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (musika, mga ringtone, mga podcast, atbp.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Misc."</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Naka-cache na data"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Unmount nabahagi imbakan"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"I-unmount ang SD card"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"I-unmount panloob USB storage"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Burahin ang SD card"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Buburahin lahat ng data sa panloob na imbakan na USB, gaya ng musika at larawan"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Binubura ang lahat ng data sa SD card, gaya ng mga musika at larawan"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Read-only)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"I-clear ang naka-cache na data?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Iki-clear nito ang naka-cache na data para sa lahat ng apps."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Aktibo ang paggana ng MTP o PTP"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"I-unmount USB storage?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"I-unmount ang SD card?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Kung i-unmount mo ang USB storage, hihinto ang ilang apps na iyong ginagamit at maaaring maging hindi available hanggang sa muli mong i-mount ang USB storage."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Camera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Hinahayaan kang maglipat ng mga larawan gamit ang software ng camera, at maglipat ng anumang mga file sa mga computer na hindi sumusuporta sa MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"I-install ang mga tool sa paglipat ng file"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Iba pang mga user"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Katayuan ng baterya"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Antas ng baterya"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Mga APN"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"I-reset ang data ng factory"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Binubura ang lahat ng data sa tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Binubura ang lahat ng data sa telepono"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Buburahin nito ang lahat ng data mula sa "<b>"panloob na storage"</b>" ng iyong tablet, kabilang ang:"\n\n<li>"Iyong Google account"</li>\n<li>"System at data ng app at mga setting"</li>\n<li>"Na-download na apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Buburahin nito ang lahat ng data mula sa "<b>"panloob na storage"</b>" ng iyong telepono, kabilang ang:"\n\n<li>"Iyong Google account"</li>\n<li>"System at data ng app at mga setting"</li>\n<li>"Na-download na apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kasalukuyan kang naka-sign in sa mga sumusunod na account:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Buburahin nito ang lahat ng data mula sa "<b>"panloob na storage"</b>" ng iyong tablet, kabilang ang:\n\n"<li>"Iyong Google account"</li>\n<li>"System at data ng app at mga setting"</li>\n<li>"Na-download na apps"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Buburahin nito ang lahat ng data mula sa "<b>"panloob na storage"</b>" ng iyong telepono, kabilang ang:\n\n"<li>"Iyong Google account"</li>\n<li>"System at data ng app at mga setting"</li>\n<li>"Na-download na apps"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kasalukuyan kang naka-sign in sa mga sumusunod na account:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musika"</li>\n<li>"Mga Larawan"</li>\n<li>"Ibang data ng user"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Upang i-clear ang musika, mga larawan, at iba pang data ng user, kailangang mabura ang "<b>"USB storage"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Upang i-clear ang musika, mga larawan, at ibang data ng user, kailangang mabura ang "<b>"SD card"</b>"."</string>
@@ -875,7 +957,7 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Portable na hotspot"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Pag-tether ng Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Nagte-tether"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Ng-tether &amp; portable hotspot"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Pag-tether &amp; portable na hotspot"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Pag-tether ng USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Nakakonekta ang USB, tingnan upang ma-tether"</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Maa-untether ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Tulong"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mga mobile network"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Pamahalaan ang mobile plan"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Hindi kilalang operator ng SIM"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Walang kilalang nagpoprobisyong website ang %1$s"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Mangyaring magpasok ng SIM card at mag-restart"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Mangyaring kumonekta sa Internet"</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_neighborhood_level" msgid="5626515380188353712">"Ipagamit sa apps serbisyo ng lok. ng Google para mabilis itantya lok. Kokolektahin at ipapadala sa Google 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_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="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>
@@ -910,13 +997,14 @@
     <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>
     <string name="about_settings_summary" msgid="3371517697156165959">"Tingnan ang impormasyong legal, katayuan, bersyon ng software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Legal na impormasyon"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Mga Taga-ambag"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Impormasyon sa regulasyon"</string>
     <string name="copyright_title" msgid="865906688917260647">"Copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisensya"</string>
     <string name="terms_title" msgid="7697580845616764642">"Mga Tuntunin at kundisyon"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Baguhin ang naka-unlock na PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Kumpirmahin ang naka-save na pattern"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Subukang muli:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Kunin ang naka-unlock pattern"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Gumuhit ng pattern sa pag-unlock:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pindutin ang Menu para sa tulong."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Bitawan sa pagkakapindot kapag tapos na."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Pagdugtungin ang hindi bababa sa <xliff:g id="NUMBER">%d</xliff:g> (na) tuldok. Subukang muli:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Paano kumuha ng isang naka-unlock na pattern"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Masyadong maraming maling pagtatangka!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Subukang muli sa loob ng <xliff:g id="NUMBER">%d</xliff:g> (na) segundo."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Kanselahin"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Susunod"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Sine-secure ang iyong tablet"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Pag-secure ng iyong telepono"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Protektahan ang iyong tablet mula sa hindi pinapahintulutang paggamit sa pamamagitan ng paglikha ng personal na pattern ng pag-unlock ng screen. I-slide ang iyong daliri upang ikonekta ang mga dot sa anumang pagkakaayos sa susunod na screen. Kailangan mong magkonekta ng hindi bababa sa apat na dot. "\n\n"Handa nang magsimula? Pindutin ang Susunod."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Protektahan ang iyong telepono mula sa hindi pinapahintulutang paggamit sa pamamagitan ng paglikha ng personal na pattern sa pag-unlock ng screen. I-slide ang iyong daliri upang magkonekta ng hindi bababa sa apat na dot sa anumang kaayusan sa susunod na screen. "\n\n"Handa na bang magsimula? Pindutin ang Susunod."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Hindi naka-install ang application sa iyong telepono."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Pamahalaan ang apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Pamahalaan at alisin ang naka-install na apps"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Apps"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Payagan ang pag-install ng apps mula sa hindi alam na mga pinagmulan"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Mas madaling mapinsala ang iyong tablet at personal na data ng atake ng apps mula sa hindi alam na mga pinagmulan. Sumasang-ayon ka na ikaw ang tanging mananagot para sa anumang pinsala sa iyong tablet o pagkawala ng data na maaaring magresulta mula sa paggamit ng apps na ito."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Mas madaling mapinsala ang iyong telepono at personal na data ng atake ng apps mula sa hindi alam na mga pinagmulan. Sumasang-ayon ka na ikaw ang tanging mananagot para sa anumang pinsala sa iyong telepono o pagkawala ng data na maaaring magresulta mula sa paggamit ng apps na ito."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"I-verify ang apps"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Huwag payagan o magbigay babala bago ang pag-install ng apps na maaaring makahamak"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Mga advanced na setting"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Paganahin ang higit pang mga pagpipilian sa mga setting"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Impormasyon ng app"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Data ng USB storage"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD card"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"I-uninstall"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"I-uninstall para sa lahat ng user"</string>
+    <string name="install_text" msgid="884360662922471113">"I-install"</string>
     <string name="disable_text" msgid="6544054052049395202">"Huwag Paganahin"</string>
     <string name="enable_text" msgid="9217362512327828987">"Paganahin"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"I-clear ang data"</string>
@@ -1019,19 +1106,21 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Ipakita na-cache proseso"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"I-reset kagustuhan sa app"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"I-reset ang gusto sa app?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ire-reset nito ang lahat ng kagustuhan para sa:"\n\n" "<li>"Hindi pinapaganang apps"</li>\n" "<li>"Mga notification ng hindi pinapaganang app"</li>\n" "<li>"Mga default na application para sa mga pagkilos"</li>\n" "<li>"Paghihigpit sa data sa background para sa apps"</li>\n\n" Hindi ka mawawalan ng anumang data ng app."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ire-reset nito ang lahat ng kagustuhan para sa:\n\n "<li>"Hindi pinapaganang apps"</li>\n" "<li>"Mga notification ng hindi pinapaganang app"</li>\n" "<li>"Mga default na application para sa mga pagkilos"</li>\n" "<li>"Paghihigpit sa data sa background para sa apps"</li>\n\n" Hindi ka mawawalan ng anumang data ng app."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"I-reset ang apps"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Pamahalaan ang espasyo"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Sa SD card"</string>
     <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>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> at <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Maaari kang singilin ng pera ng app na ito:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Ipadala ang premium na SMS"</string>
     <string name="computing_size" msgid="1599186977475211186">"Kino-compute…"</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Hindi makalkula ang laki ng package."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Wala kang anumang naka-install na apps ng third-party."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Baguhin ang ninanais na lokasyon ng pag-install para sa bagong apps"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Huwag paganahin built-in app?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Kung hindi mo papaganahin ang isang built-in na app, maaaring hindi kumilos nang tama ang iba pang apps."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Tanggalin ang data at huwag paganahin ang app?"</string>
+    <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Kung hindi mo papaganahin ang isang built-in na app, maaaring hindi gumana nang maayos ang iba pang apps. Matatanggal din ang iyong data."</string>
     <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>
@@ -1094,6 +1190,8 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"User: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Inalis ang user"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> (na) proseso at <xliff:g id="NUMSERVICES">%2$d</xliff:g> (na) serbisyo"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> (na) proseso at <xliff:g id="NUMSERVICES">%2$d</xliff:g> (na) serbisyo"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> (na) proseso at <xliff:g id="NUMSERVICES">%2$d</xliff:g> (na) serbisyo"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Mga setting ng pisikal na keyboard"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Pindutin ang key ng Space nang dalawang beses upang magpasok ng \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Gawing nakikita ang mga password"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Maaaring magawa ng pamamaraan ng pag-input na ito na kolektahin ang lahat ng tekstong iyong tina-type, kabilang ang personal na data katulad ng mga password at mga numero ng credit card. Nagmumula ito sa app na <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Gamitin ang pamamaraan ng pag-input na ito?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Maaaring magawa ng spell checker na ito na makolekta ang lahat ng tektong iyong tina-type, kabilang ang personal na data katulad ng mga password at mga numero ng credit card. Nagmumula ito sa app na <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Gamitin ang spell checker na ito?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Mga Setting"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para palit, pindot Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Default"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Mga layout ng keyboard"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diksyunaryo ng user"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personal na diksyunaryo"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personal na mga diksyunaryo"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personal na diksyunaryo"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Magdagdag"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Idagdag sa diksyunaryo"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Hindi kailanman hihinto ang screen kapag kinakargahan"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"I-enable ang Bluetooth HCI snoop log"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"I-capture ang lahat ng bluetooth HCI packet sa isang file"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Piliin ang runtime"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Piliin ang runtime"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"I-reboot upang baguhin ang runtime mula sa <xliff:g id="OLD">%1$s</xliff:g> patungo sa <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Payagan ang mga kunwaring lokasyon"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Payagan ang mga kunwaring lokasyon"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Tingnan kung may nakakahamak na pagkilos sa apps na na-install sa pamamagitan ng ADB/ADT."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protektahan ang USB storage"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Dapat humiling ng pahintulot ang apps na basahin ang USB storage"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Protektahan ang USB storage?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Kapag pinoprotektahan ang USB storage, dapat na humiling ng pahintulot ang apps na magbasa ng data mula sa panlabas na storage."\n\n"Maaaring hindi gumana ang ilang apps hanggang sa ma-update ng mga developer ng mga ito."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Kapag pinoprotektahan ang USB storage, dapat na humiling ng pahintulot ang apps na magbasa ng data mula sa panlabas na storage.\n\nMaaaring hindi gumana ang ilang apps hanggang sa ma-update ng mga developer ng mga ito."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Protektahan ang SD card"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Dapat na humiling ng pahintulot ang apps na basahin ang SD card"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Protektahan ang SD card?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Kapag pinoprotektahan ang SD card, dapat na humiling ng pahintulot ang apps na magbasa ng data mula sa panlabas na storage."\n\n"Maaaring hindi gumana ang ilang apps hanggang sa ma-update ng mga developer ng mga ito."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Kapag pinoprotektahan ang SD card, dapat na humiling ng pahintulot ang apps na magbasa ng data mula sa panlabas na storage.\n\nMaaaring hindi gumana ang ilang apps hanggang sa ma-update ng mga developer ng mga ito."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokal na terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Paganahin ang terminal app na nag-aalok ng lokal na shell access"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Pumili ng gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Pumili ng widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Likhain ang widget at payagan ang access?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Mga setting ng pagiging maa-access"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Mga Serbisyo"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Malaking teksto"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Tinatapos ng power button ang tawag"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Sabihin ang mga password"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Pagkaantala sa pagpindot &amp; pagdiin"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Pahusayin ang accessibility sa web"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Mga galaw sa pag-magnify"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kapag naka-on ang tampok na ito, maaari kang mag-zoom in at out sa pamamagitan ng pag-tap sa screen nang tatlong beses.\n\nHabang naka-zoom in, maaari kang:\n"<ul><li>"Mag-pan: I-drag ang dalawa o higit pang mga daliri sa screen."</li>\n<li>"Ayusin ang antas ng pag-zoom: I-pinch ang dalawa o higit pang daliri o paghiwalayin ang mga ito."</li></ul>\n\n"Maaari mo ring pansamantalang i-magnify kung ano ang nasa ilalim ng iyong mga daliri sa pamamagitan ng pag-tap nang tatlong beses at pagpindot nang matagal. Sa antas na naka-magnify, maaari mong i-drag ang iyong daliri upang maggalugad sa iba\'t ibang mga bahagi ng screen. Angatin ang iyong daliri upang bumalik sa iyong nakaraang katayuan.\n\nTandaan: Gumagana saanman ang pag-tap nang tatlong beses para sa pag-magnify maliban sa keyboard at navigation bar."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Shortcut sa pagiging naa-access"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"I-on"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"I-off"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kapag naka-on ang tampok na ito, mabilis mong mapapagana ang mga tampok ng accessibility sa dalawang hakbang:\n\nHakbang 1: Pindutin nang matagal ang power button hanggang sa may marinig kang tunog o maramdamang vibration.\n\nHakbang 2: Pindutin nang matagal gamit ang dalawang daliri hanggang sa makarinig ka ng kumpirmasyong audio.\n\nKung marami ang user ng device, pansamantalang pinapagana ng paggamit sa shortcut na ito sa lock screen ang accessibility hanggang sa ma-unlock ang device."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Malaking teksto"</string>
+    <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">"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_menu_item_settings" msgid="3344942964710773365">"Mga Setting"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Naka-on"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"Naka-on"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Naka-off"</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="print_settings" msgid="4742428530112487843">"Pag-print"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Mga setting ng pag-print"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Mga Serbisyo"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Gumamit ng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"Makakatanggap ang <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> ng mga dokumentong pini-print mo. Maaaring maglaman ang mga naturang dokumento ng sensitibong data."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Walang mga naka-install na serbisyo"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Mga Setting"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Magdagdag ng mga printer"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Naka-on"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Naka-off"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterya"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Ano ang gumagamit ng baterya"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Di avail data ng gmit baterya."</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Natanggap na data"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Naipadala ang data sa mobile"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Natanggap ang data sa mobile"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Naipadala ang data ng Wi‑Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Natanggap ang data ng Wi‑Fi"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Naka-on ang oras"</string>
@@ -1306,17 +1433,17 @@
     <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>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Ginamit na baterya kapag idle ang telepono"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Ginamit na baterya ng radyo ng cell"</string>
     <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 ginami ng display at backlight"</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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Ihinto o i-uninstall ang app"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Manu-manong kontrolin ang GPS upang pigilan ang app sa paggamit nito"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Maaaring mag-alok ang app ng mga setting upang mabawasan ang paggamit ng baterya"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Bateryang ginamit ng user"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> mula nang na-unplug"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Habang huling naka-unplug para sa <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Mga kabuuan ng paggamit"</string>
@@ -1346,10 +1474,11 @@
     <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>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Walang napiling wika"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Itinatakda ang boses na partikular sa wika para sa sinasambit na teksto"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Makinig sa isang halimbawa"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Mag-play ng maikling pagpapakita ng speech synthesis"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Brightness <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"awtomatiko"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"buo"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"kalahati"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"naka-off"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Storage ng kredensyal"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"I-install mula sa imbakan"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Kapag muling ini-install ang isang app, ipanumbalik ang mga na-back up na setting at data"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Kunin ang ulat ng bug"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Mangongolekta ito ng impormasyon tungkol sa kasalukuyang katayuan ng iyong device, na ipapadala bilang mensaheng e-mail. Gugugol ito ng kaunting oras mula sa pagsisimula sa ulat ng bug hanggang sa handa na itong ipadala; mangyaring maging mapagpasensya."</string>
-    <string name="report" msgid="302437572240018342">"Ulat"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Password ng pag-backup ng desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Kasalukuyang hindi pinoprotektahan ang mga buong pag-backup ng desktop"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Pindutin upang baguhin o alisin ang password para sa mga buong pag-backup ng desktop"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nPindutin 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>
@@ -1497,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalendaryo"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Mga Contact"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Maligayang pagdating sa Google sync!"</font>" "\n"Isang paraan ng Google sa pag-sync ng data upang payagan ang access sa iyong mga contact, appointment, at higit pa nasaan ka man."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Maligayang pagdating sa Google sync!"</font>" \nIsang paraan ng Google sa pag-sync ng data upang payagan ang access sa iyong mga contact, appointment, at higit pa nasaan ka man."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Mga setting ng pag-sync ng app"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data at pag-synchronize"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Palitan ang password"</string>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"I-flash ang buong window surface kapag nag-update"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Ipakita GPU view update"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"I-flash ang view sa windows kapag ginuhit sa GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Pakita upd hardware layer"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"I-flash berde hardware layer pag nag-update ito"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"I-debug ang GPU overdraw"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Ipakita paggamit ng CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Overlay ng screen pakita paggamit ngayon ng CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Ipilit ang pag-render ng GPU"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"I-simulate, ika-2 display"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Apps"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Huwag magtago ng mga aktibidad"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Sirain ang bawat aktibidad sa sandaling iwan ito ng user"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Wg pgnhin bckgrnd data mble ntwrk. Ggmit non-mble ntwrk kng mrn."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Upang paghigpitan ang data ng background para sa app na ito, magtakda muna ng isang limitasyon sa mobile data."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Paghigpitan ang data ng background?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ang tampok na ito ay maaaring maging sanhi ng pagtigil ng app na nakadepende sa data ng background kapag mga mobile network lang ang available."\n\n"Maaari kang makahanap ng higit pang naaangkop na mga kontrol sa paggamit ng data sa mga setting na available sa loob ng app."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ang tampok na ito ay maaaring maging sanhi ng pagtigil ng app na nakadepende sa data ng background kapag mga mobile network lang ang available.\n\nMaaari kang makahanap ng higit pang naaangkop na mga kontrol sa paggamit ng data sa mga setting na available sa loob ng app."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Posible lamang ang paghihigpit sa data ng background kapag nagtakda ka ng isang limitasyon sa mobile data."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"I-on ang pag-auto-sync ng data?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Awtomatikong makokopya sa iyong tablet ang anumang pagbabagong ginawa mo sa iyong mga account sa web."\n\n"Awtomatiko ring kinokopya ng ilang account ang anumang pagbabagong ginawa mo sa tablet sa web. Gumagana sa ganitong paraan ang isang Google Account."\n\n"Upang piliin kung aling uri ng impormasyon ang isi-snyc sa loob ng bawat account, pumunta sa Mga Setting at Account."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Awtomatikong makokopya sa iyong telepono ang anumang mga pagbabagong gagawin mo sa iyong mga account sa web."\n\n"Maaaring awtomatiko ring kopyahin ng ilang account ang anumang mga pagbabagong gagawin mo sa telepono sa web. Gumagana sa ganitong paraan ang isang Google Account."\n\n"Upang piliin kung aling mga uri ng impormasyon ang isi-snyc sa loob ng bawat account, pumunta sa Mga Setting at Account."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Awtomatikong makokopya sa iyong tablet ang anumang pagbabagong ginawa mo sa iyong mga account sa web.\n\nAwtomatiko ring kinokopya ng ilang account ang anumang pagbabagong ginawa mo sa tablet sa web. Gumagana sa ganitong paraan ang isang Google Account.\n\nUpang piliin kung aling uri ng impormasyon ang isi-snyc sa loob ng bawat account, pumunta sa Mga Setting at Account."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Awtomatikong makokopya sa iyong telepono ang anumang mga pagbabagong gagawin mo sa iyong mga account sa web.\n\nMaaaring awtomatiko ring kopyahin ng ilang account ang anumang mga pagbabagong gagawin mo sa telepono sa web. Gumagana sa ganitong paraan ang isang Google Account.\n\nUpang piliin kung aling mga uri ng impormasyon ang isi-snyc sa loob ng bawat account, pumunta sa Mga Setting at Account."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"I-off ang pag-auto-sync ng data?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Mababawasan nito ang paggamit ng data at baterya, ngunit kakailanganin mong manu-manong i-sync ang bawat account upang kumolekta ng kamakailang impormasyon. At hindi ka makakatanggap ng mga notification kapag naganap ang mga pag-update."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Petsa ng pag-reset ng cycle sa paggamit"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Itakda ang babala sa paggamit ng data"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Itakda ang limitasyon sa paggamit ng data"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Pag-limit sa paggamit ng data"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Hindi pagaganahin ang koneksyon ng iyong data ng mobile kapag naabot na ang tinukoy na limitasyon.\n\nDahil 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\nDahil 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" 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\nNakakaapekto 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\nNakakaapekto 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Mga inalis na apps at user"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> ang natanggap, <xliff:g id="SENT">%2$s</xliff:g> ang naipadala"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: mga <xliff:g id="TOTAL">%1$s</xliff:g> ang nagamit."</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> 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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Idagdag ang profile sa VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"I-edit ang profile"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Tanggalin ang profile"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Always-on VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Pumili ng VPN profile kung saan palaging mananatiling nakakonekta. Papayagan lang ang trapiko ng network kapag nakakonekta sa VPN na ito."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Wala"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Nangangailangan ang Always-on VPN ng IP address para sa parehong server at DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Walang koneksyon sa network. Pakisubukang muli sa ibang pagkakataon."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"May nawawalang certificate. Paki-edit ang profile."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"System"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Kanselahin"</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">"Mga karagdagang pag-update sa system"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Mga user at paghihigpit"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Mga User"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Idagdag ang user"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"I-edit ang mga detalye"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Impormasyon ng user"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Pangalan"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Mga paghihigpit sa nilalaman"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Humiling ng PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Rating ng nilalaman"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Apps ng system"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Mga naka-install na apps"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Itapon"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Alisin ang user"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Magulong bata"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Hindi pinagana"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Nagpapahintulot"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Nagpapatupad"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Mga User"</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="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\nPagkatapos mong lumikha ng bagong user, kailangang sumailalim ng taong iyon sa proseso ng pag-setup.\n\nAng 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\nAng 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_confirm_remove_message" msgid="5284111415714437285">"Sigurado ka bang nais mong alisin ang user at ang lahat ng nauugnay na data mula sa device?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Baguhin ang laki ng font"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Mga Paghihigpit"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Alisin ang paghihigpit"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Palitan ang PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Ipakita notification"</string>
     <string name="help_label" msgid="1107174367904110532">"Tulong"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Account para sa nilalaman"</string>
+    <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="6160672982086584261">"Magtakda ng mga paghihigpit sa app"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Kinokontrol ng <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Hindi sinusuportahan ang app na ito sa mga pinaghihigpitang profile"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Maa-access ng app na ito ang iyong mga account"</string>
+    <string name="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 29978e7..e052fd1 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,16 +218,127 @@
     <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="886742181977884584">"Medya"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"medya düğmeleri"</item>
+    <item msgid="4547883971364273343">"ses odağı"</item>
+    <item msgid="2603878814882344450">"ana ses düzeyi"</item>
+    <item msgid="7136963238377062018">"konuşma sesi düzeyi"</item>
+    <item msgid="4270236897655923007">"çalma sesi düzeyi"</item>
+    <item msgid="6325739889222559394">"medya sesi düzeyi"</item>
+    <item msgid="5762123934816216821">"alarm sesi düzeyi"</item>
+    <item msgid="785049718065337473">"bildirim sesi düzeyi"</item>
+    <item msgid="6700305533746877052">"Bluetooth sesi düzeyi"</item>
+    <item msgid="2029227495214047094">"uyanık tut"</item>
+    <item msgid="26109888160231211">"konumu izle"</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>
+    <item msgid="5753789168376302997">"Medya düğmeleri"</item>
+    <item msgid="3265262911688671938">"Ses odağı"</item>
+    <item msgid="2098976479485046797">"Ana ses düzeyi"</item>
+    <item msgid="5660213838861789350">"Konuşma sesi düzeyi"</item>
+    <item msgid="7983336752371254444">"Zil sesi düzeyi"</item>
+    <item msgid="7878027809189330917">"Medya sesi düzeyi"</item>
+    <item msgid="7260546305036218513">"Alarm sesi düzeyi"</item>
+    <item msgid="9103719301075748925">"Bildirim sesi düzeyi"</item>
+    <item msgid="7025966722295861512">"Bluetooth ses düzeyi"</item>
+    <item msgid="4665183401128289653">"Uyanık tut"</item>
+    <item msgid="8584357129746649222">"Konum"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kısa"</item>
     <item msgid="2560532955514699713">"Orta"</item>
     <item msgid="2372711992605524591">"Uzun"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (hata ayıklama)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Dalvik\'i kullan"</item>
+    <item msgid="5131846588686178907">"ART\'yi kullan"</item>
+    <item msgid="4530003713865319928">"ART hata ayıklama derlemesini kullan"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Hiçbir zaman denetleme"</item>
     <item msgid="6042769699089883931">"Yalnızca DRM içeriğini denetle"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Animasyon ölçeği 5x"</item>
     <item msgid="1069584980746680398">"Animasyon ölçeği 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Yok"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi ve 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Hiçbiri"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Kapalı"</item>
+    <item msgid="7688197031296835369">"Fazla çizilen alanları göster"</item>
+    <item msgid="8332661909019981149">"Fazla çizim sayacını göster"</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>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Zaman aşımı"</item>
     <item msgid="7664124146786465092">"Başarısız"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Sor"</item>
+    <item msgid="5077768429488260031">"Asla izin verme"</item>
+    <item msgid="1417929597727989746">"Her zaman izin ver"</item>
+  </string-array>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 2ad979f..216ca47 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Evet"</string>
     <string name="no" msgid="6731231425810196216">"Hayır"</string>
     <string name="create" msgid="3578857613172647409">"Oluştur"</string>
+    <string name="allow" msgid="3349662621170855910">"İzin ver"</string>
+    <string name="deny" msgid="6947806159746484865">"Reddet"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Bilinmiyor"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Geliştirici olmanıza <xliff:g id="STEP_COUNT">%1$d</xliff:g> adım kaldı."</item>
+    <item quantity="other" msgid="6722953419953594148">"Geliştirici olmanıza <xliff:g id="STEP_COUNT">%1$d</xliff:g> adım kaldı."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Artık siz bir geliştiricisiniz!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Gerekli değil, siz zaten bir geliştiricisiniz."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"KABLOSUZ ve AĞLAR"</string>
     <string name="header_category_device" msgid="5781174212691167553">"CİHAZ"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"KİŞİSEL"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Şarj oluyor"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Kullanılıyor"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(kablosuz)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Şarj olmuyor"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Şarj etmiyor"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Dolu"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Prize takılı değil"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"kablosuz"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Bilinmiyor"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Bilinmiyor"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Bilinmeyen hata"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Soğuk"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Keşfedilebilir"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Ykndki tüm Bluetooth chzlr trfndan görlblir (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Yakındki tüm Bluetooth cihazlrı trfndan görüleblir"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Diğer Bluetooth cihazları tarafından görülemez"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Sadece eşleştirilmiş chzlar tarafından görülebilir"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Cihazı keşfedilebilir yap"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Görünürlük zaman aşımı"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Cihazın ne süreyle keşfedilebilir olacağını ayarla"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Sesli aramayı kilitle"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Ekran kilitliyken blutooth çeviricinin kullanımını engelle"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth cihazlar"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Alınan dosyaları göster"</string>
     <string name="device_picker" msgid="8398232791303186677">"Bluetooth cihaz seçici"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Bluetooth izin isteği"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Telefonunuzdaki bir uygulama, Bluetooth\'u açmak istiyor. İzin veriyor musunuz?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Tabletinizdeki bir uygulama, tabletinizi <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazları tarafından bulunabilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Telefonunuzdaki bir uygulama, telefonunuzu <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazları tarafından bulunabilir duruma getirmek için izin istiyor. Buna izin veriyor musunuz?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Tabletinizdeki bir uygulama, tabletinizi diğer Bluetooth cihazları tarafından \"her zaman bulunabilir\" duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Telefonunuzdaki bir uygulama, telefonunuzu diğer Bluetooth cihazları tarafından \"her zaman bulunabilir\" duruma getirmek için izin istiyor. Buna izin veriyor musunuz?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Tabletinizdeki bir uygulama, Bluetooth\'u açmak ve tabletinizi <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazları tarafından bulunabilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Telefonunuzdaki bir uygulama, Bluetooth\'u açmak ve <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca telefonunuzu diğer cihazlar tarafından bulunabilir duruma getirmek istiyor. İzin veriyor musunuz?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Tabletinizdeki bir uygulama, Bluetooth\'u açmak ve tabletinizi diğer Bluetooth cihazları tarafından bulunabilir duruma getirmek için izin istiyor. Bunu yapmak istiyor musunuz?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Telefonunuzdaki bir uygulama, Bluetooth\'u açmak ve telefonunuzu diğer cihazlar tarafından bulunabilir duruma getirmek istiyor. İzin veriyor musunuz?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Bir uygulama Bluetooth\'u açmak istiyor."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Bir uygulama, tabletinizi <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazlarına görünebilir yapmak istiyor."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Bir uygulama, telefonunuzu <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca diğer Bluetooth cihazlarına görünebilir yapmak istiyor."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Bir uygulama tabletinizi diğer Bluetooth cihazlara görünebilir yapmak istiyor. Bunu daha sonra Bluetooth ayarlarından değiştirebilirsiniz."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Bir uygulama telefonunuzu diğer Bluetooth cihazlara görünebilir yapmak istiyor. Bunu daha sonra Bluetooth ayarlarından değiştirebilirsiniz."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Bir uygulama Bluetooth\'u açmak ve <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca tabletinizi diğer cihazlara görünebilir yapmak istiyor."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Bir uygulama Bluetooth\'u açmak ve <xliff:g id="TIMEOUT">%1$d</xliff:g> saniye boyunca telefonunuzu diğer cihazlara görünebilir yapmak istiyor."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Bir uygulama Bluetooth\'u açmak ve tabletinizi diğer cihazlara görünebilir yapmak istiyor. Bunu daha sonra Bluetooth ayarlarından değiştirebilirsiniz."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Bir uygulama Bluetooth\'u açmak ve telefonunuzu diğer cihazlara görünebilir yapmak istiyor. Bunu daha sonra Bluetooth ayarlarından değiştirebilirsiniz."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth açılıyor..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth kapatılıyor..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Otomatik bağlan"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP proxy\'yi tarayıcı kullanıyor, ancak diğer uygulamalar tarafından kullanılamayabilir."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Konum:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Komşu CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Hücre Bilgileri:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Veri giriş denemeleri:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS hizmeti:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Dolaşım:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Veri dolaşımı kapalıyken ana ağınızdan ayrıldığınız için veri bağlantısını kaybettiniz."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Açın"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Veri dolaşımına izin verdiğinizde, yüksek miktarda dolaşım ücretleri ödeyebilirsiniz!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Veri dolaşımına izin verirseniz, önemli düzeyde dolaşım ücretleriyle karşılaşabilirsiniz!\n\nBu ayar bu tabletteki tüm kullanıcıları etkiler."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Veri dolaşımına izin verirseniz, önemli düzeyde dolaşım ücretleriyle karşılaşabilirsiniz!\n\nBu ayar bu telefondaki tüm kullanıcıları etkiler."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Veri dolaşımına izin verilsin mi?"</string>
     <string name="networks" msgid="6333316876545927039">"Operatör seçimi"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Bir ağ operatörü seçin"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Cihaz sahibinin bilgileri"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Tabletinizin her açılışında şifresinin çözülmesi için sayısal bir PIN veya şifre istensin"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Telefonunuzun her açılışında şifresinin çözülmesi için sayısal bir PIN veya şifre istensin"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Şifreli"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ait verileri, medyaları ve diğer dosyaları şifreleyebilirsiniz. Tabletinizi şifreledikten sonra, cihazı her açtığınızda şifresini çözmek için sayısal bir PIN veya şifre girmeniz gerekir. Tabletinizdeki tüm verileri silen fabrika verilerine sıfırlama işlemi yapmadan şifrelemeyi kaldıramazsınız."\n\n"Şifreleme işlemi bir saat kadar sürer. İşlemi, dolu bir pille başlatmalı ve şifreleme tamamlanana kadar tabletinizi fişe takılı tutmalısınız. Şifreleme işlemini yarıda keserseniz, verilerinizin bir kısmını veya tamamını kaybedersiniz."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ait verileri, medyaları ve diğer dosyaları şifreleyebilirsiniz. Telefonunuzu şifreledikten sonra, cihazı her açtığınızda şifresini çözmek için sayısal bir PIN veya şifre girmeniz gerekir. Telefonunuzdaki tüm verileri silen fabrika verilerine sıfırlama işlemi yapmadan şifrelemeyi kaldıramazsınız."\n\n"Şifreleme işlemi bir saat kadar sürer. İşlemi, dolu bir pille başlatmalı ve şifreleme tamamlanana kadar telefonunuzu fişe takılı tutmalısınız. Şifreleme işlemini yarıda keserseniz, verilerinizin bir kısmını veya tamamını kaybedersiniz."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ait verileri, medyaları ve diğer dosyaları şifreleyebilirsiniz. Tabletinizi şifreledikten sonra, cihazı her açtığınızda şifresini çözmek için sayısal bir PIN veya şifre girmeniz gerekir. Tabletinizdeki tüm verileri silen fabrika verilerine sıfırlama işlemi yapmadan şifrelemeyi kaldıramazsınız.\n\nŞifreleme işlemi bir saat kadar sürer. İşlemi, dolu bir pille başlatmalı ve şifreleme tamamlanana kadar tabletinizi fişe takılı tutmalısınız. Şifreleme işlemini yarıda keserseniz, verilerinizin bir kısmını veya tamamını kaybedersiniz."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ait verileri, medyaları ve diğer dosyaları şifreleyebilirsiniz. Telefonunuzu şifreledikten sonra, cihazı her açtığınızda şifresini çözmek için sayısal bir PIN veya şifre girmeniz gerekir. Telefonunuzdaki tüm verileri silen fabrika verilerine sıfırlama işlemi yapmadan şifrelemeyi kaldıramazsınız.\n\nŞifreleme işlemi bir saat kadar sürer. İşlemi, dolu bir pille başlatmalı ve şifreleme tamamlanana kadar telefonunuzu fişe takılı tutmalısınız. Şifreleme işlemini yarıda keserseniz, verilerinizin bir kısmını veya tamamını kaybedersiniz."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tableti şifrele"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefonu şifrele"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Pilinizi şarj edip tekrar deneyin."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> saniye içinde yeniden deneyin."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Şifrenizi yazın"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Şifreleme başarısız oldu"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Şifreleme kesildi ve tamamlanamıyor. Bu durum nedeniyle tabletinizdeki verilere artık erişilemiyor."\n\n"Tabletinizi kullanmaya devam edebilmek için, fabrika ayarlarına sıfırlama işlemi gerçekleştirmeniz gerekir. Sıfırlama işleminden sonra tabletinizin kurulumunu yaptığınızda, Google Hesabınıza yedeklenen tüm verileri geri yükleme fırsatınız olacaktır."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Şifreleme kesildi ve tamamlanamıyor. Bu durum nedeniyle telefonunuzdaki verilere artık erişilemiyor."\n\n"Telefonunuz kullanmaya devam edebilmek için, fabrika ayarlarına sıfırlama işlemi gerçekleştirmeniz gerekir. Sıfırlama işleminden sonra telefonunuzun kurulumunu yaptığınızda, Google Hesabınıza yedeklenen tüm verileri geri yükleme fırsatınız olacaktır."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Şifreleme kesildi ve tamamlanamıyor. Bu durum nedeniyle tabletinizdeki verilere artık erişilemiyor.\n\nTabletinizi kullanmaya devam edebilmek için, fabrika ayarlarına sıfırlama işlemi gerçekleştirmeniz gerekir. Sıfırlama işleminden sonra tabletinizin kurulumunu yaptığınızda, Google Hesabınıza yedeklenen tüm verileri geri yükleme fırsatınız olacaktır."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Şifreleme kesildi ve tamamlanamıyor. Bu durum nedeniyle telefonunuzdaki verilere artık erişilemiyor.\n\nTelefonunuz kullanmaya devam edebilmek için, fabrika ayarlarına sıfırlama işlemi gerçekleştirmeniz gerekir. Sıfırlama işleminden sonra telefonunuzun kurulumunu yaptığınızda, Google Hesabınıza yedeklenen tüm verileri geri yükleme fırsatınız olacaktır."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Giriş yöntemini değiştir"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekran kilidini seçin"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Yedek kilidi seçin"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Kilit açma PIN\'ini değiştir"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Kilit açma şifresini değiştir"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Şifre en az %d karakter olmalıdır"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN, en az %d karakter olmalıdır"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN en az %d basamaklı olmalıdır"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"İşlem tamamlandığında Devam düğmesine basın"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Devam Et"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Şifre <xliff:g id="NUMBER">%d</xliff:g> karakterden kısa olmalıdır."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Telefon hoparlörü olarak"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Müzik ve medya için"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ayarları anımsa"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Eşleştirilmiş ekranlar"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Kullanılabilir cihazlar"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Bağlanılıyor"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Bağlandı"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Kullanılabilir"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Kullanımda"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Ekran ayarları"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Bağlantı kesilsin mi?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Şu cihazla bağlantınız kesilecek:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Kablosuz ekran seçenekleri"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Unut"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Bitti"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Ad"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Açık"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Kapalı"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Devre dışı"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Telefon başka cihaza dokunduğunda veri alışverişine izin ver"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Telefon başka cihaza dokunduğunda veri alışverişine izin ver"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Kapalı"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC kapalı olduğundan kullanılamıyor"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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\nCihazları 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="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="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="8116564886303972764">"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_in_progress" msgid="2944576520214787628">"WPS kurulumu zaten devam ediyor ve tamamlanması iki dakika kadar sürebilir"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Kablosuz yönlendirici güvenlik ayarı (TKIP) desteklenmiyor"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Kimlik doğrulama başarısız oldu. Lütfen tekrar deneyin."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Başka bir WPS oturumu saptandı. Lütfen birkaç dakika sonra tekrar deneyin."</string>
     <string name="wifi_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>
@@ -564,6 +621,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\nTarama 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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Kaydet"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Ağ kaydedilemedi"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"İptal"</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_skip_anyway" msgid="6965361454438011190">"Yine de atla"</string>
+    <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\nTabletin 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\nTelefonun kurulumu önemli miktarda ağ etkinliği gerektirebilir."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Aranıyor…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Cihazı yeniden adlandır"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Cihazları eşle"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Hatırlanan gruplar"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Bağlantı kurulamadı."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Cihaz yeniden adlandırılamadı."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Bağlantı kesilsin mi?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Bağlantıyı keserseniz,  <xliff:g id="PEER_NAME">%1$s</xliff:g> ve diğer <xliff:g id="PEER_COUNT">%2$s</xliff:g> cihazla bağlantınız sonlandırılır."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Taşınabilir kablosuz ortak erişim noktası"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Bu grup unutulsun mu?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Taşınabilir Kablosuz hotspot"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Müzik efektleri"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Zil sesi düzeyi"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Sessizken titret"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Varsayılan bildirim"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Varsayılan bildirim sesi"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Bildirim ışığını yakıp söndür"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zil sesi"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Bildirim"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Bildirimlerde gelen çağrı ses düzeyini kullan"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Bildirim zil sesini seçin"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Varsayılan bildirim sesi"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Medya"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Müziğin ve videoların ses düzeyini ayarla"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> işlem yapılmadığında"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Duvar Kağıdı"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Şuradan duvar kağıdı seçin:"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Ekran Şekeri"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Prize takılıysa, uyku moduna geçtiğinde başlar"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Devre dışı"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Seçilen şeker"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Etkinleştirme zamanı"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> boşta kaldıktan sonra"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Hiçbir zaman"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Deneyin!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Yuvasına yerleştirildiğinde de başlat"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Hafif uyku"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Yuvadayken veya uyku modunda ve şarj edilirken"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Her ikisi"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Şarj olurken"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Yuvadayken"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Kapalı"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Telefon yuvaya yerleştirildiğinde ve/veya uyku durumunda iken ne olacağını kontrol etmek için Hafif Uyku\'yu etkinleştirin."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Geçiş koşulu"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Şimdi başla"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Ayarlar"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Otomatik parlaklık"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Yazı tipi boyutu"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Yazı tipi boyutu"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN kodu"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Yanlış PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN\'ler eşleşmiyor"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"PIN değiştirilemiyor."\n"PIN yanlış olabilir."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"PIN değiştirilemiyor.\nPIN yanlış olabilir."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN kodu başarıyla değiştirildi"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM kartın kilit durumu değiştirilemiyor."\n"PIN yanlış olabilir."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM kartın kilit durumu değiştirilemiyor.\nPIN yanlış olabilir."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Tamam"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"İptal"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tabletin durumu"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Ana bant sürümü"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Çekirdek sürümü"</string>
     <string name="build_number" msgid="3075795840572241758">"Derleme numarası"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux durumu"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Uygun değil"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Durum"</string>
     <string name="device_status" msgid="607405385799807324">"Durum"</string>
@@ -733,12 +807,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">"Mobil ağ türü"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Operatör bilgileri"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Mobil ağ durumu"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Hizmet durumu"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB bellek"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD kart"</string>
     <string name="memory_available" msgid="5052397223077021181">"Kullanılabilir"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Kullanılabilir (salt okunur)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Toplam alan"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Hesaplanıyor..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Uygulamalar (uygulama verileri ve medya içeriği)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Resimler, videolar"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Ses (müzik, zil sesleri vb...)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Çeşitli"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Önbelleğe alınan veriler"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Payl dep birimnn bağl kes"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD kartının bağlantısını kes"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Dahili USB belleğin bağlntsn kes"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD kartı sil"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Dahili USB bellekteki müzik ve fotoğraf gibi tüm verileri siler"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"SD karttaki müzik ve fotoğraf gibi tüm verileri siler"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Salt okunur)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Önbelleğe alınan veriler silinsin mi?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Bu, tüm uygulamaların önbellek verilerini siler."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP veya PTP işlevi etkin"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"USB belleğin bağlantısı kesilsin mi?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"SD kartının bağlantısı kesilsin mi?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"USB belleğin bağlantısını keserseniz, kullanmakta olduğunuz bazı uygulamalar durur ve USB bellek yeniden bağlanıncaya kadar kullanılamayabilir."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Kamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Kamera yazılımını kullanarak fotoğrafları ve MTP\'yi desteklemeyen bilgisayarlardaki her türlü dosyayı aktarmanıza olanak sağlar."</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Dosya aktarma araçlarını yükle"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Diğer kullanıcılar"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Pil durumu"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Pil düzeyi"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN\'ler"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrika verilerine sıfırla"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Tabletteki tüm verileri siler"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Telefondaki tüm verileri siler"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Bu işlem tablet bilgisayarınızın "<b>"dahili depolama alanından"</b>"şu verilerin tümünü siler:"\n\n<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Bu işlem, telefonunuzun "<b>"dahili depolama alanından"</b>" şu verilerin tümünü siler:"\n\n<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Şu anda aşağıdaki hesaplarda oturum açmış durumdasınız:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Bu işlem tablet bilgisayarınızın "<b>"dahili depolama alanından"</b>"şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Bu işlem, telefonunuzun "<b>"dahili depolama alanından"</b>" şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Şu anda aşağıdaki hesaplarda oturum açmış durumdasınız:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Müzik"</li>\n<li>"Fotoğraflar"</li>\n<li>"Diğer kullanıcı verileri"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"USB belleğin"</b>" silinmesi gerekir."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"SD kartın"</b>" silinmesi gerekir."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> internet paylaşımı kesilecek."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Yardım"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobil ağlar"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Mobil planı yönet"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Bilinmeyen SIM operatörü"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s için bilinen bir provizyon web sitesi yok"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Lütfen SIM kartı takın ve yeniden başlatın"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Lütfen İnternet\'e bağlanın"</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>
@@ -917,6 +1004,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Yasal bilgileri, durumu, yazılım sürümünü görüntüle"</string>
     <string name="legal_information" msgid="5769301644270604095">"Yasal bilgiler"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Katkıda bulunanlar"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Düzenleme bilgileri"</string>
     <string name="copyright_title" msgid="865906688917260647">"Telif Hakkı"</string>
     <string name="license_title" msgid="1990487604356037871">"Lisans"</string>
     <string name="terms_title" msgid="7697580845616764642">"Şartlar ve koşullar"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Kilit açma PIN\'ini değiştir"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Kaydedilen deseni onayla"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Tekrar deneyin:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Kilit açma deseni çiz"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Kilit açma deseni çiz:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Yardım için Menü\'ye basın."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Bittiğinde parmağınızı kaldırın."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"En az <xliff:g id="NUMBER">%d</xliff:g> noktayı birleştirin. Yeniden deneyin:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kilit açma deseni çizme yöntemi"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Çok fazla sayıda yanlış deneme yapıldı!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> saniye içinde yeniden deneyin."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"İptal"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"İleri"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Tabletinizin güvenliğini sağlama"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Telefonunuzu güvenlik altına alma"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Kişisel bir kilit açma deseni oluşturarak tabletinizi yetkisiz kullanıma karşı koruyun. Bir sonraki ekranda parmağınızı kaydırarak noktaları istediğiniz sırada birleştirin. En az dört noktayı birleştirmeniz gereklidir. "\n\n"Başlamaya hazır mısınız? İleri\'ye dokunun."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Kendinize özel bir ekran kilidi açma deseni oluşturarak telefonunuzu yetkisiz kullanıma karşı koruyun. Bir sonraki ekranda parmağınızı kullanarak en az dört noktayı istediğiniz sırayla birleştirin. "\n\n"Başlamaya hazır mısınız? \"İleri\"ye dokunun."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Uygulama, telefonunuzda yüklü değil."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Uygulamaları yönet"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Yüklü uygulamaları yönet ve kaldır"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Uygulamalar"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Bilinmeyen kaynaklardan uygulama yüklemeye izin ver"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tabletiniz ve kişisel verileriniz, bilinmeyen kaynaklardan gelen uygulamaların saldırılarına karşı daha savunmasızdır. Bu uygulamaları kullanmanız sonucunda tabletinizin başına gelebilecek her tür hasardan ve veri kaybından yalnızca kendinizin sorumlu olduğunu kabul edersiniz."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefonunuz ve kişisel verileriniz, bilinmeyen kaynaklardan gelen uygulamaların saldırılarına karşı daha savunmasızdır. Bu uygulamaları kullanmanız sonucunda telefonunuzun başına gelebilecek her tür hasardan ve veri kaybından yalnızca kendinizin sorumlu olduğunu kabul edersiniz."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Uygulamaları doğrula"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Zararlı olabilecek uygulamaların yüklenmesine izin verme veya uyar"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Gelişmiş ayarlar"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Diğer ayar seçeneklerini etkinleştirin."</string>
     <string name="application_info_label" msgid="5736524913065714880">"Uygulama bilgileri"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB bellek verileri"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD kart"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Kaldır"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Yüklemeyi tüm kullanıcılar için kaldır"</string>
+    <string name="install_text" msgid="884360662922471113">"Yükle"</string>
     <string name="disable_text" msgid="6544054052049395202">"Devre dışı bırak"</string>
     <string name="enable_text" msgid="9217362512327828987">"Etkinleştir"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Verileri temizle"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Önbllğe alınan işlm göstr"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Uygulama tercihlerini sıfırla"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Uygulama tercihleri sıfırlansın mı?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Bu işlem şunlar için tüm tercihleri sıfırlar:"\n\n" "<li>"Devre dışı uygulamalar"</li>\n" "<li>"Devre dışı uygulama bildirimleri"</li>\n" "<li>"İşlemler için varsayılan uygulamalar"</li>\n" "<li>"Uygulamalar için arka plan sınırlandırmaları"</li>\n\n" Hiçbir uygulama verisi kaybolmaz."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Bu işlem şunlar için tüm tercihleri sıfırlar:\n\n "<li>"Devre dışı uygulamalar"</li>\n" "<li>"Devre dışı uygulama bildirimleri"</li>\n" "<li>"İşlemler için varsayılan uygulamalar"</li>\n" "<li>"Uygulamalar için arka plan sınırlandırmaları"</li>\n\n" Hiçbir uygulama verisi kaybolmaz."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Uygulamaları sıfırla"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Alanı yönet"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD kartta"</string>
     <string name="disabled" msgid="9206776641295849915">"Devre dışı"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Yüklü değil"</string>
     <string name="no_applications" msgid="7336588977497084921">"Uygulama yok"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Dahili Bellek"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB bellek"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> ve <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Bu uygulama sizden ücret alabilir:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Premium SMS gönder"</string>
     <string name="computing_size" msgid="1599186977475211186">"Hesaplanıyor…"</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Paket boyutu hesaplanamadı."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Yüklü üçüncü taraf uygulamanız yok."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Yeni uygulamalar için tercih edilen yükleme konumunu değiştir"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Yerleşik uygulama devre dışı bırakılsın mı?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Yerleşik bir uygulamayı devre dışı bırakırsanız bu, diğer uygulamaların hatalı davranmasına neden olabilir. Emin misiniz?"</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Veriler silinsin ve uygulama devre dışı bırakılsın mı?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Kullanıcı: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Kaldırılan kullanıcı"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> işlem ve <xliff:g id="NUMSERVICES">%2$d</xliff:g> hizmet"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> işlem ve <xliff:g id="NUMSERVICES">%2$d</xliff:g> hizmet"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> işlem ve<xliff:g id="NUMSERVICES">%2$d</xliff:g> hizmet"</string>
@@ -1128,8 +1226,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="show_password_summary" msgid="7345931695292850058"></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>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Değiştirmek için Ctrl-Ara Çubuğu\'na basın"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Varsayılan"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Klavye düzenleri"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kullanıcı sözlüğü"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Kişisel sözlük"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Kişisel sözlükler"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Kişisel sözlük"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Ekle"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Sözlüğe ekle"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Şarj edilirken ekran hiçbir zaman uykuya geçmez"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI araştırma günlüğü özelliğini etkinleştir"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Bir dosyadaki tüm Bluetooth HCI paketlerini yakala"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Çalışma zamanını seçin"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Çalışma zamanını seçin"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Çalışma zamanını <xliff:g id="OLD">%1$s</xliff:g> yerine <xliff:g id="NEW">%2$s</xliff:g> olarak değiştirmek için yeniden başlatılsın mı?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Sahte konumlara izin ver"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Sahte konumlara izin ver"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"ADB/ADT üzerinden yüklenen uygulamaları zararlı davranışlara karşı denetle."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USB belleği koru"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Uygulamalar USB belleği okumak için izin istemelidir"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"USB bellek korunsun mu?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"USB bellek korumalı olduğunda, uygulamaların harici depolama biriminden veri okumak için izin istemeleri gerekir."\n\n"Bazı uygulamalar, geliştiricileri tarafından güncellenene kadar çalışmayabilir."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"USB bellek korumalı olduğunda, uygulamaların harici depolama biriminden veri okumak için izin istemeleri gerekir.\n\nBazı uygulamalar, geliştiricileri tarafından güncellenene kadar çalışmayabilir."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SD kartı koru"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Uygulamalar SD kartı okumak için izin istemelidir"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SD kart korunsun mu?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD kart korumalı olduğunda, uygulamaların harici depolama biriminden veri okumak için izin istemeleri gerekir."\n\n"Bazı uygulamalar, geliştiricileri tarafından güncellenene kadar çalışmayabilir."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD kart korumalı olduğunda, uygulamaların harici depolama biriminden veri okumak için izin istemeleri gerekir.\n\nBazı uygulamalar, geliştiricileri tarafından güncellenene kadar çalışmayabilir."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Yerel terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Yerel kabuk erişimi sunan terminal uygulamasını etkinleştir"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Gadget seç"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Widget seç"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widget\'ı oluşturup erişime izin vermek istiyor musunuz?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Erişebilirlik ayarları"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Hizmetler"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Büyük metin"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Güç düğmesi çağrıyı sonlandırır"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Şifreleri sesli olarak oku"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Dokunma ve tutma bekleme süresi"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Web erişilebilirliğini artır"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Büyüteç hareketleri"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Bu özellik açıldığında ekrana üç kez hafifçe vurarak görüntüyü yakınlaştırabilir ve uzaklaştırabilirsiniz.\n\nYakınlaştırdığınızda şunları yapabilirsiniz\n"<ul><li>"Kaydırma: İki veya daha fazla parmağınızı ekranda sürükleyin."</li>\n<li>"Yakınlaştırrma düzeyini ayarlama: İki veya daha fazla parmağınızı birbirine yaklaştırın veya uzaklaştırın."</li></ul>\n\n"Ayrıca, üç kez hafifçe vurup parmağınızı basılı tutarak parmağınızın altındakini geçici olarak büyütebilirsiniz. Önceki duruma dönmek için parmağınızı kaldırın.\n\nNot: Üç kez hafifçe vurarak büyütme özelliği klavye ve gezinme çubuğu hariç her yerde kullanılabilir."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Erişilebilirlik kısayolu"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Açık"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Kapalı"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Bu özellik açıldığında, erişilebilirlik özelliklerini iki adımda kolayca etkinleştirebilirsiniz:\n\n1. Adım: Bir ses duyana veya titreşim hissedene kadar güç düğmesini basılı tutun.\n\n2. Adım: İki parmağınızla dokunup sesli bir onay duyana kadar parmaklarınızı basılı tutun.\n\nCihazda birden fazla kullanıcı varsa, kilit ekranında bu kısayol kullanıldığında erişilebilirlik özelliği cihazın kilidi açılana kadar geçici olarak etkinleştirilir."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Büyük metin"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ekran büyütme"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekran büyütmeyi otomatik güncelle"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Uygulama geçişlerinde ekran büyütmeyi güncelle"</string>
+    <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_menu_item_settings" msgid="3344942964710773365">"Ayarlar"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Açık"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"Açık"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Kapalı"</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="print_settings" msgid="4742428530112487843">"Yazdırma"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Yazdırma ayarları"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Hizmetler"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> kullanılsın mı?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> yazdırdığınız dokümanları alabilir. Bu tür dokümanlar hassas veriler içerebilir."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Hiçbir hizmet yüklenmedi"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Ayarlar"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Yazıcı ekle"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Açık"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Kapalı"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Pil"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Pili ne kullanıyor?"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Pil kullanım verisi yok."</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Alınan veriler"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Mobil veri gönderildi"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobil veri alındı"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Kablosuz verisi gönderildi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Kablosuz verisi alındı"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Ses"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Açma zamanı"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Uygulamayı durdur veya yüklemesini kaldır"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Uygulamanın kullanmasını önlemek için GPS\'yi el ile denetle"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Uygulama, pil kullanımını azaltmak için ayarlar önerebilir"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Kullanıcı tarafından harcanan pil miktarı"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Fişten çekildikten itibaren <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> için fişten son çekildikten itibaren"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Kullanım toplamı"</string>
@@ -1350,7 +1478,8 @@
     <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_lang_not_selected" msgid="7395787019276734765">"Dil seçilmedi"</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>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Parlaklık <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"otomatik"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"tam"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"yarım"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"kapalı"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Kimlik bilgileri deposu"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Depolama biriminden yükle"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Bir uygulama yeniden yüklendiğinde, yedeklenen ayarları ve diğer verileri geri yükle"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Hata raporu al"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Bu rapor, e-posta iletisi olarak göndermek üzere mevcut cihazınızın durumuyla ilgili bilgi toplar. Hata raporu başlatıldıktan sonra hazır olması biraz zaman alabilir; lütfen sabırlı olun."</string>
-    <string name="report" msgid="302437572240018342">"Rapor oluştur"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Masaüstü yedekleme şifresi"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Masaüstü tam yedeklemeleri şu an korunmuyor"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Masaüstü tam yedeklemelerinin şifresini değiştirmek veya kaldırmak için dokunun"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nFarklı 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>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Güncelleme sırasında tüm pencere yüzeylerini çiz"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU görünüm güncellemelerini göster"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPU ile çizim yapılırken pencerelerdeki görünümleri çiz"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Donanım katmanı güncellemelerini göster"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Flash donanım katmanları güncellendiğinde yeşildir"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"GPU fazla çizim hatasını ayıkla"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"CPU kullanımını göster"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Mevcut CPU kullanımını gösteren yer paylaşımı"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"GPU oluşturmayı zorla"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"İkincil ekranları simule et"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Uygulamalar"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Etkinlikleri saklama"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Kullanıcının ayrıldığı her etkinliği hemen yok et"</string>
     <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 plan verileri sınırla"</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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Mobil ağlarda arka plan verilerini devre dışı bırak. Varsa mobil olmayan ağlar kullanılır."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Bu uygulama için arka plan verilerini sınırlamak üzere önce bir mobil veri sınırı belirleyin."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Arka plan verileri kısıtlansın mı?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Bu özellik, arka plan verilere dayanan bir uygulamanın, yalnızca mobil ağlar mevcut olması durumunda çalışmayı durdurmasına neden olabilir."\n\n"Daha uygun veri kullanım denetimlerini uygulamanın içindeki ayarlarda bulabilirsiniz."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Bu özellik, arka plan verilere dayanan bir uygulamanın, yalnızca mobil ağlar mevcut olması durumunda çalışmayı durdurmasına neden olabilir.\n\nDaha uygun veri kullanım denetimlerini uygulamanın içindeki ayarlarda bulabilirsiniz."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Arka plan verilerini sınırlama özelliği, yalnızca mobil ağ veri sınırı ayarladığınızda kullanılabilir."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Otomatik veri senk. açılsın mı?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Web üzerinden hesaplarınızda yaptığınız tüm değişiklikler tabletinize otomatik olarak kopyalanır"\n\n"Bazı hesaplar ayrıca tablette yaptığınız değişiklikleri de Web\'e otomatik olarak kopyalar. Google Hesapları bu şekilde çalışır. "\n\n"Her hesapla ne tür bilgileri senkronize edeceğinizi seçmek için Ayarlar &gt; Hesaplar\'a gidin."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Web üzerinden hesaplarınızda yaptığınız tüm değişiklikler telefonunuza otomatik olarak kopyalanır"\n\n"Bazı hesaplar telefonda yaptığınız değişiklikleri de Web\'e otomatik olarak kopyalar. Google Hesapları bu şekilde çalışır. "\n\n"Her hesapla ne tür bilgileri senkronize edeceğinizi seçmek için Ayarlar &gt; Hesaplar\'a gidin."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Web üzerinden hesaplarınızda yaptığınız tüm değişiklikler tabletinize otomatik olarak kopyalanır\n\nBazı hesaplar ayrıca tablette yaptığınız değişiklikleri de Web\'e otomatik olarak kopyalar. Google Hesapları bu şekilde çalışır. \n\nHer hesapla ne tür bilgileri senkronize edeceğinizi seçmek için Ayarlar &gt; Hesaplar\'a gidin."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Web üzerinden hesaplarınızda yaptığınız tüm değişiklikler telefonunuza otomatik olarak kopyalanır\n\nBazı hesaplar telefonda yaptığınız değişiklikleri de Web\'e otomatik olarak kopyalar. Google Hesapları bu şekilde çalışır. \n\nHer hesapla ne tür bilgileri senkronize edeceğinizi seçmek için Ayarlar &gt; Hesaplar\'a gidin."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Otomatik veri senk. kapatılsın mı?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Bu işlem veri ve pil kullanımını azaltır, ancak son bilgileri almak için her hesabı manuel olarak senkronize etmeniz gerekecektir. Ayrıca, güncelleme olduğunda da bildirim alamayacaksınız."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Kullanım dönemi sıfırlama tarihi"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Veri kullanım uyarısını ayarla"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Veri kullanım limitini ayarla"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Veri kullanımını sınırlama"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Belirtilen limite ulaşıldığında mobil veri bağlantınız kesilecektir.\n\nVeri 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\nVeri 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" 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\nBu 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\nBu 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Kaldırılmış kullanıcılar ve uygulamalar"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> alındı, <xliff:g id="SENT">%2$s</xliff:g> gönderildi"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: yaklaşık <xliff:g id="TOTAL">%1$s</xliff:g> kullanıldı."</string>
     <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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"VPN profili ekle"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Profili düzenle"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Profili sil"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Her zaman açık VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Her zaman bağlı kalacak bir VPN profili seçin. Ağ trafiğine yalnızca bu VPN\'ye bağlanıldığında izin verilir."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Yok"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Her zaman açık VPN seçeneğinde hem sunucu hem de DNS için bir IP adresi gerekir."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Ağ bağlantısı yok. Lütfen daha sonra tekrar deneyin."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Bir sertifika eksik. Lütfen profili düzenleyin."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistem"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"İptal"</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">"Ek sistem güncellemeleri"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Kullanıcılar ve kısıtlamalar"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Kullanıcılar"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Kullanıcı ekle"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Ayrıntıları düzenle"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Kullanıcı bilgileri"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Ad"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"İçerik kısıtlamaları"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"PIN gerektir"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"İçerik oylama"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Sistem uygulaması"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Yüklü uygulamalar"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Sil"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Kullanıcıyı kaldır"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Yaramaz çocuk"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Disabled (Devre dışı)"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive (Serbest)"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing (Zorunlu)"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Kullanıcılar"</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="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\nYeni bir kullanıcı oluşturduğunuzda, o kişinin bir kurulum işlemini tamamlaması gerekir.\n\nHerhangi 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\nHerhangi 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_confirm_remove_message" msgid="5284111415714437285">"Kullanıcıyı ve onunla ilişkili tüm verileri cihazdan kaldırmak istediğinizden emin misiniz?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Yazı tipi boyutunu değiştir"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Kısıtlamalar"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Kısıtlamaları kaldır"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN\'i değiştir"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Bildirimleri göster"</string>
     <string name="help_label" msgid="1107174367904110532">"Yardım"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"İçerik için kullanılan hesap"</string>
+    <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="6160672982086584261">"Uygulama kısıtlamalarını ayarla"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g> tarafından kontrol ediliyor"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Bu uygulama kısıtlanmış profillerde desteklenmez"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Bu uygulama hesaplarınıza erişebilir"</string>
+    <string name="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 016975c..664e678 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,16 +218,127 @@
     <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="886742181977884584">"Медіа-файли"</item>
+    <item msgid="7924928667052300589">"Пристрій"</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>
+    <item msgid="5124443975763747838">"кнопки медіа"</item>
+    <item msgid="4547883971364273343">"активізація звуку"</item>
+    <item msgid="2603878814882344450">"загальна гучність"</item>
+    <item msgid="7136963238377062018">"гучність голосу"</item>
+    <item msgid="4270236897655923007">"гучність дзвінка"</item>
+    <item msgid="6325739889222559394">"гучність медіа"</item>
+    <item msgid="5762123934816216821">"гучність сигналу"</item>
+    <item msgid="785049718065337473">"гучність сповіщення"</item>
+    <item msgid="6700305533746877052">"гучність Bluetooth"</item>
+    <item msgid="2029227495214047094">"залишати активним"</item>
+    <item msgid="26109888160231211">"відстежувати місцезнаходження"</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>
+    <item msgid="5753789168376302997">"Кнопки медіа"</item>
+    <item msgid="3265262911688671938">"Активізація звуку"</item>
+    <item msgid="2098976479485046797">"Загальна гучність"</item>
+    <item msgid="5660213838861789350">"Гучність голосу"</item>
+    <item msgid="7983336752371254444">"Гучність дзвінка"</item>
+    <item msgid="7878027809189330917">"Гучність медіа"</item>
+    <item msgid="7260546305036218513">"Гучність сигналу"</item>
+    <item msgid="9103719301075748925">"Гучність сповіщення"</item>
+    <item msgid="7025966722295861512">"Гучність Bluetooth"</item>
+    <item msgid="4665183401128289653">"Залишати активним"</item>
+    <item msgid="8584357129746649222">"Місцезнаходження"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Коротка"</item>
     <item msgid="2560532955514699713">"Середня"</item>
     <item msgid="2372711992605524591">"Довга"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (налагодження)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Використовувати Dalvik"</item>
+    <item msgid="5131846588686178907">"Використовувати ART"</item>
+    <item msgid="4530003713865319928">"Використовувати складання ART для налагодження"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Ніколи не перевіряти"</item>
     <item msgid="6042769699089883931">"Перевір. лише на вміст, захищ. DRM"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Ступінь анімації 5x"</item>
     <item msgid="1069584980746680398">"Ступінь анімації 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Немає"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi та 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Нічого"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Вимк."</item>
+    <item msgid="7688197031296835369">"Показувати області накладання"</item>
+    <item msgid="8332661909019981149">"Показувати лічильник накладання"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартне обмеження"</item>
     <item msgid="4071574792028999443">"Без фонових процесів"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Час очікування"</item>
     <item msgid="7664124146786465092">"Невдача"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Запитувати"</item>
+    <item msgid="5077768429488260031">"Ніколи не дозволяти"</item>
+    <item msgid="1417929597727989746">"Завжди дозволяти"</item>
+  </string-array>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f74f691..06ec899 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Так"</string>
     <string name="no" msgid="6731231425810196216">"Ні"</string>
     <string name="create" msgid="3578857613172647409">"Створити"</string>
+    <string name="allow" msgid="3349662621170855910">"Дозволити"</string>
+    <string name="deny" msgid="6947806159746484865">"Заборонити"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Невідомо"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Щоб стати розробником, залишився лише <xliff:g id="STEP_COUNT">%1$d</xliff:g> крок."</item>
+    <item quantity="other" msgid="6722953419953594148">"Щоб стати розробником, залишилося лише стільки кроків: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Тепер ви – розробник!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Немає потреби, ви вже розробник."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"БЕЗДРОТОВИЙ ЗВ’ЯЗОК І МЕРЕЖІ"</string>
     <string name="header_category_device" msgid="5781174212691167553">"ПРИСТРІЙ"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"ОСОБИСТЕ"</string>
@@ -66,30 +74,32 @@
     <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>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Зарядж-ся"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Розрядження"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(бездротовий доступ)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Не заряджається"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не заряджається"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Повна"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Відключено"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"бездротовий доступ"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Невідомо"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Невідомо"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Невідома помилка"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Низька"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Видимий"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Видимий для всіх пристроїв Bluetooth неподалік (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Видимий для всіх пристроїв Bluetooth неподалік"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Невидимий для інших пристроїв Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Видимий лише для спарених пристроїв"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Зробити пристрій видимим"</string>
-    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Час очікування видимості"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Налаштуйте час видимості пристрою"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Час видимості"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заблок. голос. набір"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Запобігає використанню набору bluetooth, коли екран заблоковано"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Пристрої Bluetooth"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Показати отримані файли"</string>
     <string name="device_picker" msgid="8398232791303186677">"Інструмент вибору пристрою Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Запит на дозвіл Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Програма хоче ввімкнути Bluetooth. Дозволити?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Програма у вашому планшетному ПК хоче зробити його видимим для інших пристроїв Bluetooth упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд. Дозволити?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Програма у вашому телефоні хоче зробити його видимим для інших пристроїв Bluetooth упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд. Дозволити?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Програма у вашому планшетному ПК хоче зробити його \"постійно видимим\" для інших пристроїв Bluetooth. Дозволити?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Програма у вашому телефоні хоче зробити його \"постійно видимим\" для інших пристроїв Bluetooth. Дозволити?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Програма у вашому пристрої хоче ввімкнути Bluetooth і зробити планшетний ПК видимим для інших пристроїв упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд. Дозволити?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Програма у вашому телефоні хоче ввімкнути Bluetooth і зробити телефон видимим для інших пристроїв упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд. Дозволити?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Програма у вашому планшетному ПК хоче ввімкнути Bluetooth і зробити планшетний ПК видимим для інших пристроїв. Дозволити?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Програма у вашому телефоні хоче ввімкнути Bluetooth і зробити телефон видимим для інших пристроїв. Дозволити?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Програма хоче ввімкнути Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Програма хоче зробити ваш планшетний ПК видимим для інших пристроїв Bluetooth упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Програма хоче зробити ваш телефон видимим для інших пристроїв Bluetooth упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Програма хоче зробити ваш планшетний ПК видимим для інших пристроїв Bluetooth. Цей параметр можна змінити згодом у налаштуваннях Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Програма хоче зробити ваш телефон видимим для інших пристроїв Bluetooth. Цей параметр можна змінити згодом у налаштуваннях Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Програма хоче ввімкнути Bluetooth і зробити ваш планшетний ПК видимим для інших пристроїв упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Програма хоче ввімкнути Bluetooth і зробити ваш телефон видимим для інших пристроїв упродовж <xliff:g id="TIMEOUT">%1$d</xliff:g> секунд."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Програма хоче ввімкнути Bluetooth і зробити ваш планшетний ПК видимим для інших пристроїв. Цей параметр можна змінити згодом у налаштуваннях Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Програма хоче ввімкнути Bluetooth і зробити ваш телефон видимим для інших пристроїв. Цей параметр можна змінити згодом у налаштуваннях Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Увімкнення Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Вимкнення Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Автоматичне з’єднання"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Проксі-сервер HTTP використовується веб-переглядачем, але не може використовуватися ін. програмами."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Місцезнах.:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Сусідній CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Інформація про телефон:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Спроб даних:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Служба GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Роумінг:"</string>
@@ -246,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>
@@ -254,26 +262,28 @@
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"Карта SD"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Налашт-ня проксі"</string>
     <string name="cancel" msgid="6859253417269739139">"Скасувати"</string>
-    <string name="settings_label" msgid="1626402585530130914">"Налаштув-ня"</string>
+    <string name="settings_label" msgid="1626402585530130914">"Налаштування"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Налаштування"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Ярлик налаштувань"</string>
     <string name="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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Доступ до даних утрачено, оскільки ви залишили домашню мережу з вимкненим роумінгом даних."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Увімкнути"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Якщо дозволити роумінг даних, може стягуватися значна плата за роумінг!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Якщо дозволити роумінг даних, з вас може стягуватися значна плата за роумінг.\n\nТаке налаштування впливає на всіх користувачів цього планшетного ПК."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Якщо дозволити роумінг даних, з вас може стягуватися значна плата за роумінг.\n\nТаке налаштування впливає на всіх користувачів цього телефону."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Дозволити роумінг даних?"</string>
     <string name="networks" msgid="6333316876545927039">"Вибір оператора"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Виберіть оператора мережі"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Дата та час"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Установити дату та час"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Установити дату, час, часовий пояс і формати"</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>
@@ -294,9 +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>
@@ -308,8 +322,8 @@
     <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">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їх дані, медіа-файли й інші файли. Щойно ви зашифруєте свій планшетний ПК, потрібно буде вводити цифровий PIN-код чи пароль для розшифрування планшетного ПК щоразу під час його ввімкнення. Ви зможете скасувати шифрування, лише відновивши заводські налаштування, що призведе до видалення всіх ваших даних."\n\n"Шифрування триває не менше години. Перш ніж розпочати процес шифрування, переконайтеся, що акумулятор заряджено. Планшетний ПК має перебувати в підключеному стані до завершення шифрування. Переривання процесу шифрування призведе до втрати частини чи всіх ваших даних."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їх дані, медіа-файли й інші файли. Щойно ви зашифруєте свій телефон, потрібно буде вводити цифровий PIN-код чи пароль для розшифрування телефону щоразу під час його ввімкнення. Ви зможете скасувати шифрування, лише відновивши заводські налаштування, що призведе до видалення всіх ваших даних."\n\n"Шифрування триває не менше години. Перш ніж розпочати процес шифрування, переконайтеся, що акумулятор заряджено. Телефон має перебувати в підключеному стані до завершення шифрування. Переривання процесу шифрування призведе до втрати частини чи всіх ваших даних."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їх дані, медіа-файли й інші файли. Щойно ви зашифруєте свій планшетний ПК, потрібно буде вводити цифровий PIN-код чи пароль для розшифрування планшетного ПК щоразу під час його ввімкнення. Ви зможете скасувати шифрування, лише відновивши заводські налаштування, що призведе до видалення всіх ваших даних.\n\nШифрування триває не менше години. Перш ніж розпочати процес шифрування, переконайтеся, що акумулятор заряджено. Планшетний ПК має перебувати в підключеному стані до завершення шифрування. Переривання процесу шифрування призведе до втрати частини чи всіх ваших даних."</string>
+    <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>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Спробуйте ще через <xliff:g id="DELAY">^1</xliff:g> сек."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Введіть пароль"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифрування не виконано"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифрування перервано, його неможливо закінчити. Як наслідок, дані на планшетному ПК більше не доступні. "\n\n"Щоб знову користуватися планшетним ПК, потрібно відновити заводські налаштування. Налаштовуючи планшетний ПК після відновлення, ви матимете можливість відновити будь-які дані, резервні копії яких було збережено у вашому обліковому записі Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифрування перервано, його неможливо закінчити. Як наслідок, дані на телефоні більше не доступні. "\n\n"Щоб знову користуватися телефоном, потрібно відновити заводські налаштування. Налаштовуючи телефон після відновлення, ви матимете можливість відновити будь-які дані, резервні копії яких було збережено у вашому обліковому записі Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифрування перервано, його неможливо закінчити. Як наслідок, дані на планшетному ПК більше не доступні. \n\nЩоб знову користуватися планшетним ПК, потрібно відновити заводські налаштування. Налаштовуючи планшетний ПК після відновлення, ви матимете можливість відновити будь-які дані, резервні копії яких було збережено у вашому обліковому записі Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифрування перервано, його неможливо закінчити. Як наслідок, дані на телефоні більше не доступні. \n\nЩоб знову користуватися телефоном, потрібно відновити заводські налаштування. Налаштовуючи телефон після відновлення, ви матимете можливість відновити будь-які дані, резервні копії яких було збережено у вашому обліковому записі Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Переключити метод введення"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Тип блокув. екрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Вибер. резерв. блокув."</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Змінити PIN розблок."</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Змінити пароль розблок."</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Пароль має складатися з мінімум %d симв."</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-код має скл. з мінімум %d симв."</string>
+    <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>
@@ -405,7 +419,16 @@
     <string name="lock_setup" msgid="3355847066343753943">"Налаштування завершено."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Адміністрація пристрою"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Адміністратори пристрою"</string>
-    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Переглянути чи дезактив. адмін-ів пристрою"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Переглянути чи відключити адміністраторів пристрою"</string>
+    <string name="manage_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>
@@ -480,6 +503,28 @@
     <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_empty_list_wifi_display_off" msgid="1225626898926363100">"Щоб переглянути пристрої, увімкніть бездротовий екран."</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_paired_devices" msgid="7395326840730024303">"Спарені пристрої"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Доступні пристрої"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Під’єднуються"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Під’єднані"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Доступні"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Використовується"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Налаштування відображення"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Від’єднатися?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Це призведе до роз’єднання з пристроєм:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Параметри бездротового екрана"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Ігнорувати"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Готово"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Назва"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Увімкнено"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Вимкнено"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Вимкнено"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Дозволити обмін даними, коли планшетний ПК торкнеться іншого пристрою"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Дозволити обмін даними, коли телефон торкнеться іншого пристрою"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Вимк."</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Недоступно, оскільки NFC вимкнено"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Якщо цю функцію ввімкнено, можна передавати вміст програми на інший пристрій, що підтримує технологію NFC, розташувавши пристрої один біля одного. Наприклад, можна передавати сторінки веб-переглядача, відео YouTube, контакти з розділу \"Люди\" тощо."\n\n"Просто розташуйте пристрої один біля одного (зазвичай тильними сторонами) і торкніться свого екрана. Програма визначить, що потрібно передати."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Якщо цю функцію ввімкнено, можна передавати вміст програми на інший пристрій, що підтримує технологію NFC, розташувавши пристрої один біля одного. Наприклад, можна передавати сторінки веб-переглядача, відео YouTube, контакти з розділу \"Люди\" тощо.\n\nПросто розташуйте пристрої один біля одного (зазвичай тильними сторонами) і торкніться свого екрана. Програма визначить, що потрібно передати."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Виявлення мережевої служби"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Дозволити програмам на інших пристроях виявляти програми на цьому пристрої"</string>
-    <string name="wifi_quick_toggle_title" msgid="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="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="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="8116564886303972764">"Введіть 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_in_progress" msgid="2944576520214787628">"Налаштування WPS уже виконується, для його завершення потрібно не більше двох хвилин."</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Під’єднано до мережі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Налаштування WPS уже виконується. Для його завершення потрібно не більше двох хвилин"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Помилка WPS. Повторіть спробу через декілька хвилин."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Налаштування безпеки бездротового маршрутизатора (WEP) не підтримується"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Налаштування безпеки бездротового маршрутизатора (TKIP) не підтримується"</string>
     <string name="wifi_wps_failed_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>
@@ -564,6 +621,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>
@@ -571,8 +631,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_advanced_titlebar" msgid="1627063574532930090">"Розширені налаштування Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Діапазон частот Wi-Fi"</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="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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Пошук…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Перейменувати пристрій"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Однорангові пристрої"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Збережені групи"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Неможливо з\'єднатися."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Не вдалося перейменувати пристрій."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Від’єднатися?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Якщо від’єднатися, це призведе до роз’єднання з пристроєм <xliff:g id="PEER_NAME">%1$s</xliff:g> і ще з <xliff:g id="PEER_COUNT">%2$s</xliff:g>."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Скасувати запрошення?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Скасувати запрошення під’єднатися до пристрою <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Портат. точка дост. Wi-Fi"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Видалити цю групу?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Портативна точка доступу Wi‑Fi"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Музичні ефекти"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Гучність дзвінка"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вібр. в беззвуч. реж."</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Сповіщення за умовчанням"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Звук сповіщення за умовчанням"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Блим. світл. сигн. сповіщ."</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Мелодія"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Сповіщення"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Викор. гучність вхідних дзвінків для сповіщень"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Вибрати сигнал дзвінка для сповіщення"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Звук сповіщення за умовчанням"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Медіа"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Устан. гучн. для музики та відео"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Сповіщ."</string>
@@ -660,7 +732,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>
@@ -671,15 +743,16 @@
     <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="3848608373818910549">"Screen Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Запуститься в режимі сну, якщо підключений до живлення"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Вимкнено"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Вибрана заставка"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Час для активації"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Через <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> в режимі очікування"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Ніколи"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Спробувати!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Також запускати, коли пристрій у док-станції"</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">"Щоб знати, що відбувається з телефоном, коли він у док-станції та/або в режимі сну, увімкніть режим заставки."</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>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN SIM-карти"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Неправильний PIN-код"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN-коди не збігаються"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Неможливо змінити PIN-код."\n"Можливо, неправильний PIN-код."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Неможливо змінити PIN-код.\nМожливо, неправильний PIN-код."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN SIM-карти успішно змінено"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Неможливо змінити стан блокування SIM-карти."\n"Можливо, неправильний PIN-код."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Неможливо змінити стан блокування SIM-карти.\nМожливо, неправильний PIN-код."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Скасувати"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Стан пристрою"</string>
@@ -716,13 +789,14 @@
     <string name="baseband_version" msgid="1848990160763524801">"Версія радіоприйм."</string>
     <string name="kernel_version" msgid="9192574954196167602">"Версія ядра"</string>
     <string name="build_number" msgid="3075795840572241758">"Номер складання"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Статус SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Недоступний"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Стан"</string>
     <string name="device_status" msgid="607405385799807324">"Стан"</string>
-    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Стан батареї, мережі та інша інформація"</string>
+    <string name="device_status_summary" product="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>
+    <string name="storage_settings_title" msgid="8746016738388094064">"Налаштування пам’яті"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Відключити носій USB, перегл. доступні носії"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Відключ. карту SD, перегл. доступ. сховище"</string>
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
@@ -733,12 +807,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">"Тип мобільної мережі"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Відомості про оператора"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Стан мобільної мережі"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Стан служби"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"Сила сигналу:"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Носій USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Карта SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"Вільно"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Доступно (лише читання)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Заг. простір"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Обчислення…"</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Програми (дані програм і медіа-вміст)"</string>
@@ -756,6 +832,7 @@
     <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_cache_usage" msgid="6704293333141177910">"Кешовані дані"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Відключ. спільне сховище"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Відключ. карту SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Відключити внутр. носій USB"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Очистити карту SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Видаляє всі дані на внутрішньому носії USB, такі як музика та фото"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Стирає всі дані на карті SD, як-от музику та фото"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Лише чит.)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Очистити кешовані дані?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Ця дія очистить кешовані дані для всіх програм."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Протоколи MTP або PTP активовано"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Відключити носій USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Відключити карту SD?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"У разі відключення носія USB деякі програми, якими ви користуєтеся, припинять роботу та можуть бути недоступними до повторного підключення носія USB."</string>
@@ -793,8 +872,9 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Камера (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Дозволяє передавати фото за допомогою програмного забезпечення камери, а також передавати будь-які файли на комп’ютери, які не підтримують MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Установити інструменти передавання файлів"</string>
-    <string name="battery_status_title" msgid="9159414319574976203">"Стан батареї"</string>
-    <string name="battery_level_title" msgid="2965679202786873272">"Рівень батареї"</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="apn_settings" msgid="3743170484827528406">"APN"</string>
     <string name="apn_edit" msgid="1354715499708424718">"Редаг. точку доступу"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"Не встановлено"</string>
@@ -822,6 +902,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>
@@ -834,12 +916,12 @@
     <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>
-    <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" 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>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Щоб видалити музику, зображення й інші дані користувача, треба стерти "<b>"карту SD"</b>"."</string>
@@ -869,13 +951,13 @@
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Намалюйте ключ розблок-ня"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Щоб підтвердити очищення носія USB, треба намалювати ключ розблокування."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Щоб підтвердити очищення карти SD, треба намалювати ключ розблокування."</string>
-    <string name="call_settings_title" msgid="5188713413939232801">"Налашт. виклику"</string>
+    <string name="call_settings_title" msgid="5188713413939232801">"Виклики"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Налашт. гол.пошту, переадр.викл., парал.викл., ідент.абонента"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Прив\'язка USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Порт. точка дост."</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Прив\'язка Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Прив\'язка"</string>
-    <string name="tether_settings_title_all" msgid="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>
@@ -897,10 +979,15 @@
     <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="manage_mobile_plan_title" msgid="7588182101738043593">"Керувати тарифним планом"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Невідомий оператор SIM-карти"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s не має веб-сайту для мобільних"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Вставте SIM-карту та перезапустіть"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Під’єднайтеся до Інтернету"</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>
@@ -909,7 +996,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>
@@ -917,6 +1004,7 @@
     <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="copyright_title" msgid="865906688917260647">"Автор. право"</string>
     <string name="license_title" msgid="1990487604356037871">"Ліцензія"</string>
     <string name="terms_title" msgid="7697580845616764642">"Заг. положення й умови"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Змініть PIN розблок."</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Підтвердьте збереж. ключ"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Повторити спробу:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Намалюйте ключ розблок."</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Намалюйте ключ розблокування:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Для допом. натис. меню."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"По заверш. відпуст. палець."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Підключ. принаймні <xliff:g id="NUMBER">%d</xliff:g> точок. Спроб. ще:"</string>
@@ -960,18 +1048,13 @@
     <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_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>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Забагато неправильних спроб!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Спробуйте ще через <xliff:g id="NUMBER">%d</xliff:g> сек."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Скасувати"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Далі"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Захист вашого пристрою"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Захист вашого телефону"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Захистіть свій планшетний ПК від несанкціонованого використання, створивши особистий ключ розблокування екрана. На наступному екрані пальцем з’єднайте крапки в будь-якому порядку. Потрібно з’єднати принаймні чотири крапки. "\n\n"Готові? Торкніться опції \"Далі\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Захистіть свій телефон від несанкціонованого використання, створивши особистий ключ розблокування екрана. На наступному екрані пальцем з’єднайте принаймні чотири крапки в будь-якому порядку. "\n\n"Готові? Торкніться опції \"Далі\"."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Програму не встановлено у вашому телефоні."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Керувати програмами"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Керувати встановленими програмами та видаляти їх"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Програми"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Дозволити встановлення програм із невідомих джерел"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Ваш планшетний ПК і особисті дані більш уразливі до атак із боку програм із невідомих джерел. Ви погоджуєтеся з тим, що несете особисту відповідальність за будь-яку заподіяну вашому планшетному ПК шкоду чи втрату даних унаслідок використання таких програм."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Ваш телефон і особисті дані більш уразливі до атак із боку програм із невідомих джерел. Ви погоджуєтеся з тим, що несете особисту відповідальність за будь-яку заподіяну вашому телефону шкоду чи втрату даних унаслідок використання таких програм."</string>
+    <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="application_info_label" msgid="5736524913065714880">"Інформація про програму"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Дані на носії USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Карта SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Видалити"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Видалити для всіх користувачів"</string>
+    <string name="install_text" msgid="884360662922471113">"Установити"</string>
     <string name="disable_text" msgid="6544054052049395202">"Вимкнути"</string>
     <string name="enable_text" msgid="9217362512327828987">"Увімкнути"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Очистити дані"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Показати кешовані процеси"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Скинути налашт-ня програм"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Скинути налашт. програм?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ця дія скине всі налаштування для:"\n\n" "<li>"вимкнених програм"</li>\n" "<li>"вимкнених сповіщень програм"</li>\n" "<li>"дій у програмах за умовчанням"</li>\n" "<li>"обмежень щодо фонових даних для програм"</li>\n\n" Жодні дані програм не буде втрачено."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ця дія скине всі налаштування для:\n\n "<li>"вимкнених програм"</li>\n" "<li>"вимкнених сповіщень програм"</li>\n" "<li>"дій у програмах за умовчанням"</li>\n" "<li>"обмежень щодо фонових даних для програм"</li>\n\n" Жодні дані програм не буде втрачено."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Скинути програми"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Кер. простором"</string>
     <string name="filter" msgid="2018011724373033887">"Фільтрув."</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Вибрати параметри фільтра"</string>
     <string name="filter_apps_all" msgid="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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На карті SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Вимкнено"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Не встановлено"</string>
     <string name="no_applications" msgid="7336588977497084921">"Програм немає."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Внутр. пам\'ять"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Носій USB"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> і <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Користування програмою може бути платним:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Надсилати платні SMS"</string>
     <string name="computing_size" msgid="1599186977475211186">"Обчислення..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Не вдалось обчислити розмір пакета."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"У вас не встановлено жодних програм сторонніх розробників."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Змінити потрібне місце для встановлення нових програм"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Вимкнути вбудовану програму?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Відключення вбудованої програми може призвести до неправильного функціонування інших програм."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Видалити дані та вимкнути програму?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <string name="memory" msgid="6609961111091483458">"Опер. пам."</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Користувач: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Віддалений користувач"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"Процес: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, служба: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"Процесів: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, служб: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"Процесів: <xliff:g id="NUMPROCESS">%1$d</xliff:g>, служб: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
@@ -1103,7 +1201,7 @@
     <string name="runningservicedetails_services_title" msgid="391168243725357375">"Служби"</string>
     <string name="runningservicedetails_processes_title" msgid="928115582044655268">"Процеси"</string>
     <string name="service_stop" msgid="6369807553277527248">"Зупин."</string>
-    <string name="service_manage" msgid="1876642087421959194">"Налаштув-ня"</string>
+    <string name="service_manage" msgid="1876642087421959194">"Налаштування"</string>
     <string name="service_stop_description" msgid="9146619928198961643">"Цю службу запущено її програмою. Зупинення служби може спричинити помилку програми."</string>
     <string name="heavy_weight_stop_description" msgid="2979218727598321095">"Цю програму неможливо безпечно зупинити – це може призвести до втрати частини вашої поточної роботи."</string>
     <string name="background_process_stop_description" msgid="5034773197139654588">"Це процес попередньої програми, який досі запущено для використання в разі потреби. Зазвичай його не потрібно зупиняти."</string>
@@ -1128,8 +1226,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="show_password_summary" msgid="7345931695292850058"></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>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Щоб переключити, натис. Ctrl–Пробіл"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"За умовчанням"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Розкладки клавіатури"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Словник корист-ча"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Особистий словник"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Особисті словники"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Особистий словник"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Додати"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Додати до словника"</string>
@@ -1157,6 +1252,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>
@@ -1166,7 +1263,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>
@@ -1197,24 +1294,38 @@
     <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="bt_hci_snoop_log" msgid="3340699311158865670">"Увімкнути журнал відстеження інтерфейсу Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Робити знімки всіх пакетів інтерфейсу Bluetooth у файлі"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Вибрати робочий цикл"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Вибрати робочий цикл"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Перезавантажити, щоб змінити робочий цикл із <xliff:g id="OLD">%1$s</xliff:g> на <xliff:g id="NEW">%2$s</xliff:g>?"</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>
+    <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>
-    <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_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="enable_terminal_title" msgid="95572094356054120">"Локальний термінал"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Увімк. програму-термінал, що надає локальний доступ до оболонки"</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>
@@ -1234,48 +1345,62 @@
     <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_toggle_large_text_title" msgid="6618674985313017711">"Великий текст"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Кнопка живлення закінчує виклик"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Диктувати паролі"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Затримка натискання й утримування"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Покращення доступності мережі"</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>
+    <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_toggle_speak_password_preference_title" msgid="5986628515113204844">"Диктувати паролі"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Затримка натискання й утримування"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Налаштування"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Увімк."</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Вимк."</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="accessibility_feature_state_on" msgid="2864292320042673806">"Увімкнено"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Вимкнено"</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="print_settings" msgid="4742428530112487843">"Друк"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Налаштування друку"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Служби"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Використовувати <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> отримуватиме документи, які ви друкуєте. Такі документи можуть містити конфіденційну інформацію."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Не встановлено жодну службу"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Налаштування"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Додати принтери"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Увімк."</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Вимк."</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" 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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Отримані дані"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Мобільні дані надіслано"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Мобільні дані отримано"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Дані Wi‑Fi надіслано"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Дані Wi‑Fi отримано"</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>
@@ -1306,24 +1433,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_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_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>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Вис. зв."</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Впливає на тон відтворюваного тексту"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Мова"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Мову не вибрано"</string>
     <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>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Яскравість <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"авто"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"повна"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"часткова"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"вимкнено"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Сховище облікових даних"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Установити з носія"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Резервне копіювання та відновлення"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Особисті дані"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Рез. коп. даних"</string>
-    <string name="backup_data_summary" msgid="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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"У разі повторного встановлення програми відновлювати налаштування та дані з резервних копій"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Зробити звіт про помилки"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Збиратиметься інформація про поточний стан вашого пристрою для подальшого надсилання електронною поштою. Від початку створення звіту про помилки до його повної готовності для надсилання потрібен певний час, тож будьте терплячими."</string>
-    <string name="report" msgid="302437572240018342">"Звіт"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Пароль резерв.копії на ПК"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Повні резервні копії на комп’ютері наразі не захищені"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Торкніться, щоб змінити чи видалити пароль для повного резервного копіювання на комп’ютер"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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>
@@ -1477,11 +1621,11 @@
     <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="add_account_label" msgid="7811707265834013767">"Додати облік. запис"</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="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>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Підсвічув. всю поверхню вікна під час оновлення"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Показувати оновл. перегл."</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Підсвічув. область у вікні під час рисування з GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Показ. апаратні оновлення"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Виділяти апаратні рівні зеленим під час оновлення"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Налагодити накладання GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Показати використання ЦП"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Наклад-ня на екрані, яке показ.поточне використ.ЦП"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Примусова візуалізація GPU"</string>
     <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>
+    <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>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Знищувати кожну дію, щойно користувач припиняє її"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <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" msgid="1466689968707308512">"Якщо доступні лише мобільні мережі, програми, що використовують фонові дані, можуть не працювати."\n\n"Відповідніші елементи керування використанням даних можна знайти в налаштуваннях цієї програми."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Якщо доступні лише мобільні мережі, програми, що використовують фонові дані, можуть не працювати.\n\nВідповідніші елементи керування використанням даних можна знайти в налаштуваннях цієї програми."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="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>
@@ -1620,22 +1769,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" 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_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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Додати профіль VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Редагувати профіль"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Видалити профіль"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Постійна мережа VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Виберіть профіль мережі VPN і не від’єднуйтесь від неї. Мережевий трафік дозволятиметься лише за умови під’єднання до цієї VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Нічого"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Для постійної мережі VPN потрібна IP-адреса як для сервера, так і для DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Немає з’єднання з мережею. Повторіть спробу пізніше."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Сертифікат відсутній. Відредагуйте профіль."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Система"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Скасувати"</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">"Додаткові оновлення системи"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Користувачі й обмеження"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Користувачі"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Додати користувача"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Редагувати дані"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Інформація користувача"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Ім’я"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Обмеження вмісту"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Запитувати PIN-код"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Рейтинг вмісту"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Системні програми"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Установлені програми"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Закрити"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Видалити користувача"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Надокучлива дитина"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Вимкнено"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Дозволено"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Застосовано"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Користувачі"</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="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_confirm_remove_message" msgid="5284111415714437285">"Дійсно видалити користувача та всі пов’язані дані з цього пристрою?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Змінити розмір шрифту"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Обмеження"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Зняти обмеження"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Змінити PIN-код"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Показати сповіщення"</string>
     <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="user_restrictions_title" msgid="7745810037152772035">"Обмеження для програм і вмісту"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ПЕРЕЙМЕНУВАТИ"</string>
+    <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Установити обмеження для програм"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Керується програмою <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ця програма не підтримується в обмежених профілях"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ця програма може отримувати доступ до ваших облікових записів"</string>
+    <string name="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 479c5cc..b44f15d 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,16 +218,127 @@
     <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="886742181977884584">"Truyền thông"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"các nút phương tiện truyền thông"</item>
+    <item msgid="4547883971364273343">"tập trung âm thanh"</item>
+    <item msgid="2603878814882344450">"âm lượng chính"</item>
+    <item msgid="7136963238377062018">"âm lượng thoại"</item>
+    <item msgid="4270236897655923007">"âm lượng chuông"</item>
+    <item msgid="6325739889222559394">"âm lượng phương tiện truyền thông"</item>
+    <item msgid="5762123934816216821">"âm lượng báo thức"</item>
+    <item msgid="785049718065337473">"âm lượng thông báo"</item>
+    <item msgid="6700305533746877052">"âm lượng bluetooth"</item>
+    <item msgid="2029227495214047094">"không khóa màn hình"</item>
+    <item msgid="26109888160231211">"giám sát vị trí"</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>
+    <item msgid="5753789168376302997">"Các nút phương tiện"</item>
+    <item msgid="3265262911688671938">"Tập trung âm thanh"</item>
+    <item msgid="2098976479485046797">"Âm lượng chính"</item>
+    <item msgid="5660213838861789350">"Âm lượng thoại"</item>
+    <item msgid="7983336752371254444">"Âm lượng chuông"</item>
+    <item msgid="7878027809189330917">"Âm lượng phương tiện"</item>
+    <item msgid="7260546305036218513">"Âm lượng báo thức"</item>
+    <item msgid="9103719301075748925">"Âm lượng thông báo"</item>
+    <item msgid="7025966722295861512">"Âm lượng bluetooth"</item>
+    <item msgid="4665183401128289653">"Không khóa màn hình"</item>
+    <item msgid="8584357129746649222">"Vị trí"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Ngắn"</item>
     <item msgid="2560532955514699713">"Trung bình"</item>
     <item msgid="2372711992605524591">"Dài"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (gỡ lỗi)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Sử dụng Dalvik"</item>
+    <item msgid="5131846588686178907">"Sử dụng ART"</item>
+    <item msgid="4530003713865319928">"Sử dụng bản dựng gỡ lỗi ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Không bao giờ kiểm tra"</item>
     <item msgid="6042769699089883931">"Chỉ kiểm tra nội dung DRM"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Tỷ lệ hình động 5x"</item>
     <item msgid="1069584980746680398">"Tỷ lệ hình động 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Không có"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi và 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Không có"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Tắt"</item>
+    <item msgid="7688197031296835369">"Hiển thị các vùng vẽ quá"</item>
+    <item msgid="8332661909019981149">"Hiển thị bộ đo mức vẽ quá"</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>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Thời gian chờ"</item>
     <item msgid="7664124146786465092">"Không thành công"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Hỏi"</item>
+    <item msgid="5077768429488260031">"Không bao giờ cho phép"</item>
+    <item msgid="1417929597727989746">"Luôn cho phép"</item>
+  </string-array>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 49342bc..d851660 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Có"</string>
     <string name="no" msgid="6731231425810196216">"Không"</string>
     <string name="create" msgid="3578857613172647409">"Tạo"</string>
+    <string name="allow" msgid="3349662621170855910">"Cho phép"</string>
+    <string name="deny" msgid="6947806159746484865">"Từ chối"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Không xác định"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Bây giờ, bạn giờ chỉ cần thực hiện <xliff:g id="STEP_COUNT">%1$d</xliff:g> bước nữa là sẽ trở thành nhà phát triển."</item>
+    <item quantity="other" msgid="6722953419953594148">"Bây giờ, bạn giờ chỉ cần thực hiện <xliff:g id="STEP_COUNT">%1$d</xliff:g> bước nữa là sẽ trở thành nhà phát triển."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Bạn đã là nhà phát triển!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Không cần, bạn đã là nhà phát triển."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"KHÔNG DÂY &amp; MẠNG"</string>
     <string name="header_category_device" msgid="5781174212691167553">"THIẾT BỊ"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"CÁ NHÂN"</string>
@@ -38,7 +46,7 @@
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Nhận danh sách PDP"</string>
     <string name="radioInfo_service_in" msgid="1915416319177520020">"Đang sử dụng"</string>
     <string name="radioInfo_service_out" msgid="5238736759641916278">"Không có dịch vụ"</string>
-    <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Chỉ cuộc gọi khẩn cấp"</string>
+    <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Chỉ cuộc gọi khẩn"</string>
     <string name="radioInfo_service_off" msgid="1434084741785525415">"Tắt radio"</string>
     <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Chuyển vùng"</string>
     <string name="radioInfo_roaming_not" msgid="2851853244069662307">"Không chuyển vùng"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Đang sạc"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Ngưng sạc"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(không dây)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Hiện không sạc"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Hiện không sạc"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Đầy"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Đã tháo đầu cắm"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"không dây"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Không xác định"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Không xác định"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Lỗi không xác định"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Không hoạt động"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Có thể phát hiện"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Hiển thị với tất cả th.bị Bluetooth gần đó (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Hiển thị với tất cả các thiết bị Bluetooth gần đó"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Không hiển thị với các thiết bị Bluetooth khác"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Chỉ hiển thị với các thiết bị được ghép nối"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Đặt thiết bị ở chế độ có thể phát hiện"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Hết thời gian hiển thị"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Đặt thời gian thiết bị có thể phát hiện được"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Khoá quay số bằng giọng nói"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Ngăn việc sử dụng trình quay số bluetooth khi màn hình bị khóa."</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Thiết bị Bluetooth"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Hiển thị các tệp đã nhận"</string>
     <string name="device_picker" msgid="8398232791303186677">"Trình chọn thiết bị Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Yêu cầu quyền Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Một ứng dụng muốn bật Bluetooth. Cho phép?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Một ứng dụng trên máy tính bảng của bạn muốn đặt máy tính bảng của bạn ở chế độ có thể phát hiện được bởi các thiết bị Bluetooth khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây. Cho phép?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Một ứng dụng trên điện thoại của bạn muốn đặt điện thoại của bạn ở chế độ có thể phát hiện được bởi các thiết bị Bluetooth khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây. Cho phép?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Một ứng dụng trên máy tính bảng của bạn muốn đặt máy tính bảng ở chế độ “luôn có thể phát hiện được” bởi các thiết bị Bluetooth khác. Cho phép?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Một ứng dụng trên điện thoại của bạn muốn đặt điện thoại của bạn ở chế độ “luôn phát hiện được” bởi thiết bị Bluetooth khác. Cho phép?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Một ứng dụng trên máy tính bảng của bạn muốn bật Bluetooth và đặt máy tính bảng của bạn ở chế độ có thể phát hiện được bởi các thiết bị khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây. Cho phép?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Một ứng dụng trên điện thoại của bạn muốn bật Bluetooth và đặt điện thoại của bạn ở chế độ có thể phát hiện được bởi các thiết bị khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây. Cho phép?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Một ứng dụng trên máy tính bảng của bạn muốn bật Bluetooth và đặt máy tính bảng của bạn ở chế độ có thể phát hiện được bởi các thiết bị khác. Cho phép?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Một ứng dụng trên điện thoại của bạn muốn bật Bluetooth và đặt điện thoại của bạn ở chế độ có thể phát hiện được bởi các thiết bị khác. Cho phép?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Một ứng dụng muốn bật Bluetooth."</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Một ứng dụng muốn đặt máy tính bảng của bạn ở chế độ hiển thị với các thiết bị Bluetooth khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Một ứng dụng muốn đặt điện thoại của bạn ở chế độ hiển thị với các thiết bị Bluetooth khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Một ứng dụng muốn đặt máy tính bảng của bạn ở chế độ hiển thị với các thiết bị khác. Bạn có thể thay đổi cài đặt này sau trong cài đặt Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Một ứng dụng muốn đặt điện thoại của bạn ở chế độ hiển thị với các thiết bị khác. Bạn có thể thay đổi cài đặt này sau trong cài đặt Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Một ứng dụng muốn bật Bluetooth và đặt máy tính bảng của bạn ở chế độ hiển thị với các thiết bị khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Một ứng dụng muốn bật Bluetooth và đặt điện thoại của bạn ở chế độ hiển thị với các thiết bị khác trong <xliff:g id="TIMEOUT">%1$d</xliff:g> giây."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Một ứng dụng muốn bật Bluetooth và đặt máy tính bảng của bạn ở chế độ hiển thị với các thiết bị khác. Bạn có thể thay đổi cài đặt này sau trong cài đặt Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Một ứng dụng muốn bật Bluetooth và đặt điện thoại của bạn ở chế độ hiển thị với các thiết bị khác. Bạn có thể thay đổi cài đặt này sau trong cài đặt Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Đang bật Bluetooth…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Đang tắt Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Tự động kết nối"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP được sử dụng bởi trình duyệt nhưng có thể không được sử dụng bởi các ứng dụng khác."</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Vị trí:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID lân cận:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Nỗ lực dữ liệu:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Dịch vụ GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Chuyển vùng:"</string>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Bạn đã mất kết nối dữ liệu vì bạn đã tắt chuyển vùng dữ liệu của mạng gia đình của mình."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Bật"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Khi cho phép chuyển vùng dữ liệu, bạn có thể bị tính phí chuyển vùng đáng kể!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Khi bạn cho phép chuyển vùng dữ liệu, bạn có thể phải trả khoản phí chuyển vùng đáng kể!\n\nCà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="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Khi bạn cho phép chuyển vùng dữ liệu, bạn có thể phải trả khoản phí chuyển vùng đáng kể!\n\nCà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="roaming_reenable_title" msgid="6068100976707316772">"Cho phép chuyển vùng dữ liệu?"</string>
     <string name="networks" msgid="6333316876545927039">"Chọn nhà cung cấp dịch vụ"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Chọn nhà cung cấp dịch vụ mạng"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Thông tin chủ sở hữu"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Yêu cầu PIN số hoặc mật khẩu để giải mã điện thoại của bạn mỗi lần bạn bật điện thoại"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Yêu cầu PIN số hoặc mật khẩu để giải mã điện thoại của bạn mỗi lần bạn bật điện thoại"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Đã mã hóa"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống và dữ liệu, phương tiện của các ứng dụng đó cũng như các tệp khác của bạn. Sau khi mã hóa máy tính bảng, bạn cần nhập mã PIN số hoặc mật khẩu để giải mã mỗi lần bạn bật máy tính bảng: bạn không thể hủy mã hóa máy tính bảng trừ khi thiết lập lại dữ liệu ban đầu, xóa tất cả dữ liệu của bạn."\n\n"Quá trình mã hóa mất ít nhất một giờ. Bạn phải bắt đầu khi pin đã được sạc và vẫn cắm máy tính bảng cho tới khi quá trình mã hóa hoàn tất. Nếu làm gián đoạn quá trình mã hóa, bạn sẽ mất một số hoặc tất cả dữ liệu của bạn."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống và dữ liệu, phương tiện của các ứng dụng đó cũng như các tệp khác của bạn. Sau khi mã hóa điện thoại, bạn cần nhập mã PIN số hoặc mật khẩu để giải mã mỗi lần bạn bật điện thoại. Bạn không thể hủy mã hóa điện thoại trừ khi thiết lập lại dữ liệu ban đầu, xóa tất cả dữ liệu của bạn."\n\n"Quá trình mã hóa mất ít nhất một giờ. Bạn phải bắt đầu khi pin đã được sạc và vẫn cắm điện thoại cho tới khi quá trình mã hóa hoàn tất. Nếu làm gián đoạn quá trình mã hóa, bạn sẽ mất một số hoặc tất cả dữ liệu của bạn."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống và dữ liệu, phương tiện của các ứng dụng đó cũng như các tệp khác của bạn. Sau khi mã hóa máy tính bảng, bạn cần nhập mã PIN số hoặc mật khẩu để giải mã mỗi lần bạn bật máy tính bảng: bạn không thể hủy mã hóa máy tính bảng trừ khi thiết lập lại dữ liệu ban đầu, xóa tất cả dữ liệu của bạn.\n\nQuá trình mã hóa mất ít nhất một giờ. Bạn phải bắt đầu khi pin đã được sạc và vẫn cắm máy tính bảng cho tới khi quá trình mã hóa hoàn tất. Nếu làm gián đoạn quá trình mã hóa, bạn sẽ mất một số hoặc tất cả dữ liệu của bạn."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống và dữ liệu, phương tiện của các ứng dụng đó cũng như các tệp khác của bạn. Sau khi mã hóa điện thoại, bạn cần nhập mã PIN số hoặc mật khẩu để giải mã mỗi lần bạn bật điện thoại. Bạn không thể hủy mã hóa điện thoại trừ khi thiết lập lại dữ liệu ban đầu, xóa tất cả dữ liệu của bạn.\n\nQuá trình mã hóa mất ít nhất một giờ. Bạn phải bắt đầu khi pin đã được sạc và vẫn cắm điện thoại cho tới khi quá trình mã hóa hoàn tất. Nếu làm gián đoạn quá trình mã hóa, bạn sẽ mất một số hoặc tất cả dữ liệu của bạn."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Mã hóa máy tính bảng"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Mã hóa điện thoại"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Vui lòng sạc pin và thử lại."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Hãy thử lại sau <xliff:g id="DELAY">^1</xliff:g> giây."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Nhập mật khẩu của bạn"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Mã hóa không thành công"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Quá trình mã hóa đã bị gián đoạn và không thể hoàn tất. Do đó, dữ liệu trên máy tính bảng của bạn không còn có thể truy cập được. "\n\n" Để tiếp tục sử dụng máy tính bảng của mình, bạn cần đặt lại về cài đặt ban đầu. Khi bạn thiết lập máy tính bảng sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu được sao lưu vào Tài khoản Google của mình."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Quá trình mã hóa bị gián đoạn và không thể hoàn tất. Do đó, dữ liệu trên điện thoại của bạn không còn có thể truy cập được. "\n\n"Để tiếp tục sử dụng điện thoại của mình, bạn cần đặt lại về cài đặt ban đầu. Khi bạn thiết lập điện thoại sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu được sao lưu vào Tài khoản Google của mình."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Quá trình mã hóa đã bị gián đoạn và không thể hoàn tất. Do đó, dữ liệu trên máy tính bảng của bạn không còn có thể truy cập được. \n\n Để tiếp tục sử dụng máy tính bảng của mình, bạn cần đặt lại về cài đặt ban đầu. Khi bạn thiết lập máy tính bảng sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu được sao lưu vào Tài khoản Google của mình."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Quá trình mã hóa bị gián đoạn và không thể hoàn tất. Do đó, dữ liệu trên điện thoại của bạn không còn có thể truy cập được. \n\nĐể tiếp tục sử dụng điện thoại của mình, bạn cần đặt lại về cài đặt ban đầu. Khi bạn thiết lập điện thoại sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu được sao lưu vào Tài khoản Google của mình."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Chuyển phương thức nhập"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Chọn khóa màn hình"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Chọn khóa dự phòng"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Thay đổi mã PIN mở khóa"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Thay đổi mật khẩu mở khóa"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Mật khẩu phải có ít nhất %d ký tự"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Mã PIN phải có ít nhất %d ký tự"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Mã PIN phải có ít nhất %d chữ số"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Chạm vào Tiếp tục khi hoàn tất"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Tiếp tục"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Mật khẩu phải ít hơn <xliff:g id="NUMBER">%d</xliff:g> ký tự."</string>
@@ -406,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>
@@ -480,6 +503,28 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Làm loa ngoài"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Cho nhạc và phương tiện"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Nhớ cài đặt"</string>
+    <string name="wifi_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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Hiển thị thiết bị được ghép nối"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Thiết bị có sẵn"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Đang kết nối"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Đã kết nối"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Khả dụng"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Đang được sử dụng"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Cài đặt hiển thị"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Ngắt kết nối?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Tác vụ này sẽ kết thúc kết nối của bạn với:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Tùy chọn hiển thị không dây"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Bỏ qua"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Xong"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Tên"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Bật"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Tắt"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Đã bị vô hiệu hóa"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Cho phép trao đổi dữ liệu khi máy tính bảng chạm vào thiết bị khác"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Cho phép trao đổi dữ liệu khi điện thoại chạm vào thiết bị khác"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Tắt"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Không khả dụng vì NFC bị tắt"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <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="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\nChỉ 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="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="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="8116564886303972764">"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 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_in_progress" msgid="2944576520214787628">"WPS đã được xử lý và có thể mất tối đa hai giây để hoàn tất"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Cài đặt bảo mật bộ định tuyến không dây (TKIP) không được hỗ trợ"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Xác thực không thành công. Vui lòng thử lại."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Đã phát hiện một phiên WPS khác. Vui lòng thử lại sau ít phút."</string>
     <string name="wifi_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>
@@ -564,6 +621,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\nCho phép cài đặt này đối với tất cả ứng dụng muốn quét?"</string>
+    <string name="wifi_scan_always_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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Lưu"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Không thể lưu mạng"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Hủ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_skip_anyway" msgid="6965361454438011190">"Vẫn bỏ qua"</string>
+    <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\nThiế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\nThiế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="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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Đang tìm kiếm…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Đổi tên thiết bị"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Thiết bị ngang hàng"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Các nhóm đã xóa"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Không thể kết nối."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Không thể đổi tên thiết bị."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Ngắt kết nối?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Nếu bạn ngắt kết nối, kết nối của bạn với <xliff:g id="PEER_NAME">%1$s</xliff:g> và <xliff:g id="PEER_COUNT">%2$s</xliff:g> thiết bị khác sẽ kết thúc."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Điểm phát sóng Wi-Fi di động"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Bỏ qua nhóm này?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Điểm phát sóng Wi‑Fi di động"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Hiệu ứng âm nhạc"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Âm lượng chuông"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Rung khi im lặng"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Thông báo mặc định"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Âm thanh thông báo mặc định"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Đèn thông báo dạng xung"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Nhạc chuông"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Thông báo"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Sử dụng âm lượng cuộc gọi đến cho thông báo"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Chọn nhạc chuông thông báo"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Âm thanh thông báo mặc định"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Phương tiện"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Đặt âm lượng cho nhạc và video"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Báo thức"</string>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Sau khi không hoạt động <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Hình nền"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Chọn hình nền từ"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"Kẹo trên màn hình"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Sẽ được bật nếu được kết nối với nguồn"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Đã bị tắt"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Kẹo được chọn"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Thời điểm kích hoạt"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Sau <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> không hoạt động"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Không bao giờ"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Hãy dùng thử!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Cũng kích hoạt khi được gắn"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Chế độ ngủ"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Khi được gắn đế hoặc ở chế độ ngủ và sạc pin"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Khi gắn đế và sạc"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Trong khi sạc"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Khi gắn đế"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Tắt"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Để kiểm soát những gì diễn ra khi điện thoại được gắn đế và/hoặc ở chế độ ngủ, hãy bật Chế độ ngủ."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Khi vào chế độ ngủ"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Bắt đầu ngay"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Cài đặt"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Độ sáng tự động"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Kích thước phông chữ"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Kích thước phông chữ"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"Mã PIN của SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Mã PIN không chính xác"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Các mã PIN không khớp"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Không thể thay đổi mã PIN."\n"Có thể mã PIN không đúng."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Không thể thay đổi mã PIN.\nCó thể mã PIN không đúng."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Mã PIN của SIM đã được thay đổi thành công"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Không thể thay đổi trạng thái khóa thẻ SIM."\n"Có thể mã PIN không đúng."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Không thể thay đổi trạng thái khóa thẻ SIM.\nCó thể mã PIN không đúng."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Hủy"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Trạng thái của máy tính bảng"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"Phiên bản dải tần cơ sở"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Phiên bản Kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Số phiên bản"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Trạng thái SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Không khả dụng"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Trạng thái"</string>
     <string name="device_status" msgid="607405385799807324">"Trạng thái"</string>
@@ -733,12 +807,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">"Loại mạng di động"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Thông tin nhà cung cấp dịch vụ"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Trạng thái mạng di động"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Tình trạng sử dụng"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Bộ nhớ USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Thẻ SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"Sẵn có"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Khả dụng (chỉ đọc)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Tổng dung lượng"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Đang tính toán..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Ứng dụng (dữ liệu ứng dụng và nội dung đa phương tiện)"</string>
@@ -756,6 +832,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Ảnh, video"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Âm thanh (âm nhạc, nhạc chuông, podcast, v.v)."</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Khác"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Dữ liệu đã lưu trong bộ nhớ cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Ngắt kết nối bộ nhớ được chia sẻ"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Tháo thẻ SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Ngắt kết nối bộ nhớ trong USB"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Xóa thẻ SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Xóa tất cả dữ liệu trên bộ nhớ trong USB, chẳng hạn như nhạc và ảnh"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Xóa tất cả dữ liệu trên thẻ SD, chẳng hạn như nhạc và ảnh"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Chỉ đọc)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Xóa dữ liệu đã lưu trong bộ nhớ cache?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Xóa dữ liệu lưu trong cache cho tất cả ứng dụng."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Chức năng MTP hoặc PTP đang hoạt động"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Ngắt kết nối bộ lưu trữ USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Tháo thẻ SD?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Nếu bạn ngắt kết nối bộ lưu trữ USB, một số ứng dụng bạn đang sử dụng sẽ ngừng và có thể không khả dụng cho tới khi bạn kết nối lại bộ lưu trữ USB."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Máy ảnh (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Cho phép bạn chuyển ảnh bằng cách sử dụng phần mềm máy ảnh và chuyển bất kỳ tệp nào trên máy tính không hỗ trợ MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Cài đặt công cụ truyền tệp"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Người dùng khác"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Tình trạng pin"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Mức pin"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Đặt lại về dữ liệu gốc"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Xóa tất cả dữ liệu trên máy tính bảng"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Xóa tất cả dữ liệu trên điện thoại"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tác vụ này sẽ xóa tất cả dữ liệu từ "<b>"bộ nhớ trong"</b>" của máy tính bảng, bao gồm:"\n\n<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tác vụ này sẽ xóa tất cả dữ liệu từ "<b>"bộ nhớ trong"</b>" của điện thoại, bao gồm:"\n\n<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Bạn hiện đã đăng nhập vào các tài khoản sau đây:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tác vụ này sẽ xóa tất cả dữ liệu từ "<b>"bộ nhớ trong"</b>" của máy tính bảng, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tác vụ này sẽ xóa tất cả dữ liệu từ "<b>"bộ nhớ trong"</b>" của điện thoại, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Bạn hiện đã đăng nhập vào các tài khoản sau đây:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Nhạc"</li>\n<li>"Ảnh"</li>\n<li>"Dữ liệu người dùng khác"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Để xóa nhạc, hình ảnh và dữ liệu người dùng khác, cần xóa "<b>"bộ lưu trữ USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Đồng thời, để xóa nhạc, hình ảnh và dữ liệu người dùng khác, cần xóa "<b>"thẻ"</b>"."</string>
@@ -897,10 +979,15 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ được tháo."</string>
     <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="manage_mobile_plan_title" msgid="7588182101738043593">"Quản lý gói dịch vụ di động"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Nhà cung cấp SIM không xác định"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s không có trang web cấp phép xác định"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vui lòng lắp thẻ SIM và khởi động lại"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Vui lòng kết nối internet"</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>
@@ -917,6 +1004,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Xem thông tin pháp lý, trạng thái, phiên bản phần mềm"</string>
     <string name="legal_information" msgid="5769301644270604095">"Thông tin pháp lý"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Người đóng góp"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Thông tin về quy định"</string>
     <string name="copyright_title" msgid="865906688917260647">"Bản quyền"</string>
     <string name="license_title" msgid="1990487604356037871">"Giấy phép"</string>
     <string name="terms_title" msgid="7697580845616764642">"Điều khoản và điều kiện"</string>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Thay đổi mã PIN mở khóa"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Xác nhận hình đã lưu"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Thử lại:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Vẽ hình mở khóa"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Vẽ hình mở khóa:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Nhấn vào Trình đơn để được trợ giúp."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Thả ngón tay khi xong."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Kết nối ít nhất <xliff:g id="NUMBER">%d</xliff:g> điểm. Hãy thử lại:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cách vẽ hình mở khóa"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Quá nhiều lần không chính xác!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Hãy thử lại sau <xliff:g id="NUMBER">%d</xliff:g> giây."</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"Hủy"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Tiếp theo"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Đang bảo vệ máy tính bảng của bạn"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Đang bảo vệ điện thoại của bạn"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Bảo vệ máy tính bảng của bạn khỏi hành vi sử dụng trái phép bằng cách tạo hình mở khóa màn hình cá nhân. Trượt ngón tay để kết nối các điểm theo thứ tự bất kỳ trên màn hình tiếp theo. Bạn cần kết nối ít nhất bốn điểm. "\n\n"Bạn đã sẵn sàng bắt đầu chưa? Hãy chạm vào Tiếp theo."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Bảo vệ điện thoại của bạn khỏi hành vi sử dụng trái phép bằng cách tạo hình mở khóa màn hình cá nhân. Trượt ngón tay để kết nối ít nhất bốn điểm theo thứ tự bất kỳ trên màn hình tiếp theo. "\n\n"Bạn đã sẵn sàng bắt đầu chưa? Hãy chạm vào Tiếp theo."</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"Ứng dụng chưa được cài đặt trên điện thoại của bạn."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Quản lý ứng dụng"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Quản lý và xóa ứng dụng đã cài đặt"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Ứng dụng"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Cho phép cài đặt ứng dụng từ những nguồn không xác định"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Máy tính bảng và dữ liệu cá nhân của bạn dễ bị tấn công hơn bởi các ứng dụng từ nguồn không xác đinh. Bạn đồng ý rằng bạn tự chịu trách nhiệm cho mọi hỏng hóc đối với máy tính bảng của bạn hoặc mất mát dữ liệu có thể phát sinh do sử dụng những ứng dụng này."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Điện thoại và dữ liệu cá nhân của bạn dễ bị tấn công hơn bởi các ứng dụng từ nguồn không xác đinh. Bạn đồng ý rằng bạn tự chịu trách nhiệm cho mọi hỏng hóc đối với điện thoại của bạn hoặc mất mát dữ liệu có thể phát sinh do sử dụng những ứng dụng này."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Xác minh các ứng dụng"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Không cho phép hoặc cảnh báo trước khi cài đặt ứng dụng có thể gây hại"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Cài đặt nâng cao"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Bật thêm tùy chọn cài đặt"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Thông tin về ứng dụng"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dữ liệu bộ lưu trữ USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Thẻ SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Gỡ cài đặt"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Gỡ cài đặt đối với tất cả người dùng"</string>
+    <string name="install_text" msgid="884360662922471113">"Cài đặt"</string>
     <string name="disable_text" msgid="6544054052049395202">"Tắt"</string>
     <string name="enable_text" msgid="9217362512327828987">"Bật"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Xóa dữ liệu"</string>
@@ -1019,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Hiển thị quá trình đã được lưu trong bộ nhớ cache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Đặt lại tùy chọn ứng dụng"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Đặt lại tùy chọn ứng dụng?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Thao tác này sẽ đặt lại tất cả tùy chọn cho:"\n\n" "<li>"Ứng dụng đã tắt"</li>\n" "<li>"Thông báo ứng dụng đã tắt"</li>\n" "<li>"Ứng dụng mặc định cho tác vụ"</li>\n" "<li>"Hạn chế dữ liệu nền cho ứng dụng"</li>\n\n" Bạn sẽ mất mọi dữ liệu ứng dụng."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Thao tác này sẽ đặt lại tất cả tùy chọn cho:\n\n "<li>"Ứng dụng đã tắt"</li>\n" "<li>"Thông báo ứng dụng đã tắt"</li>\n" "<li>"Ứng dụng mặc định cho tác vụ"</li>\n" "<li>"Hạn chế dữ liệu nền cho ứng dụng"</li>\n\n" Bạn sẽ mất mọi dữ liệu ứng dụng."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Đặt lại ứng dụng"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Quản lý dung lượng"</string>
     <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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Trên thẻ SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Đã tắt"</string>
+    <string name="not_installed" msgid="1475144352069281880">"Chưa cài đặt"</string>
     <string name="no_applications" msgid="7336588977497084921">"Không có ứng dụng."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Bộ nhớ trong"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Bộ nhớ USB"</string>
@@ -1054,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> và <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Bạn có thể phải trả tiền cho ứng dụng này:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Gửi SMS cao cấp"</string>
     <string name="computing_size" msgid="1599186977475211186">"Đang tính toán…"</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Không thể tính toán kích thước gói."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Bạn chưa cài đặt ứng dụng của bên thứ ba nào."</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Thay đổi vị trí cài đặt ưa thích cho ứng dụng mới"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Tắt ứng dụng tích hợp sẵn?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Nếu bạn tắt một ứng dụng tích hợp sẵn, các ứng dụng khác có thể hoạt động sai."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Xóa dữ liệu và tắt ứng dụng?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <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">"Người dùng: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Người dùng đã xóa"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> quá trình và <xliff:g id="NUMSERVICES">%2$d</xliff:g> dịch vụ"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> quá trình và <xliff:g id="NUMSERVICES">%2$d</xliff:g> dịch vụ"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> quá trình và <xliff:g id="NUMSERVICES">%2$d</xliff:g> dịch vụ"</string>
@@ -1128,7 +1226,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Cài đặt bàn phím vật lý"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Nhấn phím Cách hai lần để chèn \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Hiển thị mật khẩu"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Phương thức nhập này có thể thu thập tất cả văn bản bạn nhập, bao gồm dữ liệu cá nhân như mật khẩu và số thẻ tín dụng. Phương thức nhập này đến từ ứng dụng <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Sử dụng phương thức nhập này?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Trình kiểm tra chính tả này có thể thu thập được tất cả văn bản bạn nhập, bao gồm dữ liệu cá nhân như mật khẩu và số thẻ tín dụng. Trình này đến từ ứng dụng <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Sử dụng trình kiểm tra chính tả này?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Cài đặt"</string>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Để chuyển, nhấn Control-Phím cách"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Mặc định"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Bố cục bàn phím"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Từ điển người dùng"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Từ điển cá nhân"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Từ điển cá nhân"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Từ điển cá nhân"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Thêm"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Thêm vào từ điển"</string>
@@ -1157,6 +1252,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>
@@ -1197,24 +1294,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Màn hình sẽ không bao giờ chuyển sang chế độ nghỉ khi sạc"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bật nhật ký theo dõi HCI Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Giữ tất cả các gói HCI bluetooth trong một tệp"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Chọn thời gian chạy"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Chọn thời gian chạy"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Khởi động lại để thay đổi thời gian chạy từ <xliff:g id="OLD">%1$s</xliff:g> sang <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Cho phép vị trí mô phỏng"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Cho phép vị trí mô phỏng"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Kiểm tra các ứng dụng được cài đặt qua ADB/ADT để xem có hoạt động gây hại hay không."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Bảo vệ bộ lưu trữ USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Các ứng dụng phải yêu cầu quyền đọc bộ lưu trữ USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Bảo vệ bộ lưu trữ USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Khi bộ lưu trữ USB được bảo vệ, các ứng dụng phải yêu cầu quyền đọc dữ liệu từ bộ nhớ ngoài."\n\n"Một số ứng dụng có thể không hoạt động cho đến khi được nhà phát triển cập nhật."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Khi bộ lưu trữ USB được bảo vệ, các ứng dụng phải yêu cầu quyền đọc dữ liệu từ bộ nhớ ngoài.\n\nMột số ứng dụng có thể không hoạt động cho đến khi được nhà phát triển cập nhật."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Bảo vệ thẻ SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Các ứng dụng phải yêu cầu quyền đọc thẻ SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Bảo vệ thẻ SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Khi thẻ SD được bảo vệ, các ứng dụng phải yêu cầu quyền đọc dữ liệu từ bộ nhớ ngoài."\n\n"Một số ứng dụng có thể không hoạt động cho đến khi được nhà phát triển cập nhật."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Khi thẻ SD được bảo vệ, các ứng dụng phải yêu cầu quyền đọc dữ liệu từ bộ nhớ ngoài.\n\nMột số ứng dụng có thể không hoạt động cho đến khi được nhà phát triển cập nhật."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Dòng lệnh cục bộ"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Bật ứng dụng dòng lệnh cung cấp quyền truy cập vỏ cục bộ"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Chọn tiện ích"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Chọn tiện ích"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Tạo tiện ích và cho phép truy cập?"</string>
@@ -1234,29 +1345,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Cài đặt hỗ trợ truy cập"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Dịch vụ"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Hệ thống"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Chữ lớn"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Nút Nguồn kết thúc cuộc gọi"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Nói mật khẩu"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Thời gian chờ cho Chạm &amp; giữ"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Nâng cao khả năng truy cập của web"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Thao tác thu phóng"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Khi tính năng này được bật, bạn có thể phóng to và thu nhỏ bằng cách chạm ba lần vào màn hình.\n\nTrong khi phóng to, bạn có thể:\n"<ul><li>"Xoay: Kéo hai hoặc nhiều ngón tay qua màn hình."</li>\n<li>"Điều chỉnh mức thu phóng: Chụm hai hoặc nhiều ngón tay với nhau hoặc tách chúng ra."</li></ul>\n\n"Bạn cũng có thể tạm thời thu phóng các mục bên dưới ngón tay bạn bằng cách nhấn ba lần và giữ. Ở trạng thái thu phóng này, bạn có thể kéo ngón tay để khám phá các phần khác nhau của màn hình. Thả ngón tay để trở về trạng thái trước.\n\nLưu ý: Nhấn ba lần để thu phóng toàn bộ trừ bàn phím và thanh điều hướng."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Phím tắt trợ năng"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Bật"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Tắt"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Khi tính năng này được bật, bạn có thể nhanh chóng bật các tính năng trợ năng trong hai bước:\n\nBước 1: Bấm và giữ nút nguồn cho đến khi bạn nghe thấy một âm thanh hoặc cảm thấy rung.\n\nBước 2: Chạm và giữ hai ngón tay cho đến khi bạn nghe thấy xác nhận bằng âm thanh.\n\nNếu thiết bị có nhiều người dùng, việc sử dụng lối tắt này trên màn hình khóa tạm thời bật trợ năng cho đến khi thiết bị được mở khóa."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Chữ lớn"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Thu phóng màn hình"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Tự động cập nhật thu phóng màn hình"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Cập nhật thu phóng màn hình khi chuyển ứng dụng"</string>
+    <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_menu_item_settings" msgid="3344942964710773365">"Cài đặt"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Bật"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"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="accessibility_feature_state_on" msgid="2864292320042673806">"Bật"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Tắt"</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="print_settings" msgid="4742428530112487843">"In"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Cài đặt in"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Dịch vụ"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Sử dụng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> có thể nhận tài liệu mà bạn in. Những tài liệu như vậy có thể chứa dữ liệu nhạy cảm."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Chưa có dịch vụ nào được cài đặt"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Cài đặt"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Thêm máy in"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Bật"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Tắt"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Pin"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Cái gì đang sử dụng pin"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Không có dữ liệu sử dụng pin."</string>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1293,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Dữ liệu đã nhận được"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Đã gửi dữ liệu di động"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Đã nhận dữ liệu di động"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Đã gửi dữ liệu Wi‑Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Đã nhận dữ liệu Wi‑Fi"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Âm thanh"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Thời gian bật"</string>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Dừng hoặc gỡ cài đặt ứng dụng"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Kiểm soát thủ công GPS để ngăn ứng dụng sử dụng GPS"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Ứng dụng có thể cung cấp các cài đặt để giảm mức sử dụng pin"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Pin do người dùng sử dụng"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> từ khi tháo đầu cắm"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Trong khi tháo đầu cắm lần cuối cho <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Tổng số sử dụng"</string>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Độ cao"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Ảnh hưởng đến âm của văn bản nói"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Ngôn ngữ"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Không thể chọn ngôn ngữ"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Đặt giọng nói ngôn ngữ cụ thể cho văn bản nói"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Nghe ví dụ"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Phát minh hoạ ngắn về tổng hợp tiếng nói"</string>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Độ sáng <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"tự động"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"tối đa"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"trung bình"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"tối thiểu"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Lưu thông tin xác thực"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Cài đặt từ bộ nhớ"</string>
@@ -1390,6 +1534,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>
@@ -1411,14 +1558,11 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Khi cài đặt lại một ứng dụng, khôi phục dữ liệu và cài đặt đã sao lưu"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Nhận báo cáo lỗi"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Báo cáo này sẽ thu thập thông tin về tình trạng thiết bị hiện tại của bạn, để gửi dưới dạng thông báo qua email. Sẽ mất một chút thời gian kể từ khi bắt đầu báo cáo lỗi cho tới khi báo cáo sẵn sàng để gửi; xin vui lòng kiên nhẫn."</string>
-    <string name="report" msgid="302437572240018342">"Báo cáo"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"MK sao lưu của m.tính"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Sao lưu toàn bộ tới máy tính hiện không được bảo vệ"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Chạm để thay đổi hoặc xóa mật khẩu dành cho bộ sao lưu toàn bộ tới máy tính"</string>
@@ -1426,7 +1570,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>
@@ -1442,10 +1586,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>
@@ -1467,9 +1611,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\nChạ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>
@@ -1537,6 +1681,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>
@@ -1548,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Chuyển nhanh toàn bộ các giao diện cửa sổ khi các giao diện này cập nhật"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Hiển thị cập nhật chế độ xem GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Chuyển nhanh chế độ xem trong cửa sổ khi được vẽ bằng GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Hiện c.nhật lớp phần cứng"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Lớp phần cứng flash có màu xanh khi chúng cập nhật"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Hiển thị mức vẽ quá GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Hiển thị mức sử dụng CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Lớp phủ màn hình hiển thị mức sử dụng CPU hiện tại"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Bắt buộc kết xuất GPU"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Mô phỏng màn hình phụ"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Ứng dụng"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Không tiếp tục các hoạt động"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Hủy mọi hoạt động ngay khi người dùng rời khỏi"</string>
     <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>
@@ -1591,8 +1740,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>
@@ -1607,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Tắt dữ liệu nền trên mạng di động. Sử dụng mạng không di động nếu cần."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Để giới hạn dữ liệu nền cho ứng dụng này, trước tiên hãy đặt giới hạn dữ liệu di động."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Giới hạn dữ liệu nền?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Tính năng này có thể khiến ứng dụng phụ thuộc vào dữ liệu nền ngừng hoạt động chỉ khi có mạng di động."\n\n"Bạn có thể tìm thấy biện pháp kiểm soát mức sử dụng dữ liệu thích hợp khác trong các cài đặt có trong ứng dụng."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Tính năng này có thể khiến ứng dụng phụ thuộc vào dữ liệu nền ngừng hoạt động chỉ khi có mạng di động.\n\nBạn có thể tìm thấy biện pháp kiểm soát mức sử dụng dữ liệu thích hợp khác trong các cài đặt có trong ứng dụng."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Chỉ có thể giới hạn dữ liệu nền khi bạn đặt giới hạn dữ liệu di động."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Bật tính năng tự động đồng bộ hóa dữ liệu?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Mọi thay đổi bạn thực hiện cho các tài khoản của bạn trên web sẽ tự động được sao chép sang máy tính bảng của bạn."\n\n"Một số tài khoản cũng có thể tự động sao chép mọi thay đổi bạn thực hiện trên máy tính bảng lên web. Tài khoản Google hoạt động theo cách này."\n\n"Để chọn loại thông tin sẽ đồng bộ hóa với từng tài khoản, truy cập Cài đặt và tài khoản."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Mọi thay đổi bạn thực hiện cho các tài khoản của bạn trên web sẽ được tự động sao chép sang điện thoại của bạn."\n\n"Một số tài khoản cũng có thể tự động đồng bộ hóa mọi thay đổi bạn thực hiện trên điện thoại với web. Tài khoản Google hoạt động theo cách này."\n\n"Để chọn loại thông tin sẽ đồng bộ hóa trong từng tài khoản, truy cập Cài đặt và tài khoản."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Mọi thay đổi bạn thực hiện cho các tài khoản của bạn trên web sẽ tự động được sao chép sang máy tính bảng của bạn.\n\nMột số tài khoản cũng có thể tự động sao chép mọi thay đổi bạn thực hiện trên máy tính bảng lên web. Tài khoản Google hoạt động theo cách này.\n\nĐể chọn loại thông tin sẽ đồng bộ hóa với từng tài khoản, truy cập Cài đặt và tài khoản."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Mọi thay đổi bạn thực hiện cho các tài khoản của bạn trên web sẽ được tự động sao chép sang điện thoại của bạn.\n\nMột số tài khoản cũng có thể tự động đồng bộ hóa mọi thay đổi bạn thực hiện trên điện thoại với web. Tài khoản Google hoạt động theo cách này.\n\nĐể chọn loại thông tin sẽ đồng bộ hóa trong từng tài khoản, truy cập Cài đặt và tài khoản."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Tắt tính năng tự động đồng bộ hóa dữ liệu?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Việc này sẽ bảo toàn mức sử dụng dữ liệu và pin, tuy nhiên bạn sẽ cần phải đồng bộ hóa từng tài khoản theo cách thủ công để thu thập thông tin gần đây. Và bạn sẽ không nhận được thông báo khi có cập nhật."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Ngày đặt lại chu kỳ sử dụng"</string>
@@ -1620,22 +1769,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Thiết lập cảnh báo sử dụng dữ liệu"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Thiết lập giới hạn sử dụng dữ liệu"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Giới hạn sử dụng dữ liệu"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="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_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\nVì 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\nVì 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" 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\nCà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\nCà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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Ứng dụng và người dùng bị xóa"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"Đã nhận <xliff:g id="RECEIVED">%1$s</xliff:g>, đã gửi <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>: khoảng <xliff:g id="TOTAL">%1$s</xliff:g> đã được sử dụng."</string>
     <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>
@@ -1667,6 +1819,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Thêm cấu hình VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Chỉnh sửa cấu hình"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Xóa cấu hình"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN luôn bật"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Chọn một cấu hình VPN để luôn giữ kết nối. Lưu lượng truy cập mạng sẽ chỉ được cho phép khi kết nối với VPN này."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Không có"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"VPN luôn bật yêu cầu có địa chỉ IP cho cả máy chủ và DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Không có kết nối mạng. Vui lòng thử lại sau."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Thiếu chứng chỉ. Vui lòng chỉnh sửa tiểu sử."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Hệ thống"</string>
@@ -1685,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Hủy"</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">"Bản cập nhật hệ thống bổ sung"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Người dùng và giới hạn"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Người dùng"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Thêm người dùng"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Chỉnh sửa chi tiết"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Thông tin người dùng"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Tên"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Giới hạn nội dung"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Yêu cầu mã PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Xếp hạng nội dung"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Ứng dụng hệ thống"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Ứng dụng đã cài đặt"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Hủy"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Xóa người dùng"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Đứa trẻ phiền hà"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Đã tắt"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Cho phép"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Thực thi"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Người dù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="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\nSau 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\nBấ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\nBấ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_confirm_remove_message" msgid="5284111415714437285">"Bạn có chắc chắn muốn xóa người dùng và tất cả các dữ liệu được liên kết khỏi thiết bị này khô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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Thay đổi cỡ chữ"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Hạn chế"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Xóa các hạn chế"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Thay đổi PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Hiển thị thông báo"</string>
     <string name="help_label" msgid="1107174367904110532">"Trợ giúp"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"Tài khoản dành cho nội dung"</string>
+    <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="6160672982086584261">"Đặt hạn chế ứng dụng"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Do <xliff:g id="APP">%1$s</xliff:g> kiểm soát"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Ứng dụng này không được hỗ trợ trong các tiểu sử bị hạn chế"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Ứng dụng này có thể truy cập tài khoản của bạn"</string>
+    <string name="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 4940c23..6592f61 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,16 +218,127 @@
     <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="886742181977884584">"媒体"</item>
+    <item msgid="7924928667052300589">"设备"</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">"WLAN 扫描"</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>
+    <item msgid="5124443975763747838">"媒体按钮"</item>
+    <item msgid="4547883971364273343">"音频焦点"</item>
+    <item msgid="2603878814882344450">"主音量"</item>
+    <item msgid="7136963238377062018">"语音音量"</item>
+    <item msgid="4270236897655923007">"铃声音量"</item>
+    <item msgid="6325739889222559394">"媒体音量"</item>
+    <item msgid="5762123934816216821">"闹钟音量"</item>
+    <item msgid="785049718065337473">"通知音量"</item>
+    <item msgid="6700305533746877052">"蓝牙音量"</item>
+    <item msgid="2029227495214047094">"保持唤醒状态"</item>
+    <item msgid="26109888160231211">"监测位置"</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>
+    <item msgid="5753789168376302997">"媒体按钮"</item>
+    <item msgid="3265262911688671938">"音频焦点"</item>
+    <item msgid="2098976479485046797">"主音量"</item>
+    <item msgid="5660213838861789350">"语音音量"</item>
+    <item msgid="7983336752371254444">"铃声音量"</item>
+    <item msgid="7878027809189330917">"媒体音量"</item>
+    <item msgid="7260546305036218513">"闹钟音量"</item>
+    <item msgid="9103719301075748925">"通知音量"</item>
+    <item msgid="7025966722295861512">"蓝牙音量"</item>
+    <item msgid="4665183401128289653">"保持唤醒状态"</item>
+    <item msgid="8584357129746649222">"位置"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
     <item msgid="2560532955514699713">"中"</item>
     <item msgid="2372711992605524591">"长"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART(调试)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"使用 Dalvik"</item>
+    <item msgid="5131846588686178907">"使用 ART"</item>
+    <item msgid="4530003713865319928">"使用 ART 调试版本"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"永不检查"</item>
     <item msgid="6042769699089883931">"仅检查 DRM 内容"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"动画缩放 5x"</item>
     <item msgid="1069584980746680398">"动画缩放 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"无"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi 和 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"无"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"关闭"</item>
+    <item msgid="7688197031296835369">"显示过度绘制区域"</item>
+    <item msgid="8332661909019981149">"显示过度绘制计数器"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"标准限制"</item>
     <item msgid="4071574792028999443">"不允许后台进程"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"超时"</item>
     <item msgid="7664124146786465092">"失败"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"询问"</item>
+    <item msgid="5077768429488260031">"永不允许"</item>
+    <item msgid="1417929597727989746">"始终允许"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 640be72..798052d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"是"</string>
     <string name="no" msgid="6731231425810196216">"无"</string>
     <string name="create" msgid="3578857613172647409">"创建"</string>
+    <string name="allow" msgid="3349662621170855910">"允许"</string>
+    <string name="deny" msgid="6947806159746484865">"拒绝"</string>
     <string name="device_info_default" msgid="7847265875578739287">"未知"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"只需 <xliff:g id="STEP_COUNT">%1$d</xliff:g> 步操作即可进入开发者模式。"</item>
+    <item quantity="other" msgid="6722953419953594148">"只需 <xliff:g id="STEP_COUNT">%1$d</xliff:g> 步操作即可进入开发者模式。"</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"您现在处于开发者模式!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"您已处于开发者模式,无需进行此操作。"</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"无线和网络"</string>
     <string name="header_category_device" msgid="5781174212691167553">"设备"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"个人"</string>
@@ -38,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>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"正在充电"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(交流电)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"正在耗电"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(无线)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"未在充电"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"未在充电"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"电量充足"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"未插电"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"交流电"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"无线"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"交流电 + USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"未知"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"未知"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"未知错误"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"电量低"</string>
     <string name="bluetooth" msgid="5549625000628014477">"蓝牙"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"可检测性"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"让附近所有的蓝牙设备均可检测到(<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"让附近所有的蓝牙设备均可检测到"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"不让其他蓝牙设备检测到"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"仅让已配对的设备检测到"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"可以检测到设备"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"检测超时设置"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"设置可检测到设备的时间"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"锁定语音拨号"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"屏幕锁定时停止使用蓝牙拨号器"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"蓝牙设备"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"显示接收到的文件"</string>
     <string name="device_picker" msgid="8398232791303186677">"蓝牙设备选择器"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"蓝牙权限请求"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"某个应用想要打开蓝牙。允许该程序打开蓝牙吗?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"您平板电脑上的某个应用想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的平板电脑。允许该程序执行相应操作吗?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"您手机上的某个应用想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。允许该程序执行相应操作吗?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"您平板电脑上的某个应用想让其他蓝牙设备“一直可检测到”您的平板电脑。允许该程序执行相应操作吗?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"您手机上的某个应用想让其他蓝牙设备“一直可检测到”您的手机。允许该程序执行相应操作吗?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"您平板电脑上的某个应用想要打开蓝牙,以便其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的平板电脑。允许该程序打开蓝牙吗?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"您手机上的某个应用想要打开蓝牙,以便其他设备可在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内检测到您的手机。允许该程序打开蓝牙吗?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"您平板电脑上的某个应用想要打开蓝牙,以便其他设备可检测到您的平板电脑。允许该程序打开蓝牙吗?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"您手机上的某个应用想要打开蓝牙,以便其他设备可检测到您的手机。允许该程序打开蓝牙吗?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"某个应用想要打开蓝牙。"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"某个应用想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内可检测到您的平板电脑。"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"某个应用想让其他蓝牙设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内可检测到您的手机。"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"某个应用想让其他蓝牙设备检测到您的平板电脑。之后,您可以在“蓝牙”设置中更改此设置。"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"某个应用想让其他蓝牙设备检测到您的手机。之后,您可以在“蓝牙”设置中更改此设置。"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"某个应用想要打开蓝牙,以便其他设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内可检测到您的平板电脑。"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"某个应用想要打开蓝牙,以便其他设备在 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒内可检测到您的手机。"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"某个应用想要打开蓝牙,以便其他设备可检测到您的平板电脑。之后,您可以在“蓝牙”设置中更改此设置。"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"某个应用想要打开蓝牙,以便其他设备可检测到您的手机。之后,您可以在“蓝牙”设置中更改此设置。"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"正在打开蓝牙..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"正在关闭蓝牙…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"自动连接"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"浏览器会使用 HTTP 代理,但其他应用可能不会使用。"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"地点:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"相邻的 CID:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"小区信息:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"数据尝试次数:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS 服务:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"漫游:"</string>
@@ -220,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>
@@ -260,13 +268,15 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"移动数据网络连接已断开,因为您已离开本地网络并关闭了移动数据网络漫游功能。"</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"将其启用"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"请注意,允许移动数据网络漫游可能会产生高额漫游费!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"如果允许数据漫游,您可能需要支付高昂的漫游费用!\n\n此设置会影响这部平板电脑上的所有用户。"</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"如果允许数据漫游,您可能需要支付高昂的漫游费用!\n\n此设置会影响这部手机上的所有用户。"</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"允许移动数据网络漫游吗?"</string>
     <string name="networks" msgid="6333316876545927039">"运营商选择"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"选择网络运营商"</string>
@@ -274,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>
@@ -296,8 +306,12 @@
     <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_summary" msgid="3800834657847339570"></string>
-    <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"键入要在锁定屏幕上显示的文字"</string>
-    <string name="location_settings_title" msgid="4483843407328665068">"位置信息访问权限"</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>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
@@ -308,8 +322,8 @@
     <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">"您可以加密自己的帐户、设置、已下载的应用及其数据、媒体和其他文件。加密平板电脑后,您每次开机时都需要输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置,但这会清除平板电脑上的所有数据。"\n\n"加密过程需要 1 小时或更长时间。在开始加密前,电池必须有电,并且在加密完成前必须一直连接电源。如果您中断加密过程,则会丢失部分或全部数据。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"您可以加密自己的帐户、设置、已下载的应用及其数据、媒体和其他文件。加密手机后,您每次开机时都需要输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置,但这会清除手机上的所有数据。"\n\n"加密过程需要 1 小时或更长时间。在开始加密前,电池必须有电,并且在加密完成前必须一直连接电源。如果您中断加密过程,则会丢失部分或全部数据。"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"您可以加密自己的帐户、设置、已下载的应用及其数据、媒体和其他文件。加密平板电脑后,您每次开机时都需要输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置,但这会清除平板电脑上的所有数据。\n\n加密过程需要 1 小时或更长时间。在开始加密前,电池必须有电,并且在加密完成前必须一直连接电源。如果您中断加密过程,则会丢失部分或全部数据。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"您可以加密自己的帐户、设置、已下载的应用及其数据、媒体和其他文件。加密手机后,您每次开机时都需要输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置,但这会清除手机上的所有数据。\n\n加密过程需要 1 小时或更长时间。在开始加密前,电池必须有电,并且在加密完成前必须一直连接电源。如果您中断加密过程,则会丢失部分或全部数据。"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"加密平板电脑"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"加密手机"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"请为电池充电,然后重试。"</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> 秒后重试。"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"键入密码"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失败"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"加密过程中断,无法完成。因此,您已无法再使用平板电脑上的数据。"\n\n"要继续使用您的平板电脑,您需要恢复出厂设置。恢复出厂设置后对平板电脑进行设置时,您可以将之前备份到 Google 帐户的所有数据恢复到平板电脑中。"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"加密过程中断,无法完成。因此,您已无法再使用手机上的数据。"\n\n"要继续使用您的手机,您需要恢复出厂设置。恢复出厂设置后对手机进行设置时,您可以将之前备份到 Google 帐户的所有数据恢复到手机中。"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"加密过程中断,无法完成。因此,您已无法再使用平板电脑上的数据。\n\n要继续使用您的平板电脑,您需要恢复出厂设置。恢复出厂设置后对平板电脑进行设置时,您可以将之前备份到 Google 帐户的所有数据恢复到平板电脑中。"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"加密过程中断,无法完成。因此,您已无法再使用手机上的数据。\n\n要继续使用您的手机,您需要恢复出厂设置。恢复出厂设置后对手机进行设置时,您可以将之前备份到 Google 帐户的所有数据恢复到手机中。"</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"切换输入法"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"选择屏幕锁定方式"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"选择备份锁"</string>
@@ -347,7 +361,7 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"中高等安全性"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"密码"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"高安全性"</string>
-    <string name="unlock_set_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>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"更改解锁 PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"更改解锁密码"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"密码必须至少包含 %d 个字符"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN 必须至少包含 %d 个字符"</string>
+    <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>
@@ -406,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>
@@ -480,6 +503,28 @@
     <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_empty_list_wifi_display_off" msgid="1225626898926363100">"要查看设备,请打开无线显示功能。"</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>
+    <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>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"已连接"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"可用"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"正在使用中"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"显示设备设置"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"是否断开连接?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"此操作将会断开您与以下设备的连接:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"无线显示选项"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"取消保存"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"完成"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"名称"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"开启"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"关闭"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"已停用"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"允许平板电脑在接触其他设备时交换数据"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"允许手机在接触其他设备时交换数据"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"关闭"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"无法使用,因为 NFC 已关闭"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"打开此功能后,您只需将自己的设备与另一台支持 NFC 的设备靠在一起,即可将您设备上的应用内容同步分享给对方。例如,您可以发送网页、YouTube 视频、联系人等等。"\n\n"您只需将设备靠在一起(通常是背靠背)然后触摸屏幕即可,所分享的内容由相应的应用确定。"</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"打开此功能后,您只需将自己的设备与另一台支持 NFC 的设备靠在一起,即可将您设备上的应用内容同步分享给对方。例如,您可以发送网页、YouTube 视频、联系人等等。\n\n您只需将设备靠在一起(通常是背靠背)然后触摸屏幕即可,所分享的内容由相应的应用确定。"</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"网络服务发现"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"允许其他设备上的应用发现此设备上的应用"</string>
-    <string name="wifi_quick_toggle_title" msgid="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="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="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="8116564886303972764">"请在 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_in_progress" msgid="2944576520214787628">"正在设置 WPS,此过程最多可能需要两分钟时间才能完成"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"无线路由器安全设置 (TKIP) 不受支持"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"身份验证失败。请重试。"</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"检测到其他 WPS 会话。请过几分钟后重试。"</string>
     <string name="wifi_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>
@@ -556,7 +613,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>
@@ -564,6 +621,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>
@@ -571,8 +631,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_advanced_titlebar" msgid="1627063574532930090">"高级 Wi-Fi 设置"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi 频带"</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="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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"正在搜索…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"重命名设备"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"对等设备"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"已保存的群组"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"无法连接。"</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"无法重命名设备。"</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"断开连接?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"如果断开连接,您与<xliff:g id="PEER_NAME">%1$s</xliff:g>和另外 <xliff:g id="PEER_COUNT">%2$s</xliff:g> 台设备的连接将中断。"</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"取消邀请?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"要取消连接<xliff:g id="PEER_NAME">%1$s</xliff:g>的邀请吗?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"便携式 Wi-Fi 热点"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"取消保存此群组?"</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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"音乐效果"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"铃声音量"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"静音时振动"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"默认通知"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"默认通知提示音"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"收到通知时指示灯闪烁"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"铃声"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"通知"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"将来电音量用作通知音量"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"选择通知铃声"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"默认通知提示音"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"媒体"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"设置音乐和视频的音量"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"闹钟"</string>
@@ -671,15 +743,16 @@
     <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="3848608373818910549">"屏幕模块"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"连接电源后在进入休眠模式时启动"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"已停用"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"所选模块"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"激活时间"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"闲置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"永不"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"试试看!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"插入基座时也启动"</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">"要控制手机在插入基座时和/或休眠状态下的行为,请启用“互动屏保”。"</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>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM 卡 PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN 不正确"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN 不匹配"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"无法更改 PIN。"\n"PIN 可能不正确。"</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"无法更改 PIN。\nPIN 可能不正确。"</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"已成功更改 SIM 卡 PIN"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"无法更改 SIM 卡锁定状态。"\n"PIN 可能不正确。"</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"无法更改 SIM 卡锁定状态。\nPIN 可能不正确。"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"确定"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"取消"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"平板电脑状态"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"基带版本"</string>
     <string name="kernel_version" msgid="9192574954196167602">"内核版本"</string>
     <string name="build_number" msgid="3075795840572241758">"版本号"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux 状态"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"不可用"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"状态信息"</string>
     <string name="device_status" msgid="607405385799807324">"状态信息"</string>
@@ -733,12 +807,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">"手机网络类型"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"运营商信息"</string>
     <string name="status_data_state" msgid="5503181397066522950">"移动网络状态"</string>
     <string name="status_service_state" msgid="2323931627519429503">"服务状态"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"信号强度"</string>
     <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>
@@ -748,6 +823,7 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB 存储设备"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD 卡"</string>
     <string name="memory_available" msgid="5052397223077021181">"可用空间"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"可用空间(只读)"</string>
     <string name="memory_size" msgid="6629067715017232195">"总容量"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"正在计算..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"应用(应用数据和媒体内容)"</string>
@@ -756,6 +832,7 @@
     <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_cache_usage" msgid="6704293333141177910">"缓存数据"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"卸载共享存储设备"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"卸载 SD 卡"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"卸载内部 USB 存储设备"</string>
@@ -770,8 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"格式化 SD 卡"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"清除内部 USB 存储设备中的全部数据,例如音乐和照片"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"清除 SD 卡中的全部数据,例如音乐和照片"</string>
-    <string name="mtp_ptp_mode_summary">正在使用媒体设备(MTP)或相机(PTP)传输模式</string>
-    <string name="read_only" msgid="6702420168629076340">" (只读)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"是否清除缓存数据?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"此操作会清除所有应用的缓存数据。"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP 或 PTP 功能已启用"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"要卸载 USB 存储设备吗?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"要卸载 SD 卡吗?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"如果卸载该 USB 存储设备,您当前使用的某些应用会停止运行,并且在您重新装载该设备前可能都无法使用。"</string>
@@ -794,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"相机 (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"让您可以使用相机软件传输照片,并在不支持 MTP 的计算机上传输任何文件"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"安装文件传输工具"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"其他用户"</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>
@@ -823,6 +902,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>
@@ -838,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"恢复出厂设置"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"清除平板电脑上的所有数据"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"清除手机上的所有数据"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"此操作会清除您平板电脑"<b>"内存设备"</b>"中的所有数据,包括:"\n\n<li>"您的 Google 帐户"</li>\n<li>"系统及应用数据和设置"</li>\n<li>"已下载的应用"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"此操作会清除您手机"<b>"内存设备"</b>"中的所有数据,包括:"\n\n<li>"您的 Google 帐户"</li>\n<li>"系统及应用数据和设置"</li>\n<li>"已下载的应用"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"目前,您已登录以下帐户:"\n</string>
+    <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>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"要清除音乐、图片和其他用户数据,您需要清空该 "<b>"SD 卡"</b>"。"</string>
@@ -898,10 +979,15 @@
     <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="manage_mobile_plan_title" msgid="7588182101738043593">"管理手机套餐"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"未知的 SIM 运营商"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s没有已知的配置网站"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"请插入 SIM 卡,然后重新启动"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"请连接到互联网"</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>
@@ -910,7 +996,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>
@@ -918,16 +1004,17 @@
     <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="copyright_title" msgid="865906688917260647">"版权"</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_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>
@@ -945,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"更改解锁 PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"确认已保存的图案"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"请重试:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"绘制解锁图案"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"绘制解锁图案:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"按 MENU 获得帮助。"</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"完成后松开手指。"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"至少连接 <xliff:g id="NUMBER">%d</xliff:g> 个点,请重试:"</string>
@@ -959,7 +1046,7 @@
     <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_choose_lock_pattern" msgid="1652352830005653447">"设置解锁图案"</string>
@@ -967,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"如何绘制解锁图案"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"错误的尝试次数过多!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> 秒后重试。"</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"取消"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"下一步"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"保护您的平板电脑"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"手机安全设置"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"创建个人屏幕解锁图案可防止他人未经许可使用您的平板电脑。在下一屏幕上用手指以任意顺序连接至少四个点。"\n\n"准备好开始了吗?请触摸“下一步”。"</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"创建个人屏幕解锁图案可防止他人未经许可使用您的手机。在下一屏幕上滑动手指以任意顺序连接至少四个点。"\n\n"准备好开始了吗?请触摸“下一步”。"</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"您的手机上未安装相应应用。"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"管理应用"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"管理和删除已安装的应用"</string>
     <string name="applications_settings" msgid="1721442176406964682">"应用"</string>
@@ -982,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"允许安装来自未知来源的应用"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"您的平板电脑和个人数据更容易受到从未知来源获取的应用的攻击。对于因使用这些应用而造成的平板电脑损坏或数据丢失,您同意自行承担全部责任。"</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"您的手机和个人数据更容易受到从未知来源获取的应用的攻击。对于因使用这些应用而造成的手机损坏或数据丢失,您同意自行承担全部责任。"</string>
+    <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="application_info_label" msgid="5736524913065714880">"应用信息"</string>
@@ -1002,12 +1086,14 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB 存储(数据)"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD 卡"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"卸载"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"为所有用户卸载"</string>
+    <string name="install_text" msgid="884360662922471113">"安装"</string>
     <string name="disable_text" msgid="6544054052049395202">"停用"</string>
     <string name="enable_text" msgid="9217362512327828987">"启用"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"清除数据"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"卸载更新"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"您已选择在默认情况下对某些操作启动此应用。"</string>
-    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"您已选择允许该应用创建窗口小部件并访问其数据。"</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"您已选择允许该应用创建小部件并访问其数据。"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"无默认设置。"</string>
     <string name="clear_activities" msgid="7408923511535174430">"清除默认设置"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"此应用可能不是针对您的屏幕设计的。您可以在此处调整其显示尺寸/比例,让它适合您的屏幕。"</string>
@@ -1020,17 +1106,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"显示缓存进程"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"重置应用偏好设置"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"要重置应用偏好设置吗?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"此操作将会重置以下全部偏好设置:"\n\n<li>"停用的应用"</li>\n<li>"停用的应用通知"</li>\n<li>"执行操作的默认应用"</li>\n<li>"应用的后台数据限制"</li>\n\n"您将不会丢失任何应用数据。"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"此操作将会重置以下全部偏好设置:\n\n"<li>"停用的应用"</li>\n<li>"停用的应用通知"</li>\n<li>"执行操作的默认应用"</li>\n<li>"应用的后台数据限制"</li>\n\n"您将不会丢失任何应用数据。"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"重置应用"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"管理空间"</string>
     <string name="filter" msgid="2018011724373033887">"过滤"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"选择过滤选项"</string>
     <string name="filter_apps_all" msgid="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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD 卡中"</string>
     <string name="disabled" msgid="9206776641295849915">"已停用"</string>
+    <string name="not_installed" msgid="1475144352069281880">"未安装"</string>
     <string name="no_applications" msgid="7336588977497084921">"无应用。"</string>
     <string name="internal_storage" msgid="1584700623164275282">"内部存储空间"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB 存储设备"</string>
@@ -1055,6 +1143,8 @@
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g>和<xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>、<xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>、<xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"使用此应用可能会产生费用:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"发送付费短信"</string>
     <string name="computing_size" msgid="1599186977475211186">"正在计算..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"无法计算包的大小。"</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"未安装任何第三方应用。"</string>
@@ -1078,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"更改安装新应用时使用的首选安装位置"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"要停用内置应用吗?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"如果停用内置应用,其他应用可能会出现异常。"</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"确定要删除数据并停用应用吗?"</string>
+    <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>
@@ -1095,6 +1190,8 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"用户:<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"已删除用户"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> 个进程和 <xliff:g id="NUMSERVICES">%2$d</xliff:g> 个服务"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> 个进程和 <xliff:g id="NUMSERVICES">%2$d</xliff:g> 个服务"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> 个进程和 <xliff:g id="NUMSERVICES">%2$d</xliff:g> 个服务"</string>
@@ -1129,8 +1226,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="show_password_summary" msgid="7345931695292850058"></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>
@@ -1145,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"要切换,请按 Ctrl+空格键"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"默认"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"键盘布局"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"用户词典"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"个人词典"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"个人词典"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"个人词典"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"添加"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"添加到词典"</string>
@@ -1158,6 +1252,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>
@@ -1198,29 +1294,43 @@
     <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="bt_hci_snoop_log" msgid="3340699311158865670">"启用蓝牙 HCI 信息收集日志"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"捕获单个文件中的所有蓝牙 HCI 包"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"选择运行环境"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"选择运行环境"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"要重新启动以将运行环境从“<xliff:g id="OLD">%1$s</xliff:g>”改为“<xliff:g id="NEW">%2$s</xliff:g>”吗?"</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>
+    <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="enable_terminal_title" msgid="95572094356054120">"本地终端"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"启用终端应用,以便在本地访问 Shell"</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>
-    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"当您创建窗口小部件后,<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>能够访问其显示的所有数据。"</string>
-    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"始终允许<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>创建窗口小部件并访问其数据"</string>
+    <string name="widget_picker_title" msgid="9130684134213467557">"选择小部件"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"是否允许该应用创建并访问小部件?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"当您创建小部件后,<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>能够访问其显示的所有数据。"</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"始终允许<xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>创建小部件并访问其数据"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> 天 <xliff:g id="HOURS">%2$d</xliff:g> 小时 <xliff:g id="MINUTES">%3$d</xliff:g> 分 <xliff:g id="SECONDS">%4$d</xliff:g> 秒"</string>
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> 小时 <xliff:g id="MINUTES">%2$d</xliff:g> 分 <xliff:g id="SECONDS">%3$d</xliff:g> 秒"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> 分 <xliff:g id="SECONDS">%2$d</xliff:g> 秒"</string>
@@ -1235,29 +1345,43 @@
     <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_toggle_large_text_title" msgid="6618674985313017711">"大号字体"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"按“电源”按钮结束通话"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"说出密码"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"触摸和按住延迟"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"增强网页辅助功能"</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>
+    <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_toggle_speak_password_preference_title" msgid="5986628515113204844">"说出密码"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"触摸和按住延迟"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"设置"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"启用"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"关闭"</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="accessibility_feature_state_on" msgid="2864292320042673806">"开启"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"关闭"</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="print_settings" msgid="4742428530112487843">"打印"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"打印设置"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"服务"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"要使用<xliff:g id="SERVICE">%1$s</xliff:g>吗?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>可以接收您打印的文档。此类文档可能包含敏感数据。"</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"未安装任何服务"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"设置"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"添加打印机"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"打开"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"关闭"</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>
@@ -1269,14 +1393,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>
@@ -1284,7 +1408,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>
@@ -1294,11 +1418,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"数据已收到"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"发送的移动数据量"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"接收的移动数据量"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"发送的 WLAN 数据量"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"接收的 WLAN 数据量"</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>
@@ -1307,7 +1433,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>
@@ -1316,8 +1442,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>
@@ -1325,6 +1451,7 @@
     <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="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>
@@ -1351,17 +1478,19 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"音高"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"更改所播放的文字的音调"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"语言"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"未选择语言"</string>
     <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>
@@ -1379,8 +1508,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"亮度 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"自动"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"最亮"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"一半"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"关闭"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"凭据存储"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"从存储设备安装"</string>
@@ -1391,6 +1534,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>
@@ -1412,14 +1558,11 @@
     <string name="backup_section_title" msgid="7952232291452882740">"备份和还原"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"个人数据"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"备份我的数据"</string>
-    <string name="backup_data_summary" msgid="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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"重新安装某个应用后,系统会还原已经备份的设置和数据"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"获取错误报告"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"这会收集有关当前设备状态的信息,并以电子邮件的形式进行发送。从开始生成错误报告到准备好发送需要一点时间,请耐心等待。"</string>
-    <string name="report" msgid="302437572240018342">"报告"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"桌面备份密码"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"桌面完整备份当前未设置密码保护"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"触摸可更改或删除用于桌面完整备份的密码"</string>
@@ -1427,7 +1570,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>
@@ -1443,10 +1586,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>
@@ -1468,9 +1611,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>
@@ -1498,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"日历"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"联系人"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"欢迎使用 Google Sync!"</font>" "\n"这款数据同步工具可让您随时随地查看您的联系人、约会以及更多信息。"</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"欢迎使用 Google Sync!"</font>" \n这款数据同步工具可让您随时随地查看您的联系人、约会以及更多信息。"</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"应用同步设置"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"数据与同步"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"更改密码"</string>
@@ -1538,6 +1681,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>
@@ -1549,36 +1693,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"窗口中的面 (surface) 更新时全部闪烁"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"显示 GPU 视图更新"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"使用 GPU 进行绘图时闪烁显示窗口中的视图"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"显示硬件层更新"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Flash 硬件层在进行更新时会显示为绿色"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"调试 GPU 过度绘制"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"显示 CPU 使用情况"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"屏幕叠加层显示当前 CPU 使用情况"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"强制进行 GPU 渲染"</string>
     <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>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"用户离开后即销毁每个活动"</string>
     <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>
@@ -1592,8 +1740,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>
@@ -1608,11 +1756,11 @@
     <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" msgid="1466689968707308512">"只能连接到移动网络时,此功能可能会导致需要使用后台数据的应用停止运行。"\n\n"您可以在相关应用的设置中查找更合适的数据流量控制选项。"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"只能连接到移动网络时,此功能可能会导致需要使用后台数据的应用停止运行。\n\n您可以在相关应用的设置中查找更合适的数据流量控制选项。"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="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>
@@ -1621,22 +1769,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" 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>
+    <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_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>
@@ -1662,12 +1813,16 @@
     <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">"编辑 VPN 配置文件"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"连接到<xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">"添加 VPN 配置文件"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"修改配置文件"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"删除配置文件"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"始终开启的 VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"选择要始终保持连接的 VPN 配置文件。只有在连接到此 VPN 之后才可以使用网络。"</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"无"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"始终开启的 VPN 需要服务器和 DNS 的 IP 地址。"</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"目前没有网络连接。请稍后重试。"</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"证书缺失。请修改配置文件。"</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"系统"</string>
@@ -1686,24 +1841,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"取消"</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">"其他系统更新"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"用户和限制"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"用户"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"添加用户"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"修改详细信息"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"用户信息"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"用户名"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"内容限制"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"需要 PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"内容分级"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"系统应用"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"已安装的应用"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"舍弃"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"删除用户"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Pesky kid"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"已停用"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"许可"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"执行中"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"用户"</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="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_confirm_remove_message" msgid="5284111415714437285">"您确定要从设备中删除该用户和所有相关数据吗?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"更改字体大小"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"限制"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"取消限制"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"更改 PIN 码"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"显示通知"</string>
     <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_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="6160672982086584261">"设置应用限制"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"受“<xliff:g id="APP">%1$s</xliff:g>”控制"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"受限个人资料无法使用此应用"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"此应用可使用您的帐户"</string>
+    <string name="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 7723ee9..e034012 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>
@@ -81,10 +85,10 @@
   </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
-    <item msgid="8934131797783724664">"掃描中..."</item>
+    <item msgid="8934131797783724664">"掃描中…"</item>
     <item msgid="8513729475867537913">"連線中…"</item>
-    <item msgid="515055375277271756">"驗證中..."</item>
-    <item msgid="1943354004029184381">"正在取得 IP 位址..."</item>
+    <item msgid="515055375277271756">"驗證中…"</item>
+    <item msgid="1943354004029184381">"正在取得 IP 位址…"</item>
     <item msgid="4221763391123233270">"已連線"</item>
     <item msgid="624838831631122137">"已暫停"</item>
     <item msgid="7979680559596111948">"中斷連線中…"</item>
@@ -95,13 +99,13 @@
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
-    <item msgid="8878186979715711006">"掃描中..."</item>
-    <item msgid="355508996603873860">"正在連線到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
-    <item msgid="554971459996405634">"正在取得 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 的授權..."</item>
-    <item msgid="7928343808033020343">"正在由 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 取得 IP 位址..."</item>
+    <item msgid="8878186979715711006">"掃描中…"</item>
+    <item msgid="355508996603873860">"正在連線到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"正在取得 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 的授權…"</item>
+    <item msgid="7928343808033020343">"正在由 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 取得 IP 位址…"</item>
     <item msgid="8937994881315223448">"已連線到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
     <item msgid="1330262655415760617">"已暫停"</item>
-    <item msgid="7698638434317271902">"正在中斷 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 連線 ..."</item>
+    <item msgid="7698638434317271902">"正在中斷 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 連線…"</item>
     <item msgid="197508606402264311">"已中斷連線"</item>
     <item msgid="8578370891960825148">"失敗"</item>
     <item msgid="5660739516542454527">"已封鎖"</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,16 +218,127 @@
     <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="886742181977884584">"媒體"</item>
+    <item msgid="7924928667052300589">"裝置"</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>
+    <item msgid="5124443975763747838">"媒體按鈕"</item>
+    <item msgid="4547883971364273343">"音訊焦點"</item>
+    <item msgid="2603878814882344450">"主音量"</item>
+    <item msgid="7136963238377062018">"語音音量"</item>
+    <item msgid="4270236897655923007">"鈴聲音量"</item>
+    <item msgid="6325739889222559394">"媒體音量"</item>
+    <item msgid="5762123934816216821">"鬧鐘音量"</item>
+    <item msgid="785049718065337473">"通知音量"</item>
+    <item msgid="6700305533746877052">"藍牙音量"</item>
+    <item msgid="2029227495214047094">"停用休眠"</item>
+    <item msgid="26109888160231211">"監控位置"</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>
+    <item msgid="5753789168376302997">"媒體按鈕"</item>
+    <item msgid="3265262911688671938">"音訊焦點"</item>
+    <item msgid="2098976479485046797">"主音量"</item>
+    <item msgid="5660213838861789350">"語音音量"</item>
+    <item msgid="7983336752371254444">"鈴聲音量"</item>
+    <item msgid="7878027809189330917">"媒體音量"</item>
+    <item msgid="7260546305036218513">"鬧鐘音量"</item>
+    <item msgid="9103719301075748925">"通知音量"</item>
+    <item msgid="7025966722295861512">"藍牙音量"</item>
+    <item msgid="4665183401128289653">"停用休眠"</item>
+    <item msgid="8584357129746649222">"定位"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
     <item msgid="2560532955514699713">"中"</item>
     <item msgid="2372711992605524591">"長"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (偵錯)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"使用 Dalvik"</item>
+    <item msgid="5131846588686178907">"使用 ART"</item>
+    <item msgid="4530003713865319928">"使用 ART 偵錯版本"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"不要檢查"</item>
     <item msgid="6042769699089883931">"僅檢查 DRM 內容"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"動畫比例 5x"</item>
     <item msgid="1069584980746680398">"動畫比例 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"無"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi 和 1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"無"</item>
+    <item msgid="9089630089455370183">"Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"關閉"</item>
+    <item msgid="7688197031296835369">"顯示透支區域"</item>
+    <item msgid="8332661909019981149">"顯示透支計數器"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"標準限制"</item>
     <item msgid="4071574792028999443">"不執行背景處理程序"</item>
@@ -271,10 +423,15 @@
   </string-array>
   <string-array name="vpn_states">
     <item msgid="8621078286418985762">"已中斷連線"</item>
-    <item msgid="6692305604213080515">"初始中..."</item>
-    <item msgid="8001704909356800092">"連線中..."</item>
+    <item msgid="6692305604213080515">"初始中…"</item>
+    <item msgid="8001704909356800092">"連線中…"</item>
     <item msgid="4039737283841672166">"已連線"</item>
     <item msgid="4042143101664725090">"逾時"</item>
     <item msgid="7664124146786465092">"失敗"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"詢問"</item>
+    <item msgid="5077768429488260031">"一律不允許"</item>
+    <item msgid="1417929597727989746">"一律允許"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f49f0c6..b8b31a7 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"是"</string>
     <string name="no" msgid="6731231425810196216">"否"</string>
     <string name="create" msgid="3578857613172647409">"建立"</string>
+    <string name="allow" msgid="3349662621170855910">"允許"</string>
+    <string name="deny" msgid="6947806159746484865">"拒絕"</string>
     <string name="device_info_default" msgid="7847265875578739287">"不明"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"您只需完成剩餘的 <xliff:g id="STEP_COUNT">%1$d</xliff:g> 個步驟,即可成為開發人員。"</item>
+    <item quantity="other" msgid="6722953419953594148">"您只需完成剩餘的 <xliff:g id="STEP_COUNT">%1$d</xliff:g> 個步驟,即可成為開發人員。"</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"您現在已成為開發人員!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"不需要了,您已經是開發人員。"</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"無線與網路"</string>
     <string name="header_category_device" msgid="5781174212691167553">"裝置"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"個人"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"充電中"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"放電中"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(無線網路)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"非充電中"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"非充電中"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"電力充足"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"未插入"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"無線網路"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"不明"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"不明"</string>
@@ -100,16 +110,13 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"未知的錯誤"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"冷"</string>
     <string name="bluetooth" msgid="5549625000628014477">"藍牙"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"可偵測性"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"向附近所有藍牙裝置顯示 (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"向附近所有藍牙裝置顯示"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"不向其他藍牙裝置顯示"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"只向配對的裝置顯示"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"設定裝置為可偵測"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"偵測時限設定"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"設定裝置可供偵測的開放時間"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"鎖定語音撥號"</string>
-    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"螢幕鎖定時不要使用藍芽撥號"</string>
+    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"螢幕鎖定時不要使用藍牙撥號"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"藍牙裝置"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"裝置名稱"</string>
     <string name="bluetooth_device_details" msgid="4594773497930028085">"裝置設定"</string>
@@ -128,10 +135,10 @@
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"已連線 (無媒體音訊)"</string>
     <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"已連線 (無手機或媒體音訊)"</string>
     <string name="bluetooth_disconnected" msgid="6557104142667339895">"已中斷連線"</string>
-    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"連線中斷..."</string>
-    <string name="bluetooth_connecting" msgid="8555009514614320497">"連線中..."</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"正在中斷連線…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"連線中…"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_pairing" msgid="1426882272690346242">"配對中..."</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"配對中…"</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"未命名的藍牙裝置"</string>
     <string name="progress_scanning" msgid="192587958424295789">"搜尋中"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"找不到附近的藍牙裝置。"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"顯示已接收的檔案"</string>
     <string name="device_picker" msgid="8398232791303186677">"藍牙裝置選擇器"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"藍牙權限要求"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"應用程式要求開啟藍牙功能,您要允許這項要求嗎?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"平板電腦上的某個應用程式要求將平板電腦設成開放其他藍牙裝置搜尋,開放的時間長度為 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒。您要允許這項要求嗎?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"手機上的某個應用程式要求將手機設成開放其他藍牙裝置搜尋,開放的時間長度為 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒。您要允許這項要求嗎?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"平板電腦上的某個應用程式要求將平板電腦「一律設成開放其他藍牙裝置搜尋」,您要允許這項要求嗎?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"手機上的某個應用程式要求將手機設成「一律開放其他藍牙裝置搜尋」,您要允許這項要求嗎?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"平板電腦上的某個應用程式要求將平板電腦設成開放其他藍牙裝置搜尋,開放的時間長度為 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒。您要允許這項要求嗎?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"您手機中的某個應用程式要求開啟藍牙功能 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒鐘,讓其他藍牙裝置可在這段時間內搜尋到您的手機。您要允許這項要求嗎?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"平板電腦上的某個應用程式要求將平板電腦設成開放其他藍牙裝置搜尋,您要允許這項要求嗎?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"您手機中的某個應用程式要求開啟藍牙功能,讓其他藍牙裝置可在這段時間內搜尋到您的手機。您要允許這項要求嗎?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"應用程式要求開啟藍牙功能。"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"應用程式要求開放 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒,讓其他藍芽裝置能搜尋到您的平板電腦。"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"應用程式要求開放 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒,讓其他藍牙裝置能搜尋到您的手機。"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"應用程式要求讓其他藍芽裝置能搜尋到您的平版電腦。您日後可在 [藍牙] 設定中變更這項設定。"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"應用程式要求讓其他藍芽裝置能搜尋到您的手機。您日後可在 [藍牙] 設定中變更這項設定。"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"應用程式要求開啟藍牙功能 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒,讓其他裝置能搜尋到您的平板電腦。"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"應用程式要求開啟藍牙功能 <xliff:g id="TIMEOUT">%1$d</xliff:g> 秒,讓其他裝置能搜尋到您的手機。"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"應用程式要求開啟藍牙功能,讓其他裝置能搜尋到您的平板電腦。您日後可在 [藍牙] 設定中變更這項設定。"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"應用程式要求開啟藍牙功能,讓其他裝置能搜尋到您的手機。您日後可在 [藍牙] 設定中變更這項設定。"</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"藍牙開啟中…"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"正在關閉藍牙…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"自動連線"</string>
@@ -157,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>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"瀏覽器會使用 HTTP Proxy,但其他應用程式不一定會採用這項設定。"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"位置:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"相鄰的客戶編號:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"儲存格資訊:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"嘗試資料:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS 服務:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"漫遊:"</string>
@@ -220,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>
@@ -230,15 +238,15 @@
     <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>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD 卡仍在使用時便被移除!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"使用容量 (bytes):"</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"正在掃描媒體的 USB 儲存裝置..."</string>
-    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"從 SD 卡掃描媒體中..."</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"正在掃描媒體的 USB 儲存裝置…"</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"正在從 SD 卡掃描媒體…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB 儲存裝置已掛接為唯讀裝置。"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD 卡已掛接為唯讀裝置。"</string>
     <string name="skip_label" msgid="47510779345218297">"略過"</string>
@@ -258,15 +266,17 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"設定"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"設定捷徑"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"飛航模式"</string>
-    <string name="radio_controls_title" msgid="6889937359495515769">"更多內容..."</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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"由於您不在主要網路蓋涵範圍,且已關閉漫遊服務,資料連線已中斷。"</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"開啟"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"允許漫遊服務時,您可能需要支付龐大的漫遊費用!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"允許使用數據漫遊服務時,您可能需要支付龐大的漫遊費用!\n\n這項設定會影響這台平板電腦的所有使用者。"</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"允許使用數據漫遊服務時,您可能需要支付龐大的漫遊費用!\n\n這項設定會影響這支手機的所有使用者。"</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"允許漫遊服務?"</string>
     <string name="networks" msgid="6333316876545927039">"選取電信業者"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"選擇網路業者"</string>
@@ -297,6 +307,10 @@
     <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>
@@ -308,8 +322,8 @@
     <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">"您可以將帳戶、設定、已下載的應用程式及其資料、媒體和其他檔案加密。一旦您將平板電腦加密,就必須在每次開機時輸入數字 PIN 或密碼,如此才能解密。如要解除加密狀態,必須恢復原廠設定,但這樣會清除平板電腦上的所有資料。"\n\n"加密過程可能需要 1 個小時以上的時間。加密前必須先將電池充滿電,並且在過程中讓平板電腦持續連接電源,直到加密完成為止。如果加密過程中斷,您將失去部分或所有資料。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"您可以將帳戶、設定、已下載的應用程式及其資料、媒體和其他檔案加密。一旦您將手機加密,就必須在每次開機時輸入數字 PIN 或密碼,如此才能解密。如要解除加密狀態,必須恢復原廠設定,但這樣會清除手機上所有的資料。"\n\n"加密過程可能需要 1 個小時以上的時間。加密前必須先將電池充滿電,並且在過程中讓手機持續連接電源,直到加密完成為止。如果加密過程中斷,您將失去部分或所有資料。"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"您可以將帳戶、設定、已下載的應用程式及其資料、媒體和其他檔案加密。一旦您將平板電腦加密,就必須在每次開機時輸入數字 PIN 或密碼,如此才能解密。如要解除加密狀態,必須恢復原廠設定,但這樣會清除平板電腦上的所有資料。\n\n加密過程可能需要 1 個小時以上的時間。加密前必須先將電池充滿電,並且在過程中讓平板電腦持續連接電源,直到加密完成為止。如果加密過程中斷,您將失去部分或所有資料。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"您可以將帳戶、設定、已下載的應用程式及其資料、媒體和其他檔案加密。一旦您將手機加密,就必須在每次開機時輸入數字 PIN 或密碼,如此才能解密。如要解除加密狀態,必須恢復原廠設定,但這樣會清除手機上所有的資料。\n\n加密過程可能需要 1 個小時以上的時間。加密前必須先將電池充滿電,並且在過程中讓手機持續連接電源,直到加密完成為止。如果加密過程中斷,您將失去部分或所有資料。"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"加密保護平板電腦"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"對手機進行加密"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"將電池充電,然後再試一次。"</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> 秒內再試一次。"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"輸入密碼"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失敗"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"加密過程中斷,無法完成,因此您再也不能存取平板電腦上的資料。"\n\n"如要恢復使用平板電腦,請先將平板電腦重設回原廠設定。完成重設後,您可以在設定平板電腦時,將先前備份至「Google 帳戶」的資料全部還原。"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"加密過程中斷,無法完成,因此您再也不能存取手機上的資料。"\n\n"如要恢復使用手機,請先將手機重設回原廠設定。完成重設後,您可以在設定手機時,將先前備份至「Google 帳戶」的資料全部還原。"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"加密過程中斷,無法完成,因此您再也不能存取平板電腦上的資料。\n\n如要恢復使用平板電腦,請先將平板電腦重設回原廠設定。完成重設後,您可以在設定平板電腦時,將先前備份至「Google 帳戶」的資料全部還原。"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"加密過程中斷,無法完成,因此您再也不能存取手機上的資料。\n\n如要恢復使用手機,請先將手機重設回原廠設定。完成重設後,您可以在設定手機時,將先前備份至「Google 帳戶」的資料全部還原。"</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"切換輸入法"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"選擇螢幕鎖定方式"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"選擇備用解鎖方式"</string>
@@ -362,10 +376,10 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"變更解鎖 PIN"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"變更解鎖密碼"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"密碼必須有至少 %d 個字元"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN 必須有至少 %d 個字元"</string>
+    <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>
@@ -406,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>
@@ -431,7 +454,7 @@
     <string name="bluetooth_connecting_error_message" msgid="229861986106185022">"無法連線至「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。"</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"掃描裝置"</string>
     <string name="bluetooth_search_for_devices" msgid="5957007154213560390">"搜尋裝置"</string>
-    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"搜尋中..."</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"搜尋中…"</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"裝置設定"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"配對裝置"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"可用的裝置"</string>
@@ -440,11 +463,11 @@
     <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"配對並連線"</string>
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"解除配對"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"中斷連線並解除配對"</string>
-    <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"選項..."</string>
+    <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"選項…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"進階選項"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"藍牙進階設定"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="4793562956642282639">"開啟藍牙即可查看可用裝置。"</string>
-    <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"連線到..."</string>
+    <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"連線到…"</string>
     <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"媒體音訊"</string>
     <string name="bluetooth_profile_headset" msgid="8658779596261212609">"手機音訊"</string>
     <string name="bluetooth_profile_opp" msgid="9168139293654233697">"檔案傳輸"</string>
@@ -480,6 +503,28 @@
     <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_empty_list_wifi_display_off" msgid="1225626898926363100">"如要查看裝置,請開啟無線螢幕分享。"</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_paired_devices" msgid="7395326840730024303">"已配對的顯示裝置"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"可用的裝置"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"連線中"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"已連線"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"可以使用"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"正在使用中"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"顯示裝置設定"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"中斷連線?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"這個動作會結束您與下列裝置的連線:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"無線螢幕分享選項"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"刪除"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"完成"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"名稱"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"開啟"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"關閉"</string>
+    <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"已停用"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"允許平板電腦在與其他裝置接觸時交換資料"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"允許手機與其他裝置接觸時交換資料"</string>
@@ -488,56 +533,68 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"關閉"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC 已關閉,因此無法使用"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"這項功能啟用時,您只要將裝置靠在一起,即可讓應用程式內容傳輸至其他支援 NFC 的裝置。例如,您可以傳輸瀏覽器頁面、YouTube 影片、使用者聯絡人等內容。"\n\n"只要將裝置靠在一起 (一般都是背靠背),然後輕觸螢幕,接著應用程式會決定要傳輸哪些內容。"</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"這項功能啟用時,您只要將裝置靠在一起,即可讓應用程式內容傳輸至其他支援 NFC 的裝置。例如,您可以傳輸瀏覽器頁面、YouTube 影片、使用者聯絡人等內容。\n\n只要將裝置靠在一起 (一般都是背靠背),然後輕觸螢幕,接著應用程式會決定要傳輸哪些內容。"</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"網路服務搜尋"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"允許其他裝置上的應用程式搜尋這個裝置上的應用程式"</string>
-    <string name="wifi_quick_toggle_title" msgid="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="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_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="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="8116564886303972764">"請在 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_in_progress" msgid="2944576520214787628">"WPS 已開始執行,最多需要兩分鐘可完成"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"已連線至 Wi-Fi 網路 <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS 已開始執行,最多需要兩分鐘才能完成。"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS 無法成功啟動,請過幾分鐘後再試一次。"</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"不支援無線路由器安全性設定 (WEP)"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"不支援無線路由器安全性設定 (TKIP)"</string>
     <string name="wifi_wps_failed_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>
@@ -564,6 +621,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>
@@ -571,8 +631,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_advanced_titlebar" msgid="1627063574532930090">"進階 Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi 頻帶"</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="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>
@@ -588,13 +656,14 @@
     <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>
-    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"搜尋中..."</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"搜尋中…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"重新命名裝置"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"對端裝置"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"已記住的群組"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"無法連線。"</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"無法重新命名裝置。"</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"中斷連線?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"如果您中斷連線,即會結束您與「<xliff:g id="PEER_NAME">%1$s</xliff:g>」和其他 <xliff:g id="PEER_COUNT">%2$s</xliff:g> 個裝置的連線。"</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"取消邀請?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"您要取消 <xliff:g id="PEER_NAME">%1$s</xliff:g> 的連線邀請?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"可攜式 Wi-Fi 無線基地台"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"刪除這個群組?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"可攜式 Wi-Fi 無線基地台"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"音樂效果"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"鈴聲音量"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"靜音時震動"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"預設通知"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"預設通知音效"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"閃爍燈光通知"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"鈴聲"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"通知"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"通知音量與來電音量相同"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"選擇通知鈴聲"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"預設通知音效"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"媒體"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"設定音樂與影片的音量"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"鬧鐘"</string>
@@ -671,15 +743,16 @@
     <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="3848608373818910549">"螢幕保護程式模組"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"如果連接電源,進入休眠狀態時即啟動"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"已停用"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"已選取的螢幕保護程式模組"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"啟動時間"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"永遠不要"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"試試看!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"安置於座架上時一併啟動"</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">"如要控制手機安置於座架上和/或休眠時的設定,請開啟休眠模式。"</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>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN 不正確"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN 不符"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"無法變更 PIN。"\n"PIN 碼可能不正確。"</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"無法變更 PIN。\nPIN 碼可能不正確。"</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"成功變更 SIM PIN"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"無法變更 SIM 卡鎖定狀態。"\n"可能輸入了不正確的 PIN。"</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"無法變更 SIM 卡鎖定狀態。\n可能輸入了不正確的 PIN。"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"確定"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"取消"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"平板電腦狀態"</string>
@@ -716,6 +789,7 @@
     <string name="baseband_version" msgid="1848990160763524801">"基頻版本"</string>
     <string name="kernel_version" msgid="9192574954196167602">"核心版本"</string>
     <string name="build_number" msgid="3075795840572241758">"版本號碼"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"SELinux 狀態"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"無法取得"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"狀態"</string>
     <string name="device_status" msgid="607405385799807324">"狀態"</string>
@@ -733,12 +807,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">"行動網路類型"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"行動通訊業者資訊"</string>
     <string name="status_data_state" msgid="5503181397066522950">"行動網路狀態"</string>
     <string name="status_service_state" msgid="2323931627519429503">"服務狀態"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"訊號強度"</string>
     <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>
@@ -748,14 +823,16 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB 儲存裝置"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD 卡"</string>
     <string name="memory_available" msgid="5052397223077021181">"可用空間"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"可用空間 (唯讀)"</string>
     <string name="memory_size" msgid="6629067715017232195">"總空間"</string>
-    <string name="memory_calculating_size" msgid="2188358544203768588">"計算中..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"應用程式 (應用程式資料和媒體內容)"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"計算中…"</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>
     <string name="memory_music_usage" msgid="1363785144783011606">"音訊 (音樂、鈴聲、Podcast 等)"</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>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"卸載內部 USB 儲存裝置"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"清除 SD 卡"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"清除內部 USB 儲存裝置中的所有資料,例如音樂和相片"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"清除 SD 卡中的所有資料,例如音樂和相片"</string>
-    <string name="read_only" msgid="6702420168629076340">" (唯讀)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"清除快取資料?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"這會清除所有應用程式的快取資料。"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP 或 PTP 功能已啟用"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"您要將 USB 儲存裝置退出?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"您要將 SD 卡退出?"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"如果您將 USB 儲存裝置退出,則某些正在使用中的應用程式會停止運作,而且可能無法使用,直到重新插入 USB 儲存裝置之後才會恢復正常。"</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"相機 (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"讓您使用相機軟體傳輸相片,並在任何不支援 MTP 的電腦上傳輸檔案"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"安裝檔案傳輸工具"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"其他使用者"</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>
@@ -822,6 +902,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>
@@ -837,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"恢復原廠設定"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"清除平板電腦上的所有資料"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"清除手機上所有資料"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"這會清除您平板電腦"<b>"內部儲存裝置"</b>"中的所有資料,包括:"\n\n<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"這會清除您手機"<b>"內部儲存裝置"</b>"中的所有資料,包括:"\n\n<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"您目前已登入下列帳戶:"\n</string>
+    <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>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"如要清除音樂、圖片及其他使用者資料,必須先清除 "<b>"SD 卡"</b>"。"</string>
@@ -897,10 +979,15 @@
     <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="manage_mobile_plan_title" msgid="7588182101738043593">"管理行動數據傳輸資費方案"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"未知的 SIM 行動通訊業者"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s 沒有任何已知的佈建網站"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"請插入 SIM 卡,並重新啟動裝置"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"請連線至網際網路"</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>
@@ -910,23 +997,24 @@
     <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>
     <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="copyright_title" msgid="865906688917260647">"版權"</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_loading" msgid="3337535809093591740">"載入中..."</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>
@@ -944,7 +1032,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"變更解鎖 PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"確認儲存的圖形"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"請再試一次:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"畫出解鎖圖形"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"畫出解鎖圖形:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"請按 [Menu] 以取得說明。"</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"完成時請移開手指。"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"請連接至少 <xliff:g id="NUMBER">%d</xliff:g> 點。再試一次:"</string>
@@ -966,12 +1054,7 @@
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"如何畫出解鎖圖形"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"錯誤嘗試太多!"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"<xliff:g id="NUMBER">%d</xliff:g> 秒後再試一次。"</string>
-    <string name="skip_button_label" msgid="8680422740354436943">"取消"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"下一步"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"保護平板電腦的安全"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"手機安全設定"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"建立個人螢幕解鎖圖形,避免有心人士未經授權即擅自使用您的平板電腦。在下個畫面中,滑動手指任意連結螢幕中至少 4 個點。"\n\n"準備開始了嗎?請輕觸 [下一步]。"</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"建立個人螢幕解鎖圖形,避免他人未經授權擅自使用您的手機。請在下一個畫面中,滑動手指任意連接至少四個點。"\n\n"準備開始了嗎?請輕觸 [下一步]。"</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"您未在手機上安裝應用程式。"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"管理應用程式"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"管理和移除已安裝的應用程式"</string>
     <string name="applications_settings" msgid="1721442176406964682">"應用程式"</string>
@@ -981,6 +1064,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"允許安裝來源不明的應用程式"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"來歷不明的應用程式可能會損害您的平板電腦及個人資料,如因使用這些應用程式導致平板電腦受損或資料遺失,請自行負責。"</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"來歷不明的應用程式可能會損害您的手機及個人資料。如因使用這些應用程式導致手機受損或資料遺失,請自行負責。"</string>
+    <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="application_info_label" msgid="5736524913065714880">"應用程式資訊"</string>
@@ -1001,6 +1086,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB 儲存裝置資料"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD 卡"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"解除安裝"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"為所有使用者解除安裝"</string>
+    <string name="install_text" msgid="884360662922471113">"安裝"</string>
     <string name="disable_text" msgid="6544054052049395202">"停用"</string>
     <string name="enable_text" msgid="9217362512327828987">"啟用"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"清除資料"</string>
@@ -1019,22 +1106,24 @@
     <string name="show_background_processes" msgid="2009840211972293429">"顯示快取處理程序"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"重設應用程式偏好設定"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"重設應用程式偏好設定?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"這會將下列項目的所有偏好設定全部重設:"\n\n" "<li>"已停用的應用程式"</li>\n" "<li>"已停用的應用程式通知"</li>\n" "<li>"執行動作的預設應用程式"</li>\n" "<li>"應用程式背景資料限制"</li>\n\n" 請放心,您的所有應用程式資料都不會遭到移除。"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"這會將下列項目的所有偏好設定全部重設:\n\n "<li>"已停用的應用程式"</li>\n" "<li>"已停用的應用程式通知"</li>\n" "<li>"執行動作的預設應用程式"</li>\n" "<li>"應用程式背景資料限制"</li>\n\n" 請放心,您的所有應用程式資料都不會遭到移除。"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"重設應用程式"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"管理空間"</string>
     <string name="filter" msgid="2018011724373033887">"篩選"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"選擇篩選器選項"</string>
     <string name="filter_apps_all" msgid="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>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"於 SD 卡"</string>
     <string name="disabled" msgid="9206776641295849915">"已停用"</string>
+    <string name="not_installed" msgid="1475144352069281880">"未安裝"</string>
     <string name="no_applications" msgid="7336588977497084921">"沒有應用程式。"</string>
     <string name="internal_storage" msgid="1584700623164275282">"內部儲存空間"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB 儲存裝置"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD 卡儲存裝置"</string>
-    <string name="recompute_size" msgid="7722567982831691718">"重新計算大小..."</string>
+    <string name="recompute_size" msgid="7722567982831691718">"重新計算大小…"</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"您要刪除應用程式資料嗎?"</string>
     <string name="clear_data_dlg_text" msgid="8847257251846779938">"這個應用程式的所有資料都將永遠遭到刪除,包含所有檔案、設定、帳戶、資料庫等。"</string>
     <string name="dlg_ok" msgid="2402639055725653590">"確定"</string>
@@ -1048,13 +1137,15 @@
     <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>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>,<xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
-    <string name="computing_size" msgid="1599186977475211186">"計算中..."</string>
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"這個應用程式可能需要付費使用:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"傳送付費簡訊"</string>
+    <string name="computing_size" msgid="1599186977475211186">"計算中…"</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"無法計算套件大小。"</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"您並未安裝任何第三方應用程式。"</string>
     <string name="version_text" msgid="9189073826278676425">"版本 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
@@ -1077,8 +1168,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"變更偏好的新應用程式安裝位置"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"您要停用內建應用程式嗎?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"如果您停用內建應用程式,其他應用程式可能無法正常運作。"</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"刪除資料並停用應用程式?"</string>
+    <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>
@@ -1094,6 +1190,8 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"使用者:<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"已移除的使用者"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> 項處理程序和 <xliff:g id="NUMSERVICES">%2$d</xliff:g> 項服務"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> 項處理程序和 <xliff:g id="NUMSERVICES">%2$d</xliff:g> 項服務"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> 項處理程序和 <xliff:g id="NUMSERVICES">%2$d</xliff:g> 項服務"</string>
@@ -1128,8 +1226,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="show_password_summary" msgid="7345931695292850058"></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>
@@ -1144,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"如要切換,請按下 Ctrl+空白鍵。"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"預設"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"鍵盤配置"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"使用者字典"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"個人字典"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"個人字典"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"個人字典"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"新增"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"新增至字典"</string>
@@ -1157,12 +1252,14 @@
     <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_all_languages" msgid="6742000040975959247">"所有語言"</string>
-    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"更多語言..."</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"更多語言…"</string>
     <string name="testing" msgid="6584352735303604146">"測試中"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"平板電腦資訊"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"手機資訊"</string>
@@ -1197,24 +1294,38 @@
     <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="bt_hci_snoop_log" msgid="3340699311158865670">"啟用藍牙 HCI 窺探紀錄"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"擷取單一檔案內的所有藍牙 HCI 封包"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"選取執行階段"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"選取執行階段"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"要重新啟動裝置,將執行階段從 <xliff:g id="OLD">%1$s</xliff:g> 變更為 <xliff:g id="NEW">%2$s</xliff:g> 嗎?"</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>
+    <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>
-    <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_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="enable_terminal_title" msgid="95572094356054120">"本機終端機"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"啟用可提供本機命令介面存取權的終端機應用程式"</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>
@@ -1234,29 +1345,43 @@
     <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_toggle_large_text_title" msgid="6618674985313017711">"大字體"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"電源鍵可結束通話"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"說出密碼"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"輕觸並按住的延遲時間"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"強化網頁協助工具"</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>
+    <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_toggle_speak_password_preference_title" msgid="5986628515113204844">"說出密碼"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"輕觸並按住的延遲時間"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"設定"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"開啟"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"關閉"</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="accessibility_feature_state_on" msgid="2864292320042673806">"開啟"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"關閉"</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="print_settings" msgid="4742428530112487843">"列印"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"列印設定"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"服務"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"要使用「<xliff:g id="SERVICE">%1$s</xliff:g>」嗎?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"「<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>」可接收您所列印的文件,這些文件可能含有機密資料。"</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"未安裝任何服務"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"設定"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"新增印表機"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"開啟"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"關閉"</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>
@@ -1268,14 +1393,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>
@@ -1283,7 +1408,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>
@@ -1291,13 +1416,15 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"已接收資料"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"已傳送的行動數據量"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"已接收的行動數據量"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"已傳送的 Wi-Fi 數據量"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"已接收的 Wi-Fi 數據量"</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>
@@ -1306,7 +1433,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>
@@ -1315,8 +1442,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>
@@ -1324,6 +1451,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"停止或解除安裝應用程式"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"手動控制 GPS 以防止應用程式使用 GPS"</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>
@@ -1350,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"音調"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"影響文字轉語音功能的播放音調"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"語言"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"未選取語言"</string>
     <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>
@@ -1361,6 +1490,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>
@@ -1378,8 +1508,26 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"亮度 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"自動"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for gadget_brightness_state_full (6814570109772137631) -->
+    <skip />
+    <!-- String.format failed for translation -->
+    <!-- no translation found for gadget_brightness_state_half (3696671957608774204) -->
+    <skip />
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"關閉"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"憑證儲存空間"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"從儲存裝置安裝"</string>
@@ -1390,6 +1538,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>
@@ -1411,14 +1562,11 @@
     <string name="backup_section_title" msgid="7952232291452882740">"備份與還原"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"個人資料"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"備份我的資料"</string>
-    <string name="backup_data_summary" msgid="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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"重新安裝應用程式時,還原備份的設定和資料"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"取得錯誤報告"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"這會收集您目前裝置狀態的相關資訊,並透過電子郵件傳送給您。從開始建立錯誤報告到準備傳送,這段過程可能需要一點時間,敬請耐心等候。"</string>
-    <string name="report" msgid="302437572240018342">"報告"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"電腦備份密碼"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"電腦完整備份目前未受保護"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"輕觸即可變更或移除電腦完整備份的密碼"</string>
@@ -1426,7 +1574,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>
@@ -1442,10 +1590,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>
@@ -1458,7 +1606,7 @@
     <string name="wifi_setup_forget" msgid="2562847595567347526">"刪除"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"儲存"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"取消"</string>
-    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"正在掃描網路..."</string>
+    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"正在掃描網路…"</string>
     <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"請輕觸要連接的網路"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"連線至現有網路"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"連線至無安全保護措施的網路"</string>
@@ -1467,9 +1615,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_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_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="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>
@@ -1487,7 +1635,7 @@
     <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="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>
@@ -1534,9 +1682,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>
@@ -1548,40 +1697,44 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"更新表層時閃爍顯示整個視窗表層"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"顯示 GPU 畫面更新"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"使用 GPU 繪圖時在視窗中閃爍顯示畫面"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"顯示硬體層更新"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"在硬體層更新時閃綠燈"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"針對 GPU 透支情形進行偵錯"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"顯示 CPU 使用量"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"在螢幕上方顯示目前的 CPU 使用量"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"強制使用 GPU 轉譯"</string>
     <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">"Animator 影片長度比例"</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>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"使用者離開活動後立刻刪除所有活動內容"</string>
     <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>
-    <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>
@@ -1591,8 +1744,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>
@@ -1607,11 +1760,11 @@
     <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" msgid="1466689968707308512">"如果採用這項功能,當只有行動網路可供使用時,需要背景數據傳輸的應用程式可能會停止運作。"\n\n"您可以在應用程式的設定選單中,找出更多適當的數據用量的選項。"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"如果採用這項功能,當只有行動網路可供使用時,需要背景數據傳輸的應用程式可能會停止運作。\n\n您可以在應用程式的設定選單中,找出更多適當的數據用量的選項。"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="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>
@@ -1620,22 +1773,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" 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_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>
@@ -1667,6 +1823,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"新增 VPN 設定檔"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"編輯設定檔"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"刪除設定檔"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"永久連線的 VPN"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"選取要永久連線的 VPN 設定檔。只在連線到這個 VPN 時才允許網路流量。"</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"無"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"永久連線的 VPN 需要同時具備伺服器和 DNS 的 IP 位址。"</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"沒有網路連線,請稍後再試。"</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"找不到憑證,請編輯設定檔。"</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"系統"</string>
@@ -1685,24 +1845,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"取消"</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">"其他系統更新"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"使用者與限制"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"使用者"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"新增使用者"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"編輯詳細資訊"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"使用者資訊"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"名稱"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"內容限制"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"需要輸入 PIN"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"內容分級"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"系統應用程式"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"應用程式已安裝"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"捨棄"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"移除使用者"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"小頑童"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"已停用"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"許可"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"執行中"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"使用者"</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="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_confirm_remove_message" msgid="5284111415714437285">"您確定要將使用者和所有相關聯的資料從裝置上移除嗎?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"變更字型大小"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"限制"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"移除限制"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"變更 PIN 碼"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"顯示通知"</string>
     <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_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="6160672982086584261">"設定應用程式限制"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"受到「<xliff:g id="APP">%1$s</xliff:g>」控制"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"系統不支援設有限制的個人資料使用這個應用程式"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"這個應用程式可存取您的帳戶"</string>
+    <string name="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 f929c73..6be3864 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -30,8 +30,8 @@
     <item msgid="8392017019801393511">"Konke"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"amasekhondi angu-15"</item>
-    <item msgid="8881760709354815449">"amasekhondi angu-30"</item>
+    <item msgid="3342301044271143016">"15 amasekhondi"</item>
+    <item msgid="8881760709354815449">"30 amasekhondi"</item>
     <item msgid="7589406073232279088">"1 iminithi"</item>
     <item msgid="7001195990902244174">"2 amaminithi"</item>
     <item msgid="7489864775127957179">"amaminithii angu-5"</item>
@@ -50,9 +50,9 @@
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="8929270399652145290">"Ngokushesha"</item>
-    <item msgid="6736512735606834431">"amasekhondi angu-5"</item>
-    <item msgid="8044619388267891375">"amasekhondi angu-15"</item>
-    <item msgid="1822002388249545488">"amasekhondi angu-30"</item>
+    <item msgid="6736512735606834431">"5 amasekhondi"</item>
+    <item msgid="8044619388267891375">"15 amasekhondi"</item>
+    <item msgid="1822002388249545488">"30 amasekhondi"</item>
     <item msgid="8538071621211916519">"1 iminithi"</item>
     <item msgid="5663439580228932882">"2 amaminithi"</item>
     <item msgid="49888496216106852">"5 amaminithi"</item>
@@ -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>
@@ -135,7 +142,7 @@
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="8151962652413645395">"2 amaminithi"</item>
     <item msgid="8675215713017289017">"amaminithii angu-5"</item>
-    <item msgid="477015974247590543">"ihora elingu-1"</item>
+    <item msgid="477015974247590543">"1 ihora"</item>
     <item msgid="5198271470953124739">"Ayiphelelwa isikhathi"</item>
   </string-array>
   <string-array name="wifi_signal">
@@ -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,16 +218,127 @@
     <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="886742181977884584">"Abezindaba"</item>
+    <item msgid="7924928667052300589">"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>
+    <item msgid="5124443975763747838">"izinkinobho zabezindaba"</item>
+    <item msgid="4547883971364273343">"ukugxila komsindo"</item>
+    <item msgid="2603878814882344450">"ivolumu kangqo"</item>
+    <item msgid="7136963238377062018">"ivolumu yezwi"</item>
+    <item msgid="4270236897655923007">"ivolumu yokukhala"</item>
+    <item msgid="6325739889222559394">"ivolumu yabezindaba"</item>
+    <item msgid="5762123934816216821">"ivolumu ye-alamu"</item>
+    <item msgid="785049718065337473">"ivolumu yesaziso"</item>
+    <item msgid="6700305533746877052">"ivolumu ye-bluetooth"</item>
+    <item msgid="2029227495214047094">"gcina kuphapheme"</item>
+    <item msgid="26109888160231211">"ngamela indawo"</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>
+    <item msgid="5753789168376302997">"Izinkinobho zabezindaba"</item>
+    <item msgid="3265262911688671938">"Ukugxila komsindo"</item>
+    <item msgid="2098976479485046797">"Ivolumu kangqo"</item>
+    <item msgid="5660213838861789350">"Ivolumu yezwi"</item>
+    <item msgid="7983336752371254444">"Ivolumu yokukhala"</item>
+    <item msgid="7878027809189330917">"Ivolumu yabezindaba"</item>
+    <item msgid="7260546305036218513">"Ivolumu ye-alamu"</item>
+    <item msgid="9103719301075748925">"Ivolumu yesaziso"</item>
+    <item msgid="7025966722295861512">"Ivolumu ye-Bluetooth"</item>
+    <item msgid="4665183401128289653">"Gcina kuphapheme"</item>
+    <item msgid="8584357129746649222">"Indawo"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kufushane"</item>
     <item msgid="2560532955514699713">"Okulingene"</item>
     <item msgid="2372711992605524591">"Kude"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"I-Dalvik"</item>
+    <item msgid="8978402910750533864">"UBUCIKO"</item>
+    <item msgid="7839859333977894115">"UBUCIKO (ukulungisa iphutha)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Sebenzisa i-Dalvik"</item>
+    <item msgid="5131846588686178907">"Sebenzisa UBUCIKO"</item>
+    <item msgid="4530003713865319928">"Sebenzisa ukwakha kokulungisa iphutha LOBUCIKO"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Akusoze kuhlole"</item>
     <item msgid="6042769699089883931">"Hlola okuqukethwe kwe-DRM kuphela"</item>
@@ -253,6 +376,35 @@
     <item msgid="3170120558236848008">"Isilinganisi sesithombe esinyakazayo 5x"</item>
     <item msgid="1069584980746680398">"Isilinganiso sesithombe esinyakazayo 10x"</item>
   </string-array>
+  <string-array name="overlay_display_devices_entries">
+    <item msgid="1606809880904982133">"Akunalutho"</item>
+    <item msgid="688482401508173818">"720x480 mdpi"</item>
+    <item msgid="1725473474827398815">"1280x720 tvdpi"</item>
+    <item msgid="6813511923592083251">"1920x1080 xhdpi"</item>
+    <item msgid="3646519549495410112">"1280x720 tvdpi no-1920x1080 xhdpi"</item>
+  </string-array>
+  <string-array name="enable_opengl_traces_entries">
+    <item msgid="3191973083884253830">"Akunalutho"</item>
+    <item msgid="9089630089455370183">"i-Logcat"</item>
+    <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="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Valiwe"</item>
+    <item msgid="7688197031296835369">"Bonisa izindawo zokukhipha okungaphezulu"</item>
+    <item msgid="8332661909019981149">"Bonisa ikhawunda yokukhipha okungaphezulu"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Isilanganiso esivamile"</item>
     <item msgid="4071574792028999443">"Azikho izinqubo zesizinda"</item>
@@ -277,4 +429,9 @@
     <item msgid="4042143101664725090">"Isikhathi siphelile"</item>
     <item msgid="7664124146786465092">"Akuphumelelanga"</item>
   </string-array>
+  <string-array name="security_settings_premium_sms_values">
+    <item msgid="7389829271787670252">"Buza"</item>
+    <item msgid="5077768429488260031">"Ungavumeli"</item>
+    <item msgid="1417929597727989746">"Vumela njalo?"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index ebb267a..8b8f849 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -19,7 +19,15 @@
     <string name="yes" msgid="4676390750360727396">"Yebo"</string>
     <string name="no" msgid="6731231425810196216">"Cha"</string>
     <string name="create" msgid="3578857613172647409">"Yakha"</string>
+    <string name="allow" msgid="3349662621170855910">"Vumela"</string>
+    <string name="deny" msgid="6947806159746484865">"Nqaba"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Akwaziwa"</string>
+  <plurals name="show_dev_countdown">
+    <item quantity="one" msgid="5295687242294085452">"Manje usalelwe yizinyathelo ezingu-<xliff:g id="STEP_COUNT">%1$d</xliff:g> ukuthi ube ngunjiniyela."</item>
+    <item quantity="other" msgid="6722953419953594148">"Manje usalelwe yizinyathelo ezingu-<xliff:g id="STEP_COUNT">%1$d</xliff:g> ukuthi ube ngunjiniyela."</item>
+  </plurals>
+    <string name="show_dev_on" msgid="1110711554982716293">"Manje ungunjiniyela!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Asikho isidingo, usuvele ungunjiniyela."</string>
     <string name="header_category_wireless_networks" msgid="4944823405420438623">"AMANETHIWEKHI NOKUNGENANTAMBO"</string>
     <string name="header_category_device" msgid="5781174212691167553">"IDIVAYISI"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"YOMUNTU UQOBO LWAKHE"</string>
@@ -84,12 +92,14 @@
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Iyashaja"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
-    <string name="battery_info_status_discharging" msgid="6222697503392774475">"Iyanqamula"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(okungenantambo)"</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"Ayishaji"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ayishaji"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Kugcwele"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"Okumonxuliwe"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"I-AC"</string>
     <string name="battery_info_power_usb" msgid="8012931702516331797">"I-USB"</string>
+    <string name="battery_info_power_wireless" msgid="6819163295739305097">"okungenantambo"</string>
     <string name="battery_info_power_ac_usb" msgid="6777734146838328688">"I-AC+USB"</string>
     <string name="battery_info_power_unknown" msgid="7344115502868899881">"Akwaziwa"</string>
     <string name="battery_info_health_unknown" msgid="5664295556921944255">"Akwaziwa"</string>
@@ -100,14 +110,11 @@
     <string name="battery_info_health_unspecified_failure" msgid="6347021103185471590">"Iphutha elingaziwa"</string>
     <string name="battery_info_health_cold" msgid="3835692786176707318">"Kuyabanda"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_visibility" msgid="2930835434091839916">"Iyatholakala"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Ibonakala kuwo wonke amadivayisi e-Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Iyabonakala kuwo wonke amadivaysi aseduze we-Bluetooth"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Ayibonakali kwamanye amadivayisi e-Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Ibonakala kuphela kumadivayisi apheyiwe"</string>
-    <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Yenza idivaysi itholakale"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Ukubonakala kuphelelwe isikhathi"</string>
-    <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Hlela ukuthi idivaysi izotholakala isikhathi esingakanani"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Vala ukudayela ngezwi"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Gwema ukusebenzisa isidayeli se-bluetooth lapho isikrini sivaliwe"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Amadivaysi e-Bluetooth"</string>
@@ -141,15 +148,15 @@
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Bonisa amafayili atholiwe"</string>
     <string name="device_picker" msgid="8398232791303186677">"Isikhethi sedivayisi ye-Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Isicelo semvume ye-Bluetooth"</string>
-    <string name="bluetooth_ask_enablement" msgid="5279027758886569301">"Zonke izinhlelo zokulungiselela ukusebenza zifuna ukuvula i-Bluetooth. Ngabe uyakuvumela lokhu?"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Uhlelo lokusebenza olukwi-tablet yakho lufuna ukwenza ukuthi i-tablet yakho ibonwe ngamanye amadivayisi e-Bluetooth  <xliff:g id="TIMEOUT">%1$d</xliff:g> imizuzwana. Ngabe uyakuvumela lokhu?"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="4478906085771274647">"Kukhona uhlelo lokusebenza kwiselula yakho olufuna ukuvula i-Bluetooth bese lwenza ukuthi iselula yakho itholwe ngamanye amadivayisi <xliff:g id="TIMEOUT">%1$d</xliff:g> imizuzwana. Kuvunyelwe na?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8737516188038252313">"Uhlelo lokusebenza olukwi-tablet yakho lufuna ukwenza ukuthi i-tablet yakho \"ibonwe ngaso sonke isikhathi\" ngamanye amadivayisi e-Bluetooth . Ngabe uyakuvumela lokhu?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="7751530664834149084">"Kukhona uhlelo lokusebenza kwiselula yakho olufuna ukuthi iselula yakho \"ihlale itholwe\" ngamanye amadivayisi e-Bluetooth. Kuvunyelwe na?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="8504403125440086020">"Uhlelo lokusebenza olukwi-tablet yakho lufuna ukwenza ukuthi i-tablet yakho ibonwe ngamanye amadivayisi e-Bluetooth  <xliff:g id="TIMEOUT">%1$d</xliff:g> imizuzwana. Ngabe uyakuvumela lokhu?"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="3040361003987241057">"Kukhona uhlelo lokusebenza kwiselula yakho olufuna ukuvula i-Bluetooth bese lwenza ukuthi iselula yakho itholwe ngamanye amadivayisi <xliff:g id="TIMEOUT">%1$d</xliff:g> imizuzwana. Kuvunyelwe na?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="7254712987802497615">"Uhlelo lokusebenza olukwi-tablet yakho lufuna ukwenza ukuthi i-tablet yakho ibonwe ngamanye amadivayisi e-Bluetooth  {0}TIMEOUT{/0} imizuzwana. Ngabe uyakuvumela lokhu?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="3947789545028519103">"Kukhona uhlelo lokusebenza kwiselula yakho olufuna ukuvula i-Bluetooth bese lwenza ukuthi iselula yakho itholwe ngamanye amadivayisi {0}TIMEOUT{/0} imizuzwana. Kuvunyelwe na?"</string>
+    <string name="bluetooth_ask_enablement" msgid="637355677176904990">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="786921566047356213">"Uhlelo lokusebenza oluthile lufuna ukwenza ithebulethi yakho ibonakale kwamanye amadivayisi we-Bluetooth kumasekhondi angu-<xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="5510358858113713272">"Uhlelo lokusebenza oluthile lufuna ukwenza ifoni yakho ibonakale kwamanye amadivayisi we-Bluetooth kumasekhondi angu-<xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8863617309580598607">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ithebulethi yakho ibonakale kwamanye amadivayisi we-Bluetooth. Ungakushintsha lokhu emuva kwesikhathi kuzilungiselelo ze-Bluetooth."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ifoni yakho ibonakale kwamanye amadivayisi we-Bluetooth. Ungakushintsha lokhu emuva kwesikhathi kuzilungiselelo ze-Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ithebulethi yakho ibonakale kwamanye amadivayisi kumasekhondi angu-<xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ifoni yakho ibonakale kwamanye amadivayisi kumasekhondi angu-<xliff:g id="TIMEOUT">%1$d</xliff:g>."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ithebulethi yakho ibonakale kwamanye amadivayisi. Ungakushintsha lokhu emuva kwesikhathi kuzilungiselelo ze-Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ifoni yakho ibonakale kwamanye amadivayisi. Ungakushintsha lokhu emuva kwesikhathi kuzilungiselelo ze-Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Ivula i-Bluetooth"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Ivala i-Bluetooth"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Ukuxhuma okuzenzakalelayo"</string>
@@ -190,6 +197,7 @@
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Iphrokzi ye-HTTP isetshenziswa isiphequluli kodwa kungenzeka ingasetshenziswa ezinye izinhlelo zokusebenza"</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Indawo:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"I-CID Yokwakhelana:"</string>
+    <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Ulwazi leseli:"</string>
     <string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Imizamo yedatha:"</string>
     <string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Iseva ye-GPRS:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Ukuzulazula:"</string>
@@ -206,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>
@@ -258,15 +266,17 @@
     <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>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Ulahlekelwe uxhumano lwedatha ngoba ushiye inethiwekhi yakho yasekhaya inokuzulazula kwedatha kuvaliwe."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Yivule"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Uma uvumela ukuhamba kwedatha, ungathola amashaji yokuthola amancane!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Uma uvumela ukuzulazula kwedatha, ungahle ufake ebucayini amashaji okuzula amancane!\n\nLesi silungiselelwa sithinta bonke abasebenzisi kule thebulethi."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Uma uvumela ukuzulazula kwedatha, ungahle ufake ebucayini amashaji okuzula amancane!\n\nLesi silungiselelwa sithinta bonke abasebenzisi kule foni."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Vumela ukuhamba kwedatha?"</string>
     <string name="networks" msgid="6333316876545927039">"Inketho yo-opheretha"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Khetha inkamapani yenethiwekhi"</string>
@@ -297,6 +307,10 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Imininingwane yomnikazi"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <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>
@@ -308,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Dinga i-PIN yenombolo noma iphasiwedi ukubonisa umbhalo wemfihlo kwithebhulethi ngazo zonke izikhathi lapho uyivula"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Dinga i-PIN yenombolo noma iphasiwedi ukungabhali ngemfihlo ifoni yakho njalo lapho uyivula"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Betheliwe"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Ungabethela ama-akhawunti wakho, izilungiselelo, ulande izinhlelo zokusebenza nedatha yazo, imidiya, namanye amafayela. Uma usubethele ikhompyutha yakho, udinga ukuthayipha i-PIN yenombolo noma iphasiwedi ukususa ukubhala ngekhodi ngaso isikathi ukhanyisa: awukwazi ukususa ukubhala ngakhodi ikhompyutha yakho ngaphandle kokwenza kabusha idatha yakho yenkampani, sula yonke idatha yakho."\n\n"Ukubhala ngekhodi kuthatha ihora noma ngaphezulu. Kufanele uqale ngebhtri elishajiwe futhi ugcine ikhompyutha yakho iplakiwe kuze kuphele ukubethela. Uma uphazamisa inqubo yokubethela, uzolahlekelwa enye noma yonke idatha yakho."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Ungabhala ngakhodi ama-akhawunti wakho, izilungiselelo, ulande ama-apps nedatha yawo, imidiya namanye amafayela. Uma usubhale ngekhodi ucingo lakho, udinga ukuthayipha i-PIN yezinombolo noma iphasiwedi ukususa ukubhala ngakhodi ngaso sonke isikhathi uma uyikhanyisa: awukwazi ukususa ukubhala ngekhodi ucingo lakho ngaphandle kokwenza ukusetha kabusha idatha yenkampani, ususe yonke idatha yakho."\n\n"Ukubhala ngekhodi kuthatha ihora noma ngaphezulu. Kufanele uqale ngebhitri elishajiwe futhi ugcine ucingo lakho luplakiwe kuze ukubhala ngekhodi kuqedele. Uma uphazamisa inqubo yokubhala ngekhodi, uzolahlekelwa enye noma yonke idatha yakho."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Ungabethela ama-akhawunti wakho, izilungiselelo, ulande izinhlelo zokusebenza nedatha yazo, imidiya, namanye amafayela. Uma usubethele ikhompyutha yakho, udinga ukuthayipha i-PIN yenombolo noma iphasiwedi ukususa ukubhala ngekhodi ngaso isikathi ukhanyisa: awukwazi ukususa ukubhala ngakhodi ikhompyutha yakho ngaphandle kokwenza kabusha idatha yakho yenkampani, sula yonke idatha yakho.\n\nUkubhala ngekhodi kuthatha ihora noma ngaphezulu. Kufanele uqale ngebhtri elishajiwe futhi ugcine ikhompyutha yakho iplakiwe kuze kuphele ukubethela. Uma uphazamisa inqubo yokubethela, uzolahlekelwa enye noma yonke idatha yakho."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Ungabhala ngakhodi ama-akhawunti wakho, izilungiselelo, ulande ama-apps nedatha yawo, imidiya namanye amafayela. Uma usubhale ngekhodi ucingo lakho, udinga ukuthayipha i-PIN yezinombolo noma iphasiwedi ukususa ukubhala ngakhodi ngaso sonke isikhathi uma uyikhanyisa: awukwazi ukususa ukubhala ngekhodi ucingo lakho ngaphandle kokwenza ukusetha kabusha idatha yenkampani, ususe yonke idatha yakho.\n\nUkubhala ngekhodi kuthatha ihora noma ngaphezulu. Kufanele uqale ngebhitri elishajiwe futhi ugcine ucingo lakho luplakiwe kuze ukubhala ngekhodi kuqedele. Uma uphazamisa inqubo yokubhala ngekhodi, uzolahlekelwa enye noma yonke idatha yakho."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Bethela ithebhulethi"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Bethela ifoni"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Sicela ushaje ibhetri yakho bese uzama futhi."</string>
@@ -325,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Zama futhi emasekhondini angu-<xliff:g id="DELAY">^1</xliff:g>."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Thayipha iphasiwedi yakho"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Ubhala ngokufihlekileyo akuphumelelanga"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Ukubethela kuphazamisekile futhi ngeke kusaphela. Ngenxa yalokho, akusafinyeleleki kwidatha ekuthebhulethi yakho. "\n\n"Ukuze uphinde usebenzise ithebhulethi yakho, kufanele isethwe kabusha. Uma ususetha ithebhulethi yakho emuva kokuba isethwe kabusha, uzothola ithuba lokubuyisa nanoma iyiphi idatha eyayilondolozwe kwi-akhawunti yakho yakwa-Google.."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Ukubhelake bumfihlo kuphazamisekile futhi ngeke kusaphela. Ngenxa yalokho, akusafinyeleleki kwidatha esocingweni lwakho. "\n\n"Ukuze uphinde usebenzise ucingo lwakho, kufanele lusethwe kabusha endaweni yokukhanda. Uma ususetha ucingo lwakho emva kokuba lusethwe kabusha, uzothola ithuba lokubuyisa nanoma iyiphi idatha eyayilondolozwe kwi-akhawunti yakho yakwa-Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Ukubethela kuphazamisekile futhi ngeke kusaphela. Ngenxa yalokho, akusafinyeleleki kwidatha ekuthebhulethi yakho. \n\nUkuze uphinde usebenzise ithebhulethi yakho, kufanele isethwe kabusha. Uma ususetha ithebhulethi yakho emuva kokuba isethwe kabusha, uzothola ithuba lokubuyisa nanoma iyiphi idatha eyayilondolozwe kwi-akhawunti yakho yakwa-Google.."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Ukubhelake bumfihlo kuphazamisekile futhi ngeke kusaphela. Ngenxa yalokho, akusafinyeleleki kwidatha esocingweni lwakho. \n\nUkuze uphinde usebenzise ucingo lwakho, kufanele lusethwe kabusha endaweni yokukhanda. Uma ususetha ucingo lwakho emva kokuba lusethwe kabusha, uzothola ithuba lokubuyisa nanoma iyiphi idatha eyayilondolozwe kwi-akhawunti yakho yakwa-Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Shintsha indlela yokufaka"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Khetha isivali sesikrini"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Khetha ukukhiywa kokulondoloza"</string>
@@ -362,7 +376,7 @@
     <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Shintsha i-PIN yokuvula"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Shintsha iphasiwedi yokuvula"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"Iphasiwedi kumele okungenani ibe nezinhlamvu ezingu-%d"</string>
-    <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"I-PIN kumele okungenani ibe izinhlamvu ezingu-%d"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Iphinikhodi kumele okungenani ibe amadijithi angu-%d."</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"Thinta Qhubeka uma usuqedile"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Qhubeka"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"Iphasiwedi kumele ibe ngaphansi ngezinhlamvu ezingu-<xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -406,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>
@@ -431,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>
@@ -475,69 +498,103 @@
     <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="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>
+    <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Ukubonisa okubhanqiwe"</string>
+    <string name="wifi_display_available_devices" msgid="4558314642853513487">"Amadivayisi atholakalayo"</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Iyaxhuma"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Ixhunyiwe"</string>
+    <string name="wifi_display_status_available" msgid="1924167525172207067">"Kuyatholakala"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Kuyasebenza"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"Bonisa izilungiselelo"</string>
+    <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Nqamula?"</string>
+    <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Lokhu kuzophelisa uxhumano nge:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"Izinketho zokubonisa ezingenazintambo"</string>
+    <string name="wifi_display_options_forget" msgid="9119048225398894580">"Khohlwa"</string>
+    <string name="wifi_display_options_done" msgid="5703116500357822557">"Kwenziwe"</string>
+    <string name="wifi_display_options_name" msgid="4756080222307467898">"Igama"</string>
+    <string name="wifi_display_summary_on" msgid="3695429596604962531">"Vuliwe"</string>
+    <string name="wifi_display_summary_off" msgid="2445210133184740611">"Valiwe"</string>
+    <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="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\nHlanganisa 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="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="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="8116564886303972764">"Faka i-pin <xliff:g id="NUMBER">%1$s</xliff:g> ku-Wi-Fi router yakho. 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_in_progress" msgid="2944576520214787628">"I-WPS isivele iyaqhubeka futhi ingathatha kufika kumaminithi amabili ukuqedela"</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>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Izilungiselelo zokuphepha zendlela engenazintambo (TKIP) azisekelwe"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Ukwehluleka kokugunyazwa. Sicela uzame futhi."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Esinye isikhathi se-WPS sitholiwe. Sicela uzame futhi emaminithini ambalwa."</string>
     <string name="wifi_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>
@@ -561,9 +618,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\nVumela 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>
@@ -571,8 +631,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Londoloza"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Yehlulekile ukulondoloza inethiwekhi"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Khansela"</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_skip_anyway" msgid="6965361454438011190">"Yeqa noma kunjalo"</string>
+    <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\nUkusethwa kwethebulethi kungadinga umsebenzi wenethiwekhi omcane."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ISEXWAYISO: Ungahle uthole amashaji edatha enkampani yenethiwekhi angeziwe.\n\nUkusethwa kwefoni kungadinga umsebenzi wenethiwekhi omcane."</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>
@@ -588,13 +656,14 @@
     <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>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Iyasesha..."</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Qamba kabusha idivayisi"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Hlanganisa amadivayisi"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Amaqembu akhunjuliwe"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Ayikwazanga ukuxhuma."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Yehlulekile ukuqamba kabusha idivayisi."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Nqamula?"</string>
@@ -602,11 +671,14 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Uma unqamula, ukuxhumana kwakho ne-<xliff:g id="PEER_NAME">%1$s</xliff:g> kanye namanye amadivayisi angu-<xliff:g id="PEER_COUNT">%2$s</xliff:g> kuzophela."</string>
     <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_tether_checkbox_text" msgid="6961605862058056788">"Indawo ephathekayo ye-Wi-Fi"</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_p2p_delete_group_message" msgid="834559380069647086">"Khohlwa leli qembu?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Wi-Fi hotspot ephathekayo"</string>
+    <string name="wifi_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>
@@ -616,12 +688,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Imphumelo Yomculo"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ivolumu yesikhali"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Idlidliza uma ithulile"</string>
-    <string name="notification_sound_title" msgid="312032901303146002">"Isaziso esizenzakalelayo"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Umsindo wokwazisa ozenzakalelayo"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Ukukhanya kwesaziso sephalsi"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Iringithoni"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Isaziso"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Sebenzisa ivolumu yocingo olungenayo yezaziso"</string>
-    <string name="notification_sound_dialog_title" msgid="9052854168612951170">"Khetha iringithoni yesaziso"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Umsindo wokwazisa ozenzakalelayo"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Imidiya"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Hlela ivolumu yomculo namavidiyo"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alamu"</string>
@@ -631,7 +703,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>
@@ -641,7 +713,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>
@@ -651,7 +723,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>
@@ -671,15 +743,16 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"Emva <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> okungasebenzi"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Iphephadonga"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Khetha iphephalodonga kwi"</string>
-    <string name="screensaver_settings_title" msgid="3848608373818910549">"I-Screen Candy"</string>
-    <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Iyoqala emva kokulala uma ixhunywe kugesi"</string>
-    <string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Kukhutshaziwe"</string>
-    <string name="screensaver_component_title" msgid="8596216100441725363">"Khethe i-candy"</string>
-    <string name="screensaver_timeout_title" msgid="4882666970355550822">"Qlisa nini"</string>
-    <string name="screensaver_timeout_summary" msgid="7717201094598701673">"Emva <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> esithithwe kungenziwa lutho"</string>
-    <string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nhlobo"</string>
-    <string name="screensaver_test" msgid="3048249263811694128">"Yizame!"</string>
-    <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Iqale futhi uma iboshiwe"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Ukuphupha emini"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Uma kudokhiwe noma kulelwe futhi ishaja"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Noma"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Ngenkathi ishaja"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Ngenkathi idokhiwe"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Valiwe"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Ukuze ulawule ukuthi kwenzakale ini uma ifoni idokhiwe kanye/noma ilele, vula i-Daydream."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Phupha nini emini"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Qala manje"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Izilungiselelo"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ukukhanya okuzenzakalelayo"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Usayizi wefonti"</string>
     <string name="dialog_title_font_size" msgid="2231507851258955038">"Ubukhulu befonti"</string>
@@ -701,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"I-SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"I-PIN Engalungile!"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Ama-PIN awafani"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Ayikwazi ukushintsha i-PIN."\n"Mhlawumbe i-PIN engalungile"</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Ayikwazi ukushintsha i-PIN.\nMhlawumbe i-PIN engalungile"</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"I-PIN ye-SIM ishintshwe ngempumelelo"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Ayikwazi ukushintsha isimo sokuvala ikhadi le-SIM."\n"Kungenzeka i-PIN engalungile."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Ayikwazi ukushintsha isimo sokuvala ikhadi le-SIM.\nKungenzeka i-PIN engalungile."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"KULUNGILE"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Khansela"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Isimo sethebhulethi"</string>
@@ -716,29 +789,31 @@
     <string name="baseband_version" msgid="1848990160763524801">"Inguqulo ye-Baseband"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Inguqulo ye-Kernel"</string>
     <string name="build_number" msgid="3075795840572241758">"Inombolo yesakhi"</string>
+    <string name="selinux_status" msgid="6212165375172061672">"Isimo se-SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Akutholakali"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Isimo"</string>
     <string name="device_status" msgid="607405385799807324">"Isimo"</string>
     <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>
     <string name="status_meid_number" msgid="1751442889111731088">"I-MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Uhlobo lwenethiwekhi yeselula"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Ulwazi lwenkampani yenethiwekhi"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Isimo senethiwekhi yeselula"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Isimo seseva"</string>
     <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>
@@ -748,14 +823,16 @@
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Isitoreji se-USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Ikhadi le-SD"</string>
     <string name="memory_available" msgid="5052397223077021181">"Tholakalayo"</string>
+    <string name="memory_available_read_only" msgid="6497534390167920206">"Kuyatholakala (ukufunda-kuphela)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Inani lesikhala"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Iyabala..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Izinhlelo zokusebenza (idatha yohlelo lokusebenza &amp; okuqukethwe kwabezindaba)"</string>
     <string name="memory_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>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Idatha yenqolobane"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Yehlisa isitoreji sokwabelene"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Khipha ikhadi le-SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Yehlisa isitoreji se-USB sangaphakathi"</string>
@@ -770,7 +847,9 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Sula ikhadi le-SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Sula yonke idatha ekugcineni nge-USB kwangaphakathi, njengomculo nezithombe"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Isula yonke idatha ekhadini le-SD, njengomculo nezithombe"</string>
-    <string name="read_only" msgid="6702420168629076340">" (Funda kuphela)"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Sula idatha yenqolobane?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Lokhu kuzosula idatha yenqolobane kuzo zonke izinhlelo zokusebenza."</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Umsebenzi we-MTP noma we-PTP uyasebenza"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Yehlisa indawo yokugcina ye-USB?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Yehlisa ikhadi le-SD"</string>
     <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Uma wehlisa isitoreji se-USB, ezinye izinhlelo zokusebenza ozisebenzisayo zizoma futhi zingase zingatholakali kuze kube yilapho ukhwelisa futhi isitoreji se-USB."</string>
@@ -793,6 +872,7 @@
     <string name="usb_ptp_title" msgid="3852760810622389620">"Ikhamera (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Ikuvumela ukuba udlulise izithombe usebenzisa isofthiwe yekhamera, futhi udlulise nanoma yimaphi amafayela kumakhompyutha angasekeli i-MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Faka amathuluzi okudlulisa ifayela"</string>
+    <string name="storage_other_users" msgid="808708845102611856">"Abanye abasebenzisi"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Umumo webhetri"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Izinga lebhetri"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
@@ -823,6 +903,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>
@@ -838,9 +920,9 @@
     <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_accounts" product="default" msgid="6412857499147999073">\n"Okwamanje ungene ngemvume kuma-akhawunti alandelayo:"\n\n</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>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Ukusula umculo, izithombe, nenye imininingo yomsebenzisi, "<b>"ikhadi le-SD"</b>"kumele lisuswe."</string>
@@ -850,7 +932,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>
@@ -873,10 +955,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>
@@ -898,11 +980,16 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngeke kusebenziswe ifoni njengemodemu"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Usizo"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Amanethiwekhi eselula"</string>
+    <string name="manage_mobile_plan_title" msgid="7588182101738043593">"Phatha uhlelo lweselula"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"I-Opharetha ye-SIM engaziwa"</string>
+    <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s ayinayo iwebhusayithi eyilungiselelo eyaziwayo"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sicela ufake ikhadi le-SIM bese uqala kabusha"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Sicela uxhume ku-inthanethi"</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>
@@ -918,6 +1005,7 @@
     <string name="about_settings_summary" msgid="3371517697156165959">"Buka ulwazi lomthetho, umumo wefoni, inguqulo yesofthiwe"</string>
     <string name="legal_information" msgid="5769301644270604095">"Uwazi olusemthethweni"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Abanikeli"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Ulwazi lokuhlola"</string>
     <string name="copyright_title" msgid="865906688917260647">"I-copyright"</string>
     <string name="license_title" msgid="1990487604356037871">"Ilayisensi"</string>
     <string name="terms_title" msgid="7697580845616764642">"Imigomo nemibandela"</string>
@@ -945,7 +1033,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Shintsha ukuvula i-PIN"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Qinisekisa iphathini egciniwe"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Zama futhi:"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Dweba iphathini yokuvula"</string>
+    <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Dweba iphethini yokuvula"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Chofoza Imenyu ukuthola usizo."</string>
     <string name="lockpattern_recording_inprogress" msgid="4622772178078818425">"Dedela umunwe uma usuqedile."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3103250430366718996">"Xhuma okungenani <xliff:g id="NUMBER">%d</xliff:g> amachashazi. Zama futhi:"</string>
@@ -966,13 +1054,8 @@
     <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="skip_button_label" msgid="8680422740354436943">"Khansela"</string>
-    <string name="next_button_label" msgid="8890792540116568321">"Okulandelayo"</string>
-    <string name="lock_title" product="tablet" msgid="2909697418179419990">"Ivikela ithebhulethi yakho"</string>
-    <string name="lock_title" product="default" msgid="4059246467204273930">"Ukuphepha kwefoni yakho"</string>
-    <string name="lock_intro_message" product="tablet" msgid="8616353869251700776">"Vikela ithebhulethi yakho ekusetshenzisweni okungavumelekile ngokwenza iphathini yokuvula isikrini. Sebenzisa umunwe wakho ukuxhuma amachashazi nganoma yikuphi ukuhleleka kwsikrini esilandelayo. Kumele uxhume okungenani amachashazi amane. "\n\n"Ukulungele ukuqalisa? Thinta \"Okulandelayo\"."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Vikela ifoni yakho ekusetshenzisweni okungemthotho ngokwakha iphethini yakho siqu yokuvula isikrini. Sebenzisa umunwe wakho ukuxhuma okungenani amadothi amane kusikrini sombhalo. "\n\n"Usukulungele ukuqala? Thinta Okulandelayo."</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>
     <string name="applications_settings" msgid="1721442176406964682">"Izinhlelo zokusebenza"</string>
@@ -982,6 +1065,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Vumela ukufaka kwezinhlelo zokusebenza kusuka emithonjeni engaziwa"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"I-tablet kanye nemininingo yakho kusengozini yokuthi kuhlaselwe yizinhlelo zokusebenza ezivela kwimithombo eengaziwa. Uyavuma ukuthi uwena wedwa onesibophezelo sanoma yikuphi ukulimala kwe-tablet yakho noma ukulahleka kwemininingo okungabangelwa ukusetshenziswa kwalezi zinhlelo."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Iselula yakho kanye nemininingo yakho uqobo kusengozini yokuhlaselwa yizinhlelo zokusebenza ezivela kwimithombo engaziwa. Uyavuma ukuthi nguwe wedwa onesibophezelo sanoma yikuphi okulimele noma ukulahleka kwemininingo okungab umphumela wokusebenzisa lezi zinhlelo zokusebenza."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Qinisekisa izinhlelo zokusebenza"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"Ungavumeli noma xwayisa ngaphambi kokufakwa kezinhlelo zokusebenza ezingabangela ubungozi"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Izilungiselelo ezithuthukisiwe"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Nima amandla izinketho eziphezulu zezilungiselelo"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Ulwazi lohlelo lokusebenza"</string>
@@ -1002,6 +1087,8 @@
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Idatha yesitoreji se-USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Ikhadi le-SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Khipha"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"Kupha kubo bonke abasebenzisi"</string>
+    <string name="install_text" msgid="884360662922471113">"Faka"</string>
     <string name="disable_text" msgid="6544054052049395202">"Valiwe"</string>
     <string name="enable_text" msgid="9217362512327828987">"Vumela"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Sula idatha"</string>
@@ -1020,17 +1107,19 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Bonisa izinqubo zokulondoloza kwesikhashana"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Setha kabusha izintandokazi zezinhlelo zokusebenza"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Setha kabusha izintandokazi zohlelo lokusebenza?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Lokhu kuzosetha kabusha zonke izintandokazi ze:"\n\n" "<li>"Izinhlelo zokusebenza ezikhutshaziwe"</li>\n" "<li>"Izaziso zezinhlelo zokusebenza ezikhutshaziwe"</li>\n" "<li>"Izinhlelo zokusebenza zokuzenzakalelayo zezenzo"</li>\n" "<li>"Idatha yangokwasemuva yezinhlelo zokusebenza"</li>\n\n" Ngeke ulahlekelwe idatha yohlelo lokusebenza."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Lokhu kuzosetha kabusha zonke izintandokazi ze:\n\n "<li>"Izinhlelo zokusebenza ezikhutshaziwe"</li>\n" "<li>"Izaziso zezinhlelo zokusebenza ezikhutshaziwe"</li>\n" "<li>"Izinhlelo zokusebenza zokuzenzakalelayo zezenzo"</li>\n" "<li>"Idatha yangokwasemuva yezinhlelo zokusebenza"</li>\n\n" Ngeke ulahlekelwe idatha yohlelo lokusebenza."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Setha kabusha izinhlelo zokusebenza"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Lawula isikhala"</string>
     <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>
+    <string name="not_installed" msgid="1475144352069281880">"Akufakiwe"</string>
     <string name="no_applications" msgid="7336588977497084921">"Azikho izinhlelo zokusebenza"</string>
     <string name="internal_storage" msgid="1584700623164275282">"Isitoreji sangaphakathi"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Isitoreji se-USB"</string>
@@ -1061,6 +1150,8 @@
     <skip />
     <!-- no translation found for join_many_items_middle (7556692394478220814) -->
     <skip />
+    <string name="security_settings_billing_desc" msgid="8061019011821282358">"Lolu hlelo lokusebenza lungakukhokhisa:"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Ukuthumela i-SMS ye-premium?"</string>
     <string name="computing_size" msgid="1599186977475211186">"Iyakhompyutha..."</string>
     <string name="invalid_size_value" msgid="7563537715280712285">"Ayikwazanga ukubala usayizi wephakeji."</string>
     <string name="empty_list_msg" msgid="5993162337235907160">"Awunazo izinhlelo zokusebenza zelingu langaphandle ezifakiwe."</string>
@@ -1084,8 +1175,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Shintsha indawo yokufaka efiswayo yezinhlelo zokusebenza ezintsha"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Khubeza uhlelo lokusebenza olakhelwe"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Uma uyekisa ukusebenza uhlelo lokusebenza olufakwe ngaphakathi, ezinye izinhlelo zokusebenza kungenzeka ukuthi zingenzi kahle."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Susa idatha futhi ukhubaze uhlelo lokusebenza?"</string>
+    <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>
@@ -1097,11 +1193,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_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_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> 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>
@@ -1121,8 +1219,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>
@@ -1135,7 +1233,6 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Izilungiselelo zokwakheka kwangampela kwekhibhodi"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Chofoza ukhiye Wesikhala kabili  ukufaka \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Yenza ukuthi amaphasiwedi abonakale"</string>
-    <string name="show_password_summary" msgid="7345931695292850058"></string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Indlela yokufakwayo ingase ikwazi ukuqoqa wonke umbhalo owuthayiphayo, kuhlanganise idatha yomuntu siqu njengamaphasiwedi nezinombolo zekhadi lesikoloto. Iphuma kuhlelo lokusebenza <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Sebenzisa indlela yokufaka?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Lokhu okuhlola ukupela kungenzeka ukuthi kuthole yonke imibhalo oyibhalayo, okuhlanganisa imininingo yakho efana naphasiwedi kanye nezinombolo ze-credit card. Kuqhamuka kuhlelo lokusebenza <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Ngabe kungasetshenziswa okuhlola ukupela?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Izilungiselelo"</string>
@@ -1151,9 +1248,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Ukuze ushintshe, cindezela u-Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Okuzenzakalelayo"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Izendlalelo zekhibhodi"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Sebenzisa isichazamazwi"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Isichazamazwi sakho"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Izichazamazwi eziqondene nawe"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Isichazamazwi somuntu siqu"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Engeza"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Faka kwisichazamazwi"</string>
@@ -1164,6 +1259,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>
@@ -1204,24 +1301,38 @@
     <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>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Isikrini asisoze salala ngenkathi sishaja"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Nika amandla i-Bluetooth HCI yelogu lokuhlola"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Shutha wonke amaphakethe we-bluetooth HCI kufayela"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Khetha isikhathi sokusebenza"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Khetha isikhathi sokusebenza"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Qalisa kabusha ukuze ushintshe isikhathi sokusebenza kusukela ku-<xliff:g id="OLD">%1$s</xliff:g> ngu-<xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Vumela izindawo mbumbulu"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Vumela izindawo mbumbulu"</string>
     <string name="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>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Hlola izinhlelo zokusebenza ezifakiwe nge-ADB/ADT ngokuziphatha okuyingozi."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Vikela isilondolozi se-USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Izinhlelo zokusebenza kufanele zicele imvume yokufunda isilondolozi se-USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vikela isilondolozi se-USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Uma isilondolozi se-USB sivikelekile, izinhlelo zokusebenza kufanele zicele imvume yokufunda idatha kusuka kwisilondolozi sangaphandle."\n\n"Ezinye izinhlelo zokusebenza zingahle zingasebenzi zize zibuyekezwe onjiniyela bazo."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Uma isilondolozi se-USB sivikelekile, izinhlelo zokusebenza kufanele zicele imvume yokufunda idatha kusuka kwisilondolozi sangaphandle.\n\nEzinye izinhlelo zokusebenza zingahle zingasebenzi zize zibuyekezwe onjiniyela bazo."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Vikela ikhadi le-SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Izinhlelo zokusebenza kufanele zicele imvume yokufunda ikhadi le-SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vikela ikhadi le-SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Uma ikhadi le-SD livikelekile, izinhlelo zokusebenza kufanele zicele imvume yokufunda idatha ngesilondolozi sangaphandle."\n\n"Ezinye izinhlelo zokusebenza zingahle zingasebenzi zize zibuyekezwe onjiniyela bazo."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Uma ikhadi le-SD livikelekile, izinhlelo zokusebenza kufanele zicele imvume yokufunda idatha ngesilondolozi sangaphandle.\n\nEzinye izinhlelo zokusebenza zingahle zingasebenzi zize zibuyekezwe onjiniyela bazo."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Itheminali yasendaweni"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Nika amandla uhlelo lokusebenza letheminali olunikeza ukufinyelela kwasendaweni kwe-shell"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Khetha igajethi"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Khetha iwijethi"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Yenza iwijethi bese uvumela ukufinyeleleka?"</string>
@@ -1241,29 +1352,43 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Izilungiselelo zokufinyelela"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Amasevisi"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Isistimu"</string>
-    <string name="accessibility_toggle_large_text_title" msgid="6618674985313017711">"Umbalo omkhulu"</string>
-    <string name="accessibility_power_button_ends_call_title" msgid="5468375366375940894">"Inkinobho yamandla imisa ikholi"</string>
-    <string name="accessibility_speak_password_title" msgid="3344423945644925355">"Memeza iphasiwedi"</string>
-    <string name="accessibility_long_press_timeout_title" msgid="2373216941395035306">"Ukulibaziseka uma uthinta, ubamba"</string>
-    <string name="accessibility_script_injection_title" msgid="7921388904564822855">"Engeza ukufinyelela kwewebhu"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Ukuthinta kokukhulisa"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Uma lesi sici sivuliwe, ungasondeza futhi unciphise ngokucindezela kathathu isikrini.\n\nNgenkathi kusondeziwe, ungahle:\n"<ul><li>"Uyise emaceleni: Hudula iminwe emibili noma eminingi esikrinini."</li>\n<li>"Lungisa ileveli zokusondeza: Cindezela iminwe emibili noma eminingi noma uyihlukanise."</li></ul>\n\n"Futhi ungahle ukhulise okwesikhashana okungaphandi komunwe wakho ngokucindezela kathathu futhi ubambe. Kuleli zinga lokukhulisa, ngahudula umunwe wakho ukuze uhlole izingxenye ezahlukahlukene zesikrini. Phakamisa umunwe wakho ukuze ubuyele esimeni sangaphambilini.\n\nQaphela: Ukucindezela kathathu kusebenza noma ikuphi ngaphandle kwekhibhodi nebha lokuzula."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Isinqamuleli sokufinyelela"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Vuliwe"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Valiwe"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Uma lesi sici sivuliwe, unganika amandla ngokushesha izici zokufinyelela ngezinyathelo ezimbili:\n\nIsinyathelo 1: Cindezela futhi ubambe inkinobho vula/cisha uze uzwe umsindo noma uzwe ukudlidliza.\n\nIsinyathelo 2: Cindezela futhi ubambe ngeminwe emibili uze uzwe ukuqinisekisa komsindo.\n\nUma idivayisi inabasebenzisi abaningi, ukusebenzisa isinqamuleli esikrinini sokukhiya kunika amandla okwesikhashana ukufinyelela kuze kuvuleke idivayisi."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Umbhalo omkhulu"</string>
+    <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 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_menu_item_settings" msgid="3344942964710773365">"Izilungiselelo"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Vuliwe"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Valiwe"</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="accessibility_feature_state_on" msgid="2864292320042673806">"Vuliwe"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Kucishile"</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="print_settings" msgid="4742428530112487843">"Ukuphrinta"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Izilungiselelo zokuphrinta"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Amasevisi"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Sebenzisa i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"I-<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> ingathola amadokhumenti owaphrintayo. Amadokhumenti anjalo angaqukatha idatha ebucayi."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Awekho amasevisi afakiwe"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Izilungiselelo"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Engeza amaphrinta"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Vuliwe"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Valiwe"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Ibhetri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Yini ekade isebenzisa ibhetri"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Idatha esebenzisa ibhethri ayitholakali."</string>
@@ -1275,14 +1400,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>
@@ -1290,7 +1415,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>
@@ -1300,11 +1425,13 @@
     <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>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Idatha etholiwe"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Idatha yeselula ethunyelwe"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Idatha yeselula etholakele"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Idatha ye-Wi‑Fi ethunyelwe"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Idatha ye-Wi‑Fi etholakele"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Umsindo"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Ividiyo"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Isikhathi sivuliwe"</string>
@@ -1313,17 +1440,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>
@@ -1331,6 +1458,7 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Misa noma khipha uhlelo"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Lawula ngesandla i-GPS ukugwema uhlelo lokusebenza ukuyisebenzisa"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Uhlelo lokusebenza lunganikeza izilungiselelo ukwehlisa ukusebenzisa ibhetri"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Ibhethri elisetshenziswe umsebenzisi"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> kusukelwa kungaxhunyiwe"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Ngenkathi igcinwe ukunqamulwa kwe <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Inani lokusetshenziswa"</string>
@@ -1345,7 +1473,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>
@@ -1357,6 +1485,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ukuphakama"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Ithinta ithoni yombhalo okhulunyiwe"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Ulimi"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Ulimi alukhethwanga"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ihlela izwi lolimi oluthize lombhalo okhulunyiwe"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Lalela isibonelo"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Dlala umboniso omfushane wamazwi"</string>
@@ -1368,6 +1497,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>
@@ -1385,8 +1515,22 @@
     <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="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>
+    <string name="gadget_brightness_template" msgid="930541920933123603">"Ukukhanya <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"ngokuzenzakalela"</string>
+    <string name="gadget_brightness_state_full" msgid="6814570109772137631">"kugcwele"</string>
+    <string name="gadget_brightness_state_half" msgid="3696671957608774204">"uhafu"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"valiwe"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"I-VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">" Isitoreji sokuqinisekisa"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Faka kusukela kusitoreji se-USB"</string>
@@ -1397,6 +1541,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>
@@ -1413,19 +1560,16 @@
     <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>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Uma ufaka futhi uhlelo lokusebenza, buyisela okuhlelwe ukusebenza kwezipele kanye nemininingo"</string>
-    <string name="bugreport_title" msgid="1009498799922543551">"Thatha umbiko wesiphazamiso"</string>
-    <string name="bugreport_message" msgid="1182209569732110590">"Lokhu kuzoqoqa ulwazi mayelana nesimo manje sedivayisi yakho, ukuthumela imilayezo ye-imeyili. Kuzothatha isikhathi esincane kusuka ekuqaleni umbiko wesiphazamiso uze ulungele ukuthunyelwa; sicela ubekezele."</string>
-    <string name="report" msgid="302437572240018342">"Bika"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Iphasiwedi yokusekela ngokulondoloza ye-Desktop"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Ukusekela ngokulondoloza okugcwele kwe-Desktop akuvikelekile okwamanje."</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Khetha ukushintsha noma ukususa iphasiwedi yokwenziwa kwezipele ngokugcwele kwideskithophu"</string>
@@ -1433,7 +1577,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>
@@ -1449,10 +1593,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>
@@ -1474,9 +1618,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\nThinta"<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>
@@ -1544,6 +1688,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>
@@ -1555,36 +1700,40 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Khanyisa ukubonakala kwalo lonke iwindi uma libuyekezwa"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Buka izibuyekezo ze-GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Ukubuka okukhanyayo phakathi kwamawindi uma kudwetshwe nge-GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Bonisa izibuyekezo zezendlalelo izingxenyekazi zekhompyutha"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Izendlalelo zengxenyekazi zekhompyutha eziluhlaza uma zibuyekeza"</string>
+    <string name="debug_hw_overdraw" msgid="2968692419951565417">"Susa iphutha lokukhipha okungaphezulu kwe-GPU"</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>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Bonisa ukusebenzisa i-CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Imbondela yesikrini ibonisa ukusetshenziswa kwe-CPU okwamanje"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Phoqa ukunikeza i-GPU"</string>
     <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>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Hlalisa kahle ukubukwa kwesibili"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Izinhlelo zokusebenza"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Ungagcini imisibenzi"</string>
     <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Phihliza zonke izenzo ngokushesha ngemva kokuna umsebenzisi awuyeka"</string>
     <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>
@@ -1598,8 +1747,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>
@@ -1614,11 +1763,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Khubaza idatha yokwangasemuva kumanethiwekhi eselula. Amanethiwekhi okungewona eselula azosetshenziswa uma etholakala."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Ukuze ubeke umkhawulo wezisetshenziswa zangemuva zalesi sisetshenziswa, qala ulungise umkhawulo wemininingo yeselula."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Beka isivimbelo kwimininingo yemininingo egciniwe?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Lesi sici singahle sibangele uhlelo lokusebenza olukhosele kudatha yokwangasemuva ukungasasebenzi uma amanethiwekhi kuphela eselula atholakala."\n\n"Ungathola ukulawula kokusetshenziswa kwedatha okufanele kuzilungiselelo ezitholakalayo ngaphakathi kohlelo lokusebenza."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Lesi sici singahle sibangele uhlelo lokusebenza olukhosele kudatha yokwangasemuva ukungasasebenzi uma amanethiwekhi kuphela eselula atholakala.\n\nUngathola ukulawula kokusetshenziswa kwedatha okufanele kuzilungiselelo ezitholakalayo ngaphakathi kohlelo lokusebenza."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Imininingo yangemuva engavumelekile itholakala kuphela uma ubeke umkhawulo wemininingo yeselula."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Khanyisa ukuvumelanisa idatha ngokuzenzakalelayo?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Noma iziphi izinguquko ozenzayo kuma-akhawunti wakho kuwebhu zizokopishelwa ngokuzenzakalela efonini yakho."\n\n"Amanye ama-akhawunti angakopisha ngokuzenzakalela noma iziphi izinguquko ozenzayo kuthebulethi kuya kuwebhu. I-akhawunti yakwa-Google isebenza ngale ndlela."\n\n"Ukuze ukhethe ukuthi uluphi uhlobo lolwazi ongaluvumelanisa ngaphakathi kwe-akhawunti ngayinye, iya kuzilungiselelo &gt; ama-akhawunti."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Noma iziphi izinguquko ozenzayo kuma-akhawunti wakho kuwebhu zizokopishelwa ngokuzenzakalela efonini yakho."\n\n"Amanye ama-akhawunti angakopisha ngokuzenzakalela noma iziphi izinguquko ozenzayo efonini kuya kuwebhu. I-akhawunti yakwa-Google isebenza ngale ndlela."\n\n"Ukuze ukhethe ukuthi uluphi uhlobo lolwazi ongaluvumelanisa ngaphakathi kwe-akhawunti ngayinye, iya kuzilungiselelo &gt; ama-akhawunti."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Noma iziphi izinguquko ozenzayo kuma-akhawunti wakho kuwebhu zizokopishelwa ngokuzenzakalela efonini yakho.\n\nAmanye ama-akhawunti angakopisha ngokuzenzakalela noma iziphi izinguquko ozenzayo kuthebulethi kuya kuwebhu. I-akhawunti yakwa-Google isebenza ngale ndlela.\n\nUkuze ukhethe ukuthi uluphi uhlobo lolwazi ongaluvumelanisa ngaphakathi kwe-akhawunti ngayinye, iya kuzilungiselelo &gt; ama-akhawunti."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Noma iziphi izinguquko ozenzayo kuma-akhawunti wakho kuwebhu zizokopishelwa ngokuzenzakalela efonini yakho.\n\nAmanye ama-akhawunti angakopisha ngokuzenzakalela noma iziphi izinguquko ozenzayo efonini kuya kuwebhu. I-akhawunti yakwa-Google isebenza ngale ndlela.\n\nUkuze ukhethe ukuthi uluphi uhlobo lolwazi ongaluvumelanisa ngaphakathi kwe-akhawunti ngayinye, iya kuzilungiselelo &gt; ama-akhawunti."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Cima ukuvumelanisa idatha ngokuzenzakalela?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Lokhu kuzokonga ukusetshenziswa kwedatha nebhethri, kepha uzodinga ukuvumelanisa i-akhawunti ngayinye ngokwenza ukuze uqoqe ulwazi lakamuva. Futhi ngeke uthole izaziso uma izibuyekezo zivela."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Usuku lokuhlela kabusha umjikelezo wokusebenza"</string>
@@ -1627,22 +1776,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Setha isexwayiso sokusebenziseka kwedatha"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Setha umkhawulo wokusetshenziswa kwedatha"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ilinganisela ukusebenza kwedatha"</string>
-    <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_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Uxhumo lwedatha yakho yeselula luzokhubazwa uma uma umkhawulo ocacisiwe usufinyelelwe.\n\nNjengoba 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\nNjengoba 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" 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\nLesi 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\nLesi 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>
+    <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Izinhelo zokusebenza nabasebenzisi abasusiwe"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> itholiwe, <xliff:g id="SENT">%2$s</xliff:g> ithunyelwe"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: cishe kusetshenziswe okungu-<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>: 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>
@@ -1674,6 +1826,10 @@
     <string name="vpn_create" msgid="5628219087569761496">"Engeza iphrofayela ye-VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Hlela iphrofayela"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Susa iphrofayela"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"I-VPN ehlala ikhanya"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Khetha iphrofayela ye-VPN ukuhlala uxhumekile. I-traffic yenethiwekhi izovunyelwa kuphela uma ixhunyiwe kule-VPN."</string>
+    <string name="vpn_lockdown_none" msgid="9214462857336483711">"Akunalutho"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"I-VPN ehlala ikhanya idinga ikheli le-IP kwisiphakeli ne-DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Alukho uxhumo lenethiwekhi. Sicela uzame futhi emva kwesikhathi."</string>
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Isitifiketi silahlekile. Sicela uhlelo iphrofayela."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Isistimu"</string>
@@ -1692,24 +1848,86 @@
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Khansela"</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">"Ukubuyekeza kwesistimu okwengeziwe"</string>
-    <string name="user_settings_title" msgid="5189224330534906766">"Umthetho &amp; wokuthibela wabasebenzisi"</string>
-    <string name="user_list_title" msgid="2152311434413878709">"Abasebenzisi"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Engeza umsebenzisi"</string>
-    <string name="user_details_title" msgid="3037625632127241370">"Hlela imininingwane"</string>
-    <string name="user_information_heading" msgid="8728151075759863162">"Ulwazo lomsebenzisi"</string>
-    <string name="user_name_title" msgid="7563724675699398319">"Igama"</string>
-    <string name="user_restrictions_heading" msgid="4426403050397418553">"Imikhakhawulo yokuqukethwe"</string>
-    <string name="user_market_requires_pin" msgid="3260702297207279414">"Idinga iphinikhodi"</string>
-    <string name="user_max_content_rating" msgid="8297759970216482772">"Isilinganiselwa sokuqukethwe"</string>
-    <string name="user_system_apps_heading" msgid="2408331798732183682">"Uhlelo lokusebenza lwesistimu"</string>
-    <string name="user_market_apps_heading" msgid="4657387297168308251">"Izinhlelo zokusebenza ezifakiwe"</string>
-    <string name="user_discard_user_menu" msgid="6638388031088461242">"Lahla"</string>
-    <string name="user_remove_user_menu" msgid="3210146886949340574">"Susa umsebenzisi"</string>
-    <string name="user_new_user_name" msgid="7603010274765911161">"Ingane ye-Pesky"</string>
+    <string name="selinux_status_disabled" msgid="924551035552323327">"Kukhutshaziwe"</string>
+    <string name="selinux_status_permissive" msgid="6004965534713398778">"Kunemvume"</string>
+    <string name="selinux_status_enforcing" msgid="2252703756208463329">"Ukuphoqelela"</string>
+    <string name="user_settings_title" msgid="6151874007858148344">"Abasebenzisi"</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="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\nNgemva kokudala umsebenzisi omusha, loyo muntu udinga ukwenza inqubo yokusetha.\n\nNoma 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\nNoma 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_confirm_remove_message" msgid="5284111415714437285">"Ingabe unesiqinisekiso sokuthi ufuna ukususa umsebenzisi nayo yonke idatha ephathelene kusuka kudivayisi?"</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>
+    <string name="global_font_change_title" msgid="1887126466191012035">"Shintsha usayizi wefonti"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Izinciphiso"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Susa izinciphiso"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Shintsha i-PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Bonisa izaziso"</string>
     <string name="help_label" msgid="1107174367904110532">"Usizo"</string>
+    <string name="user_account_title" msgid="1127193807312271167">"I-akhawunti yokuqukethwe"</string>
+    <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="6160672982086584261">"Misa imikhawulo yohlelo"</string>
+    <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Ilawulwa yi-<xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="app_not_supported_in_limited" msgid="913035259626149121">"Lolu hlelo lokusebenza alusekelwe kumaphrofayela akhawulelwe"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Lolu hlelo lokusebenza lingafinyelela kuma-akhawunti wakho"</string>
+    <string name="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 3367a57..a4de070 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 -->
@@ -202,6 +210,7 @@
         <item>Dies ist ein Beispiel für Sprachsynthese in Deutsch.</item>
         <item>Questo è un esempio di sintesi vocale in italiano.</item>
         <item>Este es un ejemplo de síntesis de voz en español.</item>
+        <item>이것은 한국어 음성 합성의 예입니다.</item>
     </string-array>
     <string-array name="tts_demo_string_langs" translatable="false">
         <item>eng</item>
@@ -209,6 +218,7 @@
         <item>deu</item>
         <item>ita</item>
         <item>spa</item>
+        <item>kor</item>
     </string-array>
 
 
@@ -298,12 +308,10 @@
 
    <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
    <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
-    <string-array name="wifi_ap_security" translatable="false">
-        <item>Open</item>
-        <!-- Do not translate. -->
-        <item>WPA PSK</item>
-        <!-- Do not translate. -->
-        <item>WPA2 PSK</item>
+    <string-array name="wifi_ap_security">
+        <item>@string/wifi_security_none</item>
+        <item>@string/wifi_security_wpa</item>
+        <item>@string/wifi_security_wpa2</item>
     </string-array>
 
     <!-- Match this with the constants in WifiDialog. --> <skip />
@@ -429,7 +437,14 @@
         <item>PWD</item>
     </string-array>
 
-    <!-- Phase 2 options -->
+    <!-- Phase 2 options for PEAP -->
+    <string-array name="wifi_peap_phase2_entries">
+        <item>None</item>
+        <item>MSCHAPV2</item>
+        <item>GTC</item>
+    </string-array>
+
+    <!-- Phase 2 options for rest of EAP methods -->
     <string-array name="wifi_phase2_entries">
         <item>None</item>
         <item>PAP</item>
@@ -534,7 +549,30 @@
         <item>0</item>
     </string-array>
 
-    <!-- Apps on SD instalaltion location options in ApplicationSettings -->
+    <!-- MVNO Info used in APN editor -->
+    <string-array name="mvno_type_entries">
+        <!-- Do not translate. -->
+        <item>None</item>
+        <!-- Do not translate. -->
+        <item>SPN</item>
+        <!-- Do not translate. -->
+        <item>IMSI</item>
+        <!-- Do not translate. -->
+        <item>GID</item>
+    </string-array>
+
+    <string-array translatable="false" name="mvno_type_values">
+        <!-- Do not translate. -->
+        <item></item>
+        <!-- Do not translate. -->
+        <item>spn</item>
+        <!-- Do not translate. -->
+        <item>imsi</item>
+        <!-- Do not translate. -->
+        <item>gid</item>
+    </string-array>
+
+    <!-- Apps on SD installation location options in ApplicationSettings -->
     <string-array name="app_install_location_entries">
         <item>Internal device storage</item>
         <item>Removable SD card</item>
@@ -548,11 +586,114 @@
         <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>Media</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>
+        <item>media buttons</item>
+        <item>audio focus</item>
+        <item>master volume</item>
+        <item>voice volume</item>
+        <item>ring volume</item>
+        <item>media volume</item>
+        <item>alarm volume</item>
+        <item>notification volume</item>
+        <item>bluetooth volume</item>
+        <item>keep awake</item>
+        <item>monitor location</item>
+        <item>monitor high power location</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>Read SMS/MMS</item>
+        <item>Write 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>Read SMS/MMS</item>
+        <item>Write 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>
+        <item>Media buttons</item>
+        <item>Audio focus</item>
+        <item>Master volume</item>
+        <item>Voice volume</item>
+        <item>Ring volume</item>
+        <item>Media volume</item>
+        <item>Alarm volume</item>
+        <item>Notification volume</item>
+        <item>Bluetooth volume</item>
+        <item>Keep awake</item>
+        <item>Location</item>
+        <item>Location</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>
@@ -565,6 +706,191 @@
         <item>1500</item>
     </string-array>
 
+    <!-- Titles for captioning typeface preference. [CHAR LIMIT=35] -->
+    <string-array name="captioning_typeface_selector_titles">
+        <item>Default</item>
+        <item>Sans-serif</item>
+        <item>Sans-serif condensed</item>
+        <item>Serif</item>
+        <item>Monospace</item>
+    </string-array>
+
+    <!-- Values for captioning typeface preference. -->
+    <string-array name="captioning_typeface_selector_values" translatable="false" >
+        <item></item>
+        <item>sans-serif</item>
+        <item>sans-serif-condensed</item>
+        <item>serif</item>
+        <item>monospace</item>
+    </string-array>
+
+    <!-- Titles for captioning font size preference. [CHAR LIMIT=35] -->
+    <string-array name="captioning_font_size_selector_titles">
+        <item>Very small</item>
+        <item>Small</item>
+        <item>Normal</item>
+        <item>Large</item>
+        <item>Very large</item>
+    </string-array>
+
+    <!-- Values for captioning font size preference. -->
+    <string-array name="captioning_font_size_selector_values" translatable="false" >
+        <item>0.25</item>
+        <item>0.5</item>
+        <item>1.0</item>
+        <item>1.5</item>
+        <item>2.0</item>
+    </string-array>
+
+    <!-- Titles for captioning character edge type preference. [CHAR LIMIT=35] -->
+    <string-array name="captioning_edge_type_selector_titles">
+        <item>None</item>
+        <item>Outline</item>
+        <item>Drop shadow</item>
+    </string-array>
+
+    <!-- Values for captioning character edge type preference. -->
+    <integer-array name="captioning_edge_type_selector_values" translatable="false" >
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </integer-array>
+
+    <!-- Titles for captioning color preference. -->
+    <string-array name="captioning_color_selector_titles" translatable="false" >
+        <item>@string/color_white</item>
+        <item>@string/color_black</item>
+        <item>@string/color_red</item>
+        <item>@string/color_yellow</item>
+        <item>@string/color_green</item>
+        <item>@string/color_cyan</item>
+        <item>@string/color_blue</item>
+        <item>@string/color_magenta</item>
+    </string-array>
+
+    <!-- Values for captioning color preference. -->
+    <integer-array name="captioning_color_selector_values" translatable="false" >
+        <item>0xFFFFFFFF</item>
+        <item>0xFF000000</item>
+        <item>0xFFFF0000</item>
+        <item>0xFFFFFF00</item>
+        <item>0xFF00FF00</item>
+        <item>0xFF00FFFF</item>
+        <item>0xFF0000FF</item>
+        <item>0xFFFF00FF</item>
+        <item>0xFF000055</item>
+        <item>0xFF0000AA</item>
+        <item>0xFF005500</item>
+        <item>0xFF005555</item>
+        <item>0xFF0055AA</item>
+        <item>0xFF0055FF</item>
+        <item>0xFF00AA00</item>
+        <item>0xFF00AA55</item>
+        <item>0xFF00AAAA</item>
+        <item>0xFF00AAFF</item>
+        <item>0xFF00FF55</item>
+        <item>0xFF00FFAA</item>
+        <item>0xFF550000</item>
+        <item>0xFF550055</item>
+        <item>0xFF5500AA</item>
+        <item>0xFF5500FF</item>
+        <item>0xFF555500</item>
+        <item>0xFF555555</item>
+        <item>0xFF5555AA</item>
+        <item>0xFF5555FF</item>
+        <item>0xFF55AA00</item>
+        <item>0xFF55AA55</item>
+        <item>0xFF55AAAA</item>
+        <item>0xFF55AAFF</item>
+        <item>0xFF55FF00</item>
+        <item>0xFF55FF55</item>
+        <item>0xFF55FFAA</item>
+        <item>0xFF55FFFF</item>
+        <item>0xFFAA0000</item>
+        <item>0xFFAA0055</item>
+        <item>0xFFAA00AA</item>
+        <item>0xFFAA00FF</item>
+        <item>0xFFAA5500</item>
+        <item>0xFFAA5555</item>
+        <item>0xFFAA55AA</item>
+        <item>0xFFAA55FF</item>
+        <item>0xFFAAAA00</item>
+        <item>0xFFAAAA55</item>
+        <item>0xFFAAAAAA</item>
+        <item>0xFFAAAAFF</item>
+        <item>0xFFAAFF00</item>
+        <item>0xFFAAFF55</item>
+        <item>0xFFAAFFAA</item>
+        <item>0xFFAAFFFF</item>
+        <item>0xFFFF0055</item>
+        <item>0xFFFF00AA</item>
+        <item>0xFFFF5500</item>
+        <item>0xFFFF5555</item>
+        <item>0xFFFF55AA</item>
+        <item>0xFFFF55FF</item>
+        <item>0xFFFFAA00</item>
+        <item>0xFFFFAA55</item>
+        <item>0xFFFFAAAA</item>
+        <item>0xFFFFAAFF</item>
+        <item>0xFFFFFF55</item>
+        <item>0xFFFFFFAA</item>
+    </integer-array>
+
+    <!-- Titles for captioning opacity preference. [CHAR LIMIT=35] -->
+    <string-array name="captioning_opacity_selector_titles" >
+        <item>25%</item>
+        <item>50%</item>
+        <item>75%</item>
+        <item>100%</item>
+    </string-array>
+
+    <!-- Values for captioning opacity preference. -->
+    <integer-array name="captioning_opacity_selector_values" translatable="false" >
+        <item>0x40FFFFFF</item>
+        <item>0x80FFFFFF</item>
+        <item>0xC0FFFFFF</item>
+        <item>0xFFFFFFFF</item>
+    </integer-array>
+
+    <!-- Titles for captioning text style preset preference. [CHAR LIMIT=35] -->
+    <string-array name="captioning_preset_selector_titles" >
+        <item>White on black</item>
+        <item>Black on white</item>
+        <item>Yellow on black</item>
+        <item>Yellow on blue</item>
+        <item>Custom</item>
+    </string-array>
+
+    <!-- Values for captioning text style preset preference. -->
+    <integer-array name="captioning_preset_selector_values" translatable="false" >
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>-1</item>
+    </integer-array>
+
+    <!-- Titles for runtime selection preference. [CHAR LIMIT=35] -->
+    <string-array name="select_runtime_titles">
+        <item>Dalvik</item>
+        <item>ART</item>
+        <item>ART (debug)</item>
+    </string-array>
+
+    <!-- Values for runtime selection preference. -->
+    <string-array name="select_runtime_values" translatable="false" >
+        <item>libdvm.so</item>
+        <item>libart.so</item>
+        <item>libartd.so</item>
+    </string-array>
+
+    <!-- Summaries for runtime selection preference. [CHAR LIMIT=100]-->
+    <string-array name="select_runtime_summaries" >
+        <item>Use Dalvik</item>
+        <item>Use ART</item>
+        <item>Use ART debug build</item>
+    </string-array>
+
     <!-- Titles for HDCP checking preference. [CHAR LIMIT=35] -->
     <string-array name="hdcp_checking_titles">
         <item>Never check</item>
@@ -652,6 +978,92 @@
         <item>10</item>
     </string-array>
 
+    <!-- Titles for overlay display devices preference. [CHAR LIMIT=35] -->
+    <string-array name="overlay_display_devices_entries">
+        <item>None</item>
+        <item>720x480 mdpi</item>
+        <item>720x480 mdpi (secure)</item>
+        <item>1280x720 tvdpi</item>
+        <item>1280x720 tvdpi (secure)</item>
+        <item>1920x1080 xhdpi</item>
+        <item>1920x1080 xhdpi (secure)</item>
+        <item>1280x720 tvdpi and 1920x1080 xhdpi</item>
+    </string-array>
+
+    <!-- Values for overlay display devices preference. -->
+    <string-array name="overlay_display_devices_values" translatable="false" >
+        <item></item>
+        <item>720x480/160</item>
+        <item>720x480/160,secure</item>
+        <item>1280x720/213</item>
+        <item>1280x720/213,secure</item>
+        <item>1920x1080/320</item>
+        <item>1920x1080/320,secure</item>
+        <item>1280x720/213;1920x1080/320</item>
+    </string-array>
+
+    <!-- Titles for OpenGL traces preference. [CHAR LIMIT=35] -->
+    <string-array name="enable_opengl_traces_entries">
+        <item>None</item>
+        <item>Logcat</item>
+        <item>Systrace (Graphics)</item>
+        <item>Call stack on glGetError</item>
+    </string-array>
+
+    <!-- Values for OpenGL traces preference. -->
+    <string-array name="enable_opengl_traces_values" translatable="false" >
+        <item>0</item>
+        <item>1</item>
+        <item>systrace</item>
+        <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 debug overdraw preference. [CHAR LIMIT=50] -->
+    <string-array name="debug_hw_overdraw_entries">
+        <item>Off</item>
+        <item>Show overdraw areas</item>
+        <item>Show areas for Deuteranomaly</item>
+        <item>Show overdraw counter</item>
+    </string-array>
+
+    <!-- Values for debug overdraw preference. -->
+    <string-array name="debug_hw_overdraw_values" translatable="false" >
+        <item>false</item>
+        <item>show</item>
+        <item>show_deuteranomaly</item>
+        <item>count</item>
+    </string-array>
+
     <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
     <string-array name="app_process_limit_entries">
         <item>Standard limit</item>
@@ -728,4 +1140,27 @@
         <item>2</item>
         <item>1</item>
     </string-array>
+
+    <!-- Values for premium SMS permission selector [CHAR LIMIT=30] -->
+    <string-array name="security_settings_premium_sms_values">
+        <!-- Ask user before sending to premium SMS short code. -->
+        <item>Ask</item>
+        <!-- Never allow app to send to premium SMS short code. -->
+        <item>Never allow</item>
+        <!-- Always allow app to send to premium SMS short code. -->
+        <item>Always allow</item>
+    </string-array>
+
+    <!-- [CHAR LIMIT=30] Labels for memory states -->
+    <string-array name="ram_states">
+        <!-- Normal desired memory state. -->
+        <item>normal</item>
+        <!-- Moderate memory state, not as good as normal. -->
+        <item>moderate</item>
+        <!-- Memory is running low. -->
+        <item>low</item>
+        <!-- Memory is critical. -->
+        <item>critical</item>
+    </string-array>
+
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 684811c..fd28fa0 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -81,4 +81,6 @@
         <attr name="fillColor" format="color" />
         <attr name="fillColorSecondary" format="color" />
     </declare-styleable>
+
+    <attr name="apnPreferenceStyle" format="reference" />
 </resources>
diff --git a/res/values/bools.xml b/res/values/bools.xml
index 23bdf0d..76dc44a 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -30,6 +30,6 @@
          Can be overridden for specific product builds. -->
     <bool name="auto_confirm_bluetooth_activation_dialog">false</bool>
 
-    <!-- Whether User management screen is available -->
-    <bool name="enable_user_management">false</bool>
+    <!-- Whether to show a preference item for regulatory information in About phone -->
+    <bool name="config_show_regulatory_info">false</bool>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f81d614..40098f5 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -24,7 +24,10 @@
     <color name="memory_downloads">#476093</color>
     <color name="memory_dcim">#793A7F</color>
     <color name="memory_music">#8E562A</color>
+    <color name="memory_cache">#479392</color>
     <color name="memory_misc">#7C3030</color>
+    <color name="memory_user_light">#479392</color>
+    <color name="memory_user_dark">#316665</color>
 
     <color name="crypt_keeper_clock_background">#ff9a9a9a</color>
     <color name="crypt_keeper_clock_foreground">#ff666666</color>
@@ -32,6 +35,10 @@
 
     <color name="divider_color">#20ffffff</color>
     <color name="title_color">@android:color/holo_blue_light</color>
-    <color name="setup_divider_color">#333333</color>
+    <color name="setup_divider_color_dark">#33ffffff</color>
+    <color name="setup_divider_color_light">#33000000</color>
 
-</resources>
\ No newline at end of file
+    <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 9335788..bf697d6 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -39,16 +39,38 @@
     <item type="dimen" name="setup_title_height">15%</item>
     <item type="dimen" name="setup_border_width">5%</item>
     <dimen name="setup_margin_bottom">0dip</dimen>
-    <dimen name="setup_title_size">25sp</dimen>
+    <dimen name="setup_title_size">25dp</dimen>
     <dimen name="setup_button_size">32dip</dimen>
     <dimen name="setup_item_margin">16dip</dimen>
 
     <dimen name="divider_height">3dip</dimen>
     <dimen name="divider_margin_top">6dip</dimen>
     <dimen name="divider_margin_bottom">7dip</dimen>
+    <dimen name="vert_divider_width">1dip</dimen>
 
     <!--  Size of icons in the top-level of settings  -->
     <dimen name="header_icon_width">28dp</dimen>
     <dimen name="appwidget_min_width">260dip</dimen>
     <dimen name="appwidget_min_height">40dip</dimen>
+
+    <dimen name="pager_tabs_padding">0dp</dimen>
+
+    <!-- Size of AppWidget previews in KeyguardAppWidgetPickActivity -->
+    <dimen name="appwidget_preview_width">140dip</dimen>
+    <dimen name="appwidget_preview_height">80dip</dimen>
+    <dimen name="keyguard_appwidget_picker_max_width">800dip</dimen>
+    <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>
+
+    <dimen name="captioning_preview_height">200dp</dimen>
+
+    <dimen name="settings_side_margin">@*android:dimen/preference_fragment_padding_side</dimen>
 </resources>
diff --git a/res/values/donottranslate.xml b/res/values/donottranslate.xml
index ba4ff2e..e6bd9a6 100644
--- a/res/values/donottranslate.xml
+++ b/res/values/donottranslate.xml
@@ -33,5 +33,4 @@
         <item>@string/input_method_selector_always_show_value</item>
         <item>@string/input_method_selector_always_hide_value</item>
     </string-array>
-
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 071c19d..e6b8864 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -23,9 +23,24 @@
     <!-- Strings for Dialog create button -->
     <string name="create">Create</string>
 
+    <!-- Strings for Dialog allow button -->
+    <string name="allow">Allow</string>
+
+    <!-- Strings for Dialog deny button -->
+    <string name="deny">Deny</string>
+
     <!-- Device Info --> <skip />
     <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
     <string name="device_info_default">Unknown</string>
+    <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+    <plurals name="show_dev_countdown">
+        <item quantity="one">You are now <xliff:g id="step_count">%1$d</xliff:g> step away from being a developer.</item>
+        <item quantity="other">You are now <xliff:g id="step_count">%1$d</xliff:g> steps away from being a developer.</item>
+    </plurals>
+    <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+    <string name="show_dev_on">You are now a developer!</string>
+    <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+    <string name="show_dev_already">No need, you are already a developer.</string>
 
     <!-- Category headings in left-pane header menu --> <skip />
     <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
@@ -176,8 +191,10 @@
     <string name="battery_info_status_charging_ac">(AC)</string>
     <!-- Battery Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="battery_info_status_charging_usb">(USB)</string>
+    <!-- Battery Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="battery_info_status_charging_wireless">(wireless)</string>
     <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="battery_info_status_discharging">Discharging</string>
+    <string name="battery_info_status_discharging">Not charging</string>
     <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="battery_info_status_not_charging">Not charging</string>
     <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -187,6 +204,7 @@
     <string name="battery_info_power_unplugged">Unplugged</string>
     <string name="battery_info_power_ac">AC</string>
     <string name="battery_info_power_usb">USB</string>
+    <string name="battery_info_power_wireless">wireless</string>
     <string name="battery_info_power_ac_usb">AC+USB</string>
     <string name="battery_info_power_unknown">Unknown</string>
 
@@ -207,8 +225,6 @@
 
     <!-- Used as setting title (for checkbox) on second screen after selecting Bluetooth settings -->
     <string name="bluetooth">Bluetooth</string>
-    <!-- Bluetooth settings screen, check box label when the Bluetooth device can be seen by others -->
-    <string name="bluetooth_visibility">Discoverable</string>
     <!-- Bluetooth settings screen, summary after selecting Discoverable check box [CHAR LIMIT=50] -->
     <string name="bluetooth_is_discoverable">Visible to all nearby Bluetooth devices (<xliff:g id="discoverable_time_period">%1$s</xliff:g>)</string>
     <!-- Bluetooth settings screen, summary when Discoverable duration is set to "forever" [CHAR LIMIT=50] -->
@@ -217,12 +233,8 @@
     <string name="bluetooth_not_visible_to_other_devices">Not visible to other Bluetooth devices</string>
     <!-- Bluetooth settings screen, summary text when not discoverable with paired devices [CHAR LIMIT=50] -->
     <string name="bluetooth_only_visible_to_paired_devices">Only visible to paired devices</string>
-    <!-- Bluetooth settings screen, Discoverable checkbox summary text -->
-    <string name="bluetooth_not_discoverable">Make device discoverable</string>
     <!-- Bluetooth settings screen, option name to pick discoverability timeout duration (a list dialog comes up) -->
     <string name="bluetooth_visibility_timeout">Visibility timeout</string>
-    <!-- Bluetooth settings screen, Discoverable timout list dialog summary text -->
-    <string name="bluetooth_visibility_timeout_summary">Set how long device will be discoverable</string>
     <!-- Bluetooth settings screen, check box label whether or not to allow
         bluetooth voice dialing when lock screen is up-->
     <string name="bluetooth_lock_voice_dialing">Lock voice dialing</string>
@@ -264,6 +276,8 @@
     <string name="bluetooth_connected_no_headset">Connected (no phone)</string>
     <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
     <string name="bluetooth_connected_no_a2dp">Connected (no media)</string>
+    <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+    <string name="bluetooth_connected_no_map">Connected (no message access)</string>
     <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
     <string name="bluetooth_connected_no_headset_no_a2dp">Connected (no phone or media)</string>
     <!-- Bluetooth settings.  Message when a device is disconnected -->
@@ -298,25 +312,25 @@
     <string name="bluetooth_permission_request">"Bluetooth permission request"</string>
 
     <!-- Strings for asking to the user whether to allow an app to enable bluetooth -->
-    <string name="bluetooth_ask_enablement">"An app wants to turn on Bluetooth. Allow?"</string>
+    <string name="bluetooth_ask_enablement">An app wants to turn on Bluetooth.</string>
 
     <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
-    <string name="bluetooth_ask_discovery" product="tablet">"An app on your tablet wants to make your tablet discoverable by other Bluetooth devices for <xliff:g id="timeout">%1$d</xliff:g> seconds. Allow?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet">An app wants to make your tablet visible to other Bluetooth devices for <xliff:g id="timeout">%1$d</xliff:g> seconds.</string>
     <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
-    <string name="bluetooth_ask_discovery" product="default">"An app on your phone wants to make your phone discoverable by other Bluetooth devices for <xliff:g id="timeout">%1$d</xliff:g> seconds. Allow?"</string>
+    <string name="bluetooth_ask_discovery" product="default">An app wants to make your phone visible to other Bluetooth devices for <xliff:g id="timeout">%1$d</xliff:g> seconds.</string>
 
     <!-- Strings for asking to the user whether to allow an app to enable lasting discovery mode  -->
-    <string name="bluetooth_ask_lasting_discovery" product="tablet">"An app on your tablet wants to make your tablet \u201calways discoverable\u201d by other Bluetooth devices. Allow?"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default">"An app on your phone wants to make your phone \u201calways discoverable\u201d by other Bluetooth devices. Allow?"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet">An app wants to make your tablet visible to other Bluetooth devices. You can change this later in Bluetooth settings.</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default">An app wants to make your phone visible to other Bluetooth devices. You can change this later in Bluetooth settings.</string>
 
     <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet">"An app on your tablet wants to turn on Bluetooth and make your tablet discoverable by other devices for <xliff:g id="timeout">%1$d</xliff:g> seconds. Allow?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet">An app wants to turn on Bluetooth and make your tablet visible to other devices for <xliff:g id="timeout">%1$d</xliff:g> seconds.</string>
     <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
-    <string name="bluetooth_ask_enablement_and_discovery" product="default">"An app on your phone wants to turn on Bluetooth and make your phone discoverable by other devices for <xliff:g id="timeout">%1$d</xliff:g> seconds. Allow?"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default">An app wants to turn on Bluetooth and make your phone visible to other devices for <xliff:g id="timeout">%1$d</xliff:g> seconds.</string>
 
     <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet">"An app on your tablet wants to turn on Bluetooth and make your tablet discoverable by other devices. Allow?"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default">"An app on your phone wants to turn on Bluetooth and make your phone discoverable by other devices. Allow?"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet">An app wants to turn on Bluetooth and make your tablet visible to other devices. You can change this later in Bluetooth settings.</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default">An app wants to turn on Bluetooth and make your phone visible to other devices. You can change this later in Bluetooth settings.</string>
 
     <!-- Strings for msg to display to user while bluetooth is turning on [CHAR LIMIT=60] -->
     <string name="bluetooth_turning_on">"Turning Bluetooth on\u2026"</string>
@@ -337,14 +351,25 @@
     <string name="bluetooth_connection_dialog_text">"Do you want to connect to \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022?"</string>
 
     <!-- Activity label of BluetoothPbPermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
-    <string name="bluetooth_phonebook_request">"Phone book request"</string>
+    <string name="bluetooth_phonebook_request">"Phone book access request"</string>
 
     <!-- Bluetooth phone book permission Alert Activity text [CHAR LIMIT=none] -->
     <string name="bluetooth_pb_acceptance_dialog_text">%1$s wants to access your contacts and call history. Give access to %2$s?</string>
 
     <!-- Bluetooth phone book permission Alert Activity checkbox text [CHAR LIMIT=none] -->
+    <string name="bluetooth_remember_choice">Don\'t ask again</string>
+    <!--FIXME SHOULD BE REMOVED AND ALL LANG VERSIONS FIXED TO ABOVE NAME -->
     <string name="bluetooth_pb_remember_choice">Don\'t ask again</string>
 
+    <!-- Activity label of BluetoothMessagePermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+    <string name="bluetooth_map_request">"Message access request"</string>
+
+    <!-- Bluetooth message permission Alert Activity text [CHAR LIMIT=none] -->
+    <string name="bluetooth_map_acceptance_dialog_text">%1$s wants to access your messages. Give access to %2$s?</string>
+
+
+
+
     <!-- Date & time settings screen title -->
     <string name="date_and_time">Date &amp; time settings</string>
     <!-- The title of the activity to pick a time zone. -->
@@ -375,7 +400,7 @@
     <string name="intent_sender_account_label">Account: </string>
 
     <!-- HTTP proxy settings title -->
-    <string name="proxy_settings_title">Proxy settings</string>
+    <string name="proxy_settings_title">Proxy</string>
     <!-- HTTP proxy settings. Button to clear the proxy box. -->
     <string name="proxy_clear_text">Clear</string>
     <!-- HTTP proxy settings. The port number label. -->
@@ -416,6 +441,8 @@
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_neighboring_location_label">Neighboring CID:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radio_info_cellinfo_label">CellInfo:</string>
+    <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_data_attempts_label">Data attempts:</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
 
@@ -571,7 +598,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>
@@ -585,6 +612,10 @@
     <string name="roaming_turn_it_on_button">Turn it on</string>
     <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box -->
     <string name="roaming_warning">When you allow data roaming, you may incur significant roaming charges!</string>
+    <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser tablets [CHAR LIMIT=none] -->
+    <string name="roaming_warning_multiuser" product="tablet">When you allow data roaming, you may incur significant roaming charges!\n\nThis setting affects all users on this tablet.</string>
+    <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser phones [CHAR LIMIT=none] -->
+    <string name="roaming_warning_multiuser" product="default">When you allow data roaming, you may incur significant roaming charges!\n\nThis setting affects all users on this phone.</string>
     <!-- mobile network settings screen, title of dialog box that appears when you select the "Data roaming" check box -->
     <string name="roaming_reenable_title">Allow data roaming?</string>
     <!-- mobile network settings screen, setting option name -->
@@ -653,12 +684,24 @@
     <string name="show_owner_info_on_lockscreen_label">Show owner info on lock screen</string>
     <!-- Text shown for title of owner info setting [CHAR LIMIT=20]-->
     <string name="owner_info_settings_title">Owner info</string>
+    <!-- Text shown for title of settings checkbox to enable widgets [CHAR LIMIT=20]-->
+    <string name="security_enable_widgets_title">Enable widgets</string>
+    <!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->
+    <string name="security_enable_widgets_disabled_summary">Disabled by administrator</string>
     <!-- Text shown for summary of owner info setting [CHAR LIMIT=40]-->
     <string name="owner_info_settings_summary"></string>
     <!-- Hint text shown in owner info edit text [CHAR LIMIT=50] -->
     <string name="owner_info_settings_edit_text_hint">Type text to display on the lock screen</string>
+    <!-- Text shown next to checkbox for showing user info on LockScreen [CHAR LIMIT=50]-->
+    <string name="show_user_info_on_lockscreen_label">Show user info on lock screen</string>
+    <!-- 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>
+    <string name="location_settings_title">Location</string>
     <!-- Main Settings screen setting option title for the item to take you to the security screen -->
     <string name="security_settings_title">Security</string>
     <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
@@ -961,6 +1004,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>
@@ -1075,6 +1149,8 @@
     <string name="bluetooth_profile_pan">Internet access</string>
     <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40]-->
     <string name="bluetooth_profile_pan_nap">Internet connection sharing</string>
+    <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the map profile. -->
+    <string name="bluetooth_profile_map">Message Access</string>
 
     <!-- Bluetooth settings.  Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->
     <string name="bluetooth_disconnect_a2dp_profile"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from media audio.</string>
@@ -1107,6 +1183,8 @@
     <string name="bluetooth_headset_profile_summary_connected">Connected to phone audio</string>
     <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
     <string name="bluetooth_opp_profile_summary_connected">Connected to file transfer server</string>
+    <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+    <string name="bluetooth_map_profile_summary_connected">Connected to map</string>
     <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
     <string name="bluetooth_opp_profile_summary_not_connected">Not connected to file transfer server</string>
     <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
@@ -1130,6 +1208,8 @@
          for the PAN checkbox preference that describes how checking it
          will set the PAN profile as preferred. -->
     <string name="bluetooth_pan_profile_summary_use_for">Use for Internet access</string>
+    <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+    <string name="bluetooth_map_profile_summary_use_for">Use for map</string>
 
     <!-- Bluetooth settings.  Dock Setting Title -->
     <string name="bluetooth_dock_settings">Dock Settings</string>
@@ -1142,6 +1222,73 @@
     <!-- Bluetooth settings.  Dock Setting Dialog - Remember setting and don't ask user again -->
     <string name="bluetooth_dock_settings_remember">Remember settings</string>
 
+    <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
+    <string name="wifi_display_settings_title">Wireless display</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_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\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] -->
+    <string name="wifi_display_searching_for_devices">Searching\u2026</string>
+    <!-- Wifi Display settings. Text that appears when scanning for devices is finished and no nearby device was found [CHAR LIMIT=40]-->
+    <string name="wifi_display_no_devices_found">No nearby wireless displays were found.</string>
+    <!-- Wifi Display settings. The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] -->
+    <string name="wifi_display_paired_devices">Paired displays</string>
+    <!-- Wifi Display settings. The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->
+    <string name="wifi_display_available_devices">Available devices</string>
+    <!-- Wifi Display settings. The status summary for connecting devices. [CHAR LIMIT=40] -->
+    <string name="wifi_display_status_connecting">Connecting</string>
+    <!-- Wifi Display settings. The status summary for connected devices. [CHAR LIMIT=40] -->
+    <string name="wifi_display_status_connected">Connected</string>
+    <!-- Wifi Display settings. The status summary for available devices. [CHAR LIMIT=40] -->
+    <string name="wifi_display_status_available">Available</string>
+    <!-- Wifi Display settings. The status summary for devices that's already in use. [CHAR LIMIT=40] -->
+    <string name="wifi_display_status_in_use">In use</string>
+    <!-- Wifi Display settings. Image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
+    <string name="wifi_display_details">Display settings</string>
+
+    <!-- Wifi Display settings. Disconnect dialog.  The title of the dialog. [CHAR LIMIT=40] -->
+    <string name="wifi_display_disconnect_title">Disconnect?</string>
+    <!-- Wifi Display settings. Disconnect dialog.  Message for disconnecting from the display. [CHAR LIMIT=NONE] -->
+    <string name="wifi_display_disconnect_text">This will end your connection with:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b></string>
+
+    <!-- Wifi Display settings. Options dialog.  The title of the dialog. [CHAR LIMIT=40] -->
+    <string name="wifi_display_options_title">Wireless display options</string>
+    <!-- Wifi Display settings. Options dialog.  The forget button text. [CHAR LIMIT=20] -->
+    <string name="wifi_display_options_forget">Forget</string>
+    <!-- Wifi Display settings. Options dialog.  The done button text. [CHAR LIMIT=20] -->
+    <string name="wifi_display_options_done">Done</string>
+    <!-- Wifi Display settings. Options dialog.  The name label used when prompting the user to rename the display. [CHAR LIMIT=20] -->
+    <string name="wifi_display_options_name">Name</string>
+
+    <!-- Wifi Display settings. Summary shown in Display settings. Text used for 'On' state. [CHAR LIMIT=40] -->
+    <string name="wifi_display_summary_on">On</string>
+    <!-- Wifi Display settings. Summary shown in Display settings. Text used for 'Off' state. [CHAR LIMIT=40] -->
+    <string name="wifi_display_summary_off">Off</string>
+    <!-- Wifi Display settings. Summary shown in Display settings. Text used for 'Disabled' state. [CHAR LIMIT=40] -->
+    <string name="wifi_display_summary_disabled">Disabled</string>
+
+    <!-- Wifi Display settings. The sub heading for wireless display certification options. [CHAR LIMIT=40] -->
+    <string name="wifi_display_certification_heading" translatable="false">Certification</string>
+    <!-- Wifi Display settings. The section title for wireless display session info. [CHAR LIMIT=40] -->
+    <string name="wifi_display_session_info" translatable="false">Session info</string>
+    <!-- Wifi Display settings. The checkbox title for enabling listen mode during certification process. [CHAR LIMIT=40] -->
+    <string name="wifi_display_listen_mode" translatable="false">Enable listen mode</string>
+    <!-- Wifi Display settings. The checkbox title for enabling autonomous GO during certification process. [CHAR LIMIT=40] -->
+    <string name="wifi_display_autonomous_go" translatable="false">Enable autonomous GO</string>
+    <!-- Wifi Display settings. The button text for sending pause trigger during certification process. [CHAR LIMIT=40] -->
+    <string name="wifi_display_pause" translatable="false">Pause</string>
+    <!-- Wifi Display settings. The button text for sending play (resume) trigger during certification process. [CHAR LIMIT=40] -->
+    <string name="wifi_display_resume" translatable="false">Resume</string>
+    <!-- Wifi Display settings. The dropdown menu title for choosing WPS configuration during certification process. [CHAR LIMIT=40] -->
+    <string name="wifi_display_wps_config" translatable="false">WPS configuration</string>
+    <!-- Wifi Display settings. The dropdown menu title for choosing listen channel during certification process. [CHAR LIMIT=40] -->
+    <string name="wifi_display_listen_channel" translatable="false">Listen channel</string>
+    <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->
+    <string name="wifi_display_operating_channel" translatable="false">Operating channel</string>
+
     <!-- NFC settings -->
     <!-- Used in the 1st-level settings screen to turn on NFC -->
     <string name="nfc_quick_toggle_title">NFC</string>
@@ -1171,23 +1318,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 -->
@@ -1201,21 +1348,37 @@
     <!-- 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\u2011Fi optimization</string>
+    <!-- Checkbox summary for option to toggle suspend power optimizations -->
+    <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] -->
+    <string name="wifi_menu_more_options">More options</string>
     <!-- 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 -->
@@ -1227,33 +1390,37 @@
     <!-- 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]-->
     <string name="wifi_more">More</string>
     <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
     <string name="wifi_setup_wps">Automatic setup (WPS)</string>
+    <!-- Message informing that wifi is required during setup [CHAR LIMIT=NONE] -->
+    <string name="wifi_required_info_text">To complete setup, your tablet needs access to Wi\u2011Fi. After setup, you can switch between 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 upto 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 upto two minutes to complete</string>
+    <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] -->
     <string name="wifi_wps_failed_generic">WPS failed. Please try again in a few minutes.</string>
     <!-- Text displayed when WPS fails due to WEP [CHAR LIMIT=150] -->
@@ -1266,6 +1433,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 -->
@@ -1353,6 +1522,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>
@@ -1368,12 +1540,29 @@
     <string name="wifi_failed_save_message">Failed to save network</string>
     <!-- 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">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">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">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">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">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">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">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]. -->
@@ -1405,7 +1594,7 @@
     <!-- Label for the DNS (second one)-->
     <string name="wifi_dns2">DNS 2</string>
     <!-- Hint text for DNS -->
-    <string name="wifi_dns2_hint" translatable="false">4.4.4.4</string>
+    <string name="wifi_dns2_hint" translatable="false">8.8.4.4</string>
     <!-- Label for the gateway of the network -->
     <string name="wifi_gateway">Gateway</string>
     <!-- Hint text for the gateway -->
@@ -1415,10 +1604,9 @@
     <!-- Hint text for network prefix length -->
     <string name="wifi_network_prefix_length_hint" translatable="false">24</string>
 
-
     <!-- 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-->
@@ -1445,14 +1633,12 @@
     <string name="wifi_p2p_cancel_connect_title">Cancel invitation?</string>
     <!-- Message text for disconnection from one device-->
     <string name="wifi_p2p_cancel_connect_message">Do you want to cancel invitation to connect with <xliff:g id="peer_name">%1$s</xliff:g>?</string>
-    <!-- Title for delete group dialog -->
-    <string name="wifi_p2p_delete_group_title">Delete group?</string>
     <!-- Message text for remembered group deletion-->
-    <string name="wifi_p2p_delete_group_message">Do you want to delete the group <xliff:g id="group_name">%1$s</xliff:g>?</string>
+    <string name="wifi_p2p_delete_group_message">Forget this group?</string>
 
     <!-- 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 -->
@@ -1460,11 +1646,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>
 
@@ -1554,6 +1740,7 @@
     <!-- Sound and alerts settings -->
     <skip/>
     <!-- Main Settings screen setting option name to go into the display settings screen -->
+    <string name="home_settings">Home</string>
     <string name="display_settings_title">Display</string>
     <!-- Sound settings screen heading -->
     <string name="sound_settings">Sound</string>
@@ -1570,7 +1757,7 @@
     <!-- Sound settings screen, setting option name checkbox -->
     <string name="vibrate_in_silent_title">Vibrate when silent</string>
     <!-- Sound settings screen, setting option name -->
-    <string name="notification_sound_title">Default notification</string>
+    <string name="notification_sound_title">Default notification sound</string>
     <!-- Sound settings screen, notification light repeat pulsing title -->
     <string name="notification_pulse_title">Pulse notification light</string>
     <!-- Sound settings screen, the title of the volume bar to adjust the incoming call volume -->
@@ -1581,7 +1768,7 @@
          the same as the incoming call volume. -->
     <string name="checkbox_notification_same_as_incoming_call">Use incoming call volume for notifications</string>
     <!-- Sound settings screen, setting option title-->
-    <string name="notification_sound_dialog_title">Choose notification ringtone</string>
+    <string name="notification_sound_dialog_title">Default notification sound</string>
     <!-- Sound settings screen, setting option name -->
     <string name="media_volume_title">Media</string>
     <!-- Sound settings screen, setting option summary text -->
@@ -1687,24 +1874,25 @@
     <!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
     <string name="wallpaper_settings_fragment_title">Choose wallpaper from</string>
     <!-- Display settings screen, trigger for screen saver options -->
-    <string name="screensaver_settings_title">Screen Candy</string>
-    <!-- Display settings screen, summary for screen saver options, screen saver is turned on -->
-    <string name="screensaver_settings_summary_on">Will start upon sleep if connected to power</string>
+    <string name="screensaver_settings_title">Daydream</string>
+    <!-- Display settings screen, summary fragment for screen saver options, activated when docked or asleep and charging -->
+    <string name="screensaver_settings_summary_either_long">When docked or asleep and charging</string>
+    <!-- Dream settings screen, dialog option, activated when docked or asleep and charging -->
+    <string name="screensaver_settings_summary_either_short">Either</string>
+    <!-- Display settings screen, summary fragment for screen saver options, activated when asleep and charging -->
+    <string name="screensaver_settings_summary_sleep">While charging</string>
+    <!-- Display settings screen, summary fragment for screen saver options, activated when docked  -->
+    <string name="screensaver_settings_summary_dock">While docked</string>
     <!-- Display settings screen, summary for screen saver options, screen saver is turned off -->
-    <string name="screensaver_settings_summary_off">Disabled</string>
-    <!-- Screen saver settings, setting option name to select a module -->
-    <string name="screensaver_component_title">Selected candy</string>
-    <!-- Screen saver settings, setting option name to change activation timeout -->
-    <string name="screensaver_timeout_title">When to activate</string>
-    <!-- Screen saver settings, setting option summary to change activation timeout -->
-    <string name="screensaver_timeout_summary">After <xliff:g id="timeout_description">%1$s</xliff:g> spent idle</string>
-    <!-- Screen saver settings, setting option summary to change activation timeout, shown when disabled -->
-    <string name="screensaver_timeout_zero_summary">Never</string>
-    <!-- Screen saver settings, button allowing the user to test/try the current module -->
-    <string name="screensaver_test">Try it!</string>
-    <!-- Screen saver settings, checkbox allowing the screen saver to activate automatically when
-         the device is docked -->
-    <string name="screensaver_activate_on_dock_title">Also start when docked</string>
+    <string name="screensaver_settings_summary_off">Off</string>
+    <!-- Dream settings screen, caption for when dreams are disabled -->
+    <string name="screensaver_settings_disabled_prompt">To control what happens when the phone is docked and/or sleeping, turn Daydream on.</string>
+    <!-- Dream settings screen, action label, when to dream -->
+    <string name="screensaver_settings_when_to_dream">When to daydream</string>
+    <!-- Dream settings screen, button label to start dreaming -->
+    <string name="screensaver_settings_dream_start">Start now</string>
+    <!-- Dream settings screen, button label for settings for a specific screensaver -->
+    <string name="screensaver_settings_button">Settings</string>
     <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
     <string name="automatic_brightness">Automatic brightness</string>
     <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
@@ -1823,6 +2011,8 @@
     <string name="status_icc_id">ICCID</string>
     <!-- About phone, status item title for the type of data phone network we're connected to, for example 3G or Edge or GPRS -->
     <string name="status_network_type">Mobile network type</string>
+    <!-- About phone, status item title for the latest area info cell broadcast received (Brazil only). -->
+    <string name="status_latest_area_info">Operator info</string>
     <!-- About phone, status item title. The status of data access.  For example, the value may be "Connected" -->
     <string name="status_data_state">Mobile network state</string>
     <!-- About phone, status item title. The status of whether we have service.  for example, the value may be "In service" -->
@@ -1834,7 +2024,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]-->
@@ -1853,6 +2043,8 @@
     <string name="sd_memory" product="default">SD card</string>
     <!-- SD card & phone storage settings title. The amount of free space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section. -->
     <string name="memory_available">Available</string>
+    <!-- SD card & phone storage settings title. The amount of free space for some storage partition when the volume is read-only. [CHAR LIMIT=64] -->
+    <string name="memory_available_read_only">Available (read-only)</string>
     <!-- SD card & phone storage settings screen heading.  The total amount of storage space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section -->
     <string name="memory_size">Total space</string>
     <!-- SD card & phone storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] -->
@@ -1869,6 +2061,8 @@
     <string name="memory_music_usage">Audio (music, ringtones, podcasts, etc.)</string>
     <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of misc files on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
     <string name="memory_media_misc_usage">Misc.</string>
+    <!-- Storage item representing all cached data on device. [CHAR LIMIT=48] -->
+    <string name="memory_media_cache_usage">Cached data</string>
     <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=25] -->
     <string name="sd_eject" product="nosdcard">Unmount shared storage</string>
     <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
@@ -1903,10 +2097,14 @@
     <string name="sd_format_summary" product="default">Erases all data on the SD card, such as music and photos</string>
     <!-- SD card status when it is mounted as read only. Will be appended to size, starts with an unbreakable space -->
 
+    <!-- Title of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
+    <string name="memory_clear_cache_title">Clear cached data?</string>
+    <!-- Message of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
+    <string name="memory_clear_cache_message">This will clear cached data for all apps.</string>
+
     <!-- SD card & phone storage settings item summary that will result in the phone connected to PC and MTP/PTP enabled.   [CHAR LIMIT=80] -->
     <string name="mtp_ptp_mode_summary">MTP or PTP function is active</string>
 
-    <string name="read_only">\u0020(Read-only)</string>
     <!-- SD card eject confirmation dialog title   [CHAR LIMIT=25] -->
     <string name="dlg_confirm_unmount_title" product="nosdcard">Unmount USB storage?</string>
     <!-- SD card eject confirmation dialog title   -->
@@ -1955,6 +2153,9 @@
     <!-- Storage setting.  Summary for PTP checkbox [CHAR LIMIT=NONE]-->
     <string name="usb_label_installer_cd">"Install file-transfer tools"</string>
 
+    <!-- Section header above list of other users storage [CHAR LIMIT=32] -->
+    <string name="storage_other_users">Other users</string>
+
     <!-- Phone info screen, section titles: -->
     <string name="battery_status_title">Battery status</string>
     <!-- Phone info screen, section titles: -->
@@ -2013,6 +2214,10 @@
     <string name="carrier_enabled_summaryOff">APN disabled</string>
     <!-- Edit Beaerer Info of APN -->
     <string name="bearer">Bearer</string>
+    <!-- Edit Mvno Type Info of APN -->
+    <string name="mvno_type">MVNO type</string>
+    <!-- Edit Mvno Match Data Info of APN -->
+    <string name="mvno_match_data">MVNO value</string>
     <!-- Edit access point screen menu option to delete this APN -->
     <string name="menu_delete">Delete APN</string>
     <!-- APNs screen menu option to create a brand spanking new APN -->
@@ -2175,14 +2380,67 @@
     <!-- Wireless controls, item title to go into the network settings -->
     <string name="network_settings_title">Mobile networks</string>
 
+    <!-- Mobile plan [CHAR LIMIT=35]-->
+    <string name="manage_mobile_plan_title" translatable="true">Mobile plan</string>
+
+    <!-- SMS Application [CHAR LIMIT=35]-->
+    <string name="sms_application_title" translatable="true">Default SMS app</string>
+    <string name="sms_change_default_dialog_title" translatable="true">Change SMS app?</string>
+    <string name="sms_change_default_dialog_text" translatable="true">Use <xliff:g id="new_app">%s</xliff:g> instead of <xliff:g id="current_app">%s</xliff:g> as your SMS app?</string>
+    <string name="sms_change_default_no_previous_dialog_text" translatable="true">Use <xliff:g id="new_app">%s</xliff:g> as your SMS app?</string>
+
+    <!-- The SIM operator is not known [CHAR_ LIMIT=50]-->
+    <string name="mobile_unknown_sim_operator" translatable="true">Uknown SIM operator</string>
+
+    <!-- There is no mobile provisiong website for the operator which is the firat parameter [CHAR_ LIMIT=50]-->
+    <string name="mobile_no_provisioning_url" translatable="true">%1$s has no known provisioning website</string>
+
+    <!-- Ask user to insert a SIM card [CHAR_ LIMIT=50]-->
+    <string name="mobile_insert_sim_card" translatable="true">Please insert SIM card and restart</string>
+
+    <!-- Ask user to connect to the internet [CHAR_ LIMIT=50]-->
+    <string name="mobile_connect_to_internet" translatable="true">Please connect to the internet</string>
+
     <!-- Security & location settings screen, section header for settings relating to location -->
     <string name="location_title">My Location</string>
+    <!-- [CHAR LIMIT=30] Location settings screen, setting preference screen box label for location mode -->
+    <string name="location_mode_title">Mode</string>
+    <!-- [CHAR LIMIT=30] Location settings screen, high accuracy location mode -->
+    <string name="location_mode_high_accuracy_title">High accuracy</string>
+    <!-- [CHAR LIMIT=30] Location settings screen, battery saving location mode -->
+    <string name="location_mode_battery_saving_title">Battery saving</string>
+    <!-- [CHAR LIMIT=30] Location settings screen, device only location mode -->
+    <string name="location_mode_sensors_only_title">Device only</string>
+    <!-- [CHAR LIMIT=30] Location settings screen, location off mode -->
+    <string name="location_mode_location_off_title">Location off</string>
+    <!-- [CHAR LIMIT=30] Location settings screen, sub category for recent location requests -->
+    <string name="location_category_recent_location_requests">Recent location requests</string>
+    <!-- Location settings screen, displayed when there's no recent app accessing location -->
+    <string name="location_no_recent_apps">No apps have requested location recently</string>
+    <!-- [CHAR LIMIT=30] Location settings screen, sub category for location services -->
+    <string name="location_category_location_services">Location services</string>
+    <!-- [CHAR LIMIT=30] Location settings screen, recent location requests high battery use-->
+    <string name="location_high_battery_use">High battery use</string>
+    <!-- [CHAR LIMIT=30] Location settings screen, recent location requests low battery use-->
+    <string name="location_low_battery_use">Low battery use</string>
+    <!-- [CHAR LIMIT=30] Location mode screen, screen title -->
+    <string name="location_mode_screen_title">Location mode</string>
+    <!-- [CHAR LIMIT=130] Location mode screen, description for high accuracy mode -->
+    <string name="location_mode_high_accuracy_description">Use GPS, Wi\u2011Fi and mobile networks to estimate location </string>
+    <!-- [CHAR LIMIT=130] Location mode screen, description for battery saving mode -->
+    <string name="location_mode_battery_saving_description">Use Wi\u2011Fi and mobile networks to estimate location</string>
+    <!-- [CHAR LIMIT=130] Location mode screen, description for sensors only mode -->
+    <string name="location_mode_sensors_only_description">Use GPS to pinpoint your location</string>
+    <!-- [CHAR LIMIT=130] Location mode screen, temporary value to show as the status of a location
+         setting injected by an external app while the app is being queried for the actual value -->
+    <string name="location_loading_injected_setting">Retrieving…</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 -->
@@ -2217,6 +2475,8 @@
     <string name="legal_information">Legal information</string>
     <!-- About phone settings screen, setting option name to see a list of contributors -->
     <string name="contributors_title">Contributors</string>
+    <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
+    <string name="regulatory_information">Regulatory information</string>
     <!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip />
     <!-- About phone settings screen, setting option name to see copyright-related info -->
     <string name="copyright_title">Copyright</string>
@@ -2290,14 +2550,14 @@
     <!-- Security & location settings screen, change unlock pattern screen hint on bottom of screen.  We are telling them to press the menu button to see more options or help. -->
     <string name="lockpattern_recording_intro_footer">Press Menu for help.</string>
     <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen while drawing pattern -->
-    <string name="lockpattern_recording_inprogress">Release finger when done.</string>
+    <string name="lockpattern_recording_inprogress">Release finger when done</string>
     <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen if user doesn't connect enough dots -->
-    <string name="lockpattern_recording_incorrect_too_short">Connect at least <xliff:g id="number">%d</xliff:g> dots. Try again:</string>
+    <string name="lockpattern_recording_incorrect_too_short">Connect at least <xliff:g id="number">%d</xliff:g> dots. Try again.</string>
     <!-- Security & location settings screen, change unlock pattern screen message on top of screen after drawing pattern -->
-    <string name="lockpattern_pattern_entered_header">Pattern recorded.</string>
+    <string name="lockpattern_pattern_entered_header">Pattern recorded</string>
     <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen to confirm pattern -->
-    <string name="lockpattern_need_to_confirm">Draw pattern again to confirm:</string>
-    <string name="lockpattern_pattern_confirmed_header">Your new unlock pattern:</string>
+    <string name="lockpattern_need_to_confirm">Draw pattern again to confirm</string>
+    <string name="lockpattern_pattern_confirmed_header">Your new unlock pattern</string>
     <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  When they are ready to draw it once again to confirm it, they press this button. -->
     <string name="lockpattern_confirm_button_text">Confirm</string>
     <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  If they are nto satisfied with this pattern, they click this button to redraw the pattern. -->
@@ -2328,24 +2588,8 @@
     <string name="lockpattern_too_many_failed_confirmation_attempts_header">Too many incorrect attempts!</string>
     <!-- Security & location settings screen, change unlock pattern screen countdown hint on bottom of screen after too many incorrect attempts -->
     <string name="lockpattern_too_many_failed_confirmation_attempts_footer">Try again in <xliff:g id="number">%d</xliff:g> seconds.</string>
-
-    <!-- ChooseLockPatternTutorial --> <skip />
-    <!-- ChooseLockPatternTutorial, button labels: This is to cancel the tutorial -->
-    <string name="skip_button_label">Cancel</string>
-    <!-- ChooseLockPatternTutorial, button labels: Continue to the next page of the tutorial -->
-    <string name="next_button_label">Next</string>
-    <!-- ChooseLockPatternTutorial, tutorial screen title -->
-    <string name="lock_title" product="tablet">Securing your tablet</string>
-    <!-- ChooseLockPatternTutorial, tutorial screen title -->
-    <string name="lock_title" product="default">Securing your phone</string>
-    <!-- ChooseLockPatternTutorial, tutorial screen text -->
-    <string name="lock_intro_message" product="tablet">Protect your tablet from unauthorized use by creating a personal screen unlock pattern. Slide your finger to connect the dots in any order on the next screen.  You need to connect at least four dots.
-        \n\nReady to start? Touch Next.
-    </string>
-    <!-- ChooseLockPatternTutorial, tutorial screen text -->
-    <string name="lock_intro_message" product="default">Protect your phone from unauthorized use by creating a personal screen unlock pattern. Slide your finger to connect at least four dots in any order on the next screen.
-        \n\nReady to start? Touch Next.
-    </string>
+    <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
+    <string name="activity_not_found">Application is not installed on your phone.</string>
 
     <!-- Applications Settings --> <skip />
     <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
@@ -2372,6 +2616,10 @@
  from unknown sources. You agree that you are solely responsible for any
  damage to your phone or loss of data that may result from using
  these apps.</string>
+    <!-- Applications settings screen, setting check box title. If checked, the system will send package verification requests to package verifiers on the device who will ultimately allow or reject the installation of applications. [CHAR LIMIT=30] -->
+    <string name="verify_applications">Verify apps</string>
+    <!-- Applications settings screen, setting check box summary. This is the summary for "App Check" checkbox. [CHAR LIMIT=none] -->
+    <string name="verify_applications_summary">Disallow or warn before installation of apps that may cause harm</string>
     <!-- Applications settings screen, setting check box title. If checked, applications show more settings options. -->
     <string name="advanced_settings">Advanced settings</string>
     <!-- Applications settings screen, setting check box summary.  This is the summary for "Advanced settings" checkbox  -->
@@ -2412,6 +2660,10 @@
     <string name="external_data_size_label" product="default">SD card</string>
     <!-- Manage applications, individual application info screen, button label under Storage heading. Button to remove the application from the system. -->
     <string name="uninstall_text">Uninstall</string>
+    <!-- Manage applications, individual application info screen, menu item to uninstall an application for all users. -->
+    <string name="uninstall_all_users_text">Uninstall for all users</string>
+    <!-- [CHAR LIMIT=NONE] Manage applications, individual application info screen, button label under Storage heading. Button to install an application for the user. -->
+    <string name="install_text">Install</string>
     <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to disable an existing application. -->
     <string name="disable_text">Disable</string>
     <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to re-enable an existing application. -->
@@ -2454,7 +2706,8 @@
         <li>Disabled apps</li>\n
         <li>Disabled app notifications</li>\n
         <li>Default applications for actions</li>\n
-        <li>Background data restrictions for apps</li>\n\n
+        <li>Background data restrictions for apps</li>\n
+        <li>Any permission restrictions</li>\n\n
         You will not lose any app data.</string>
     <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Confirmation button of dialog to confirm resetting user's app preferences. -->
     <string name="reset_app_preferences_button">Reset apps</string>
@@ -2467,6 +2720,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>
@@ -2481,6 +2736,8 @@
     <string name="filter_apps_onsdcard" product="default">On SD card</string>
     <!-- [CHAR LIMIT=25] Manage applications, text telling using an application is disabled. -->
     <string name="disabled">Disabled</string>
+    <!-- [CHAR LIMIT=25] Manage applications, text telling using an application is not installed. -->
+    <string name="not_installed">Not installed</string>
     <!-- [CHAR LIMIT=25] Text shown when there are no applications to display. -->
     <string name="no_applications">No apps.</string>
     <!-- [CHAR LIMIT=15] Manage applications, label for chart showing internal storage use. -->
@@ -2539,6 +2796,10 @@
     <string name="join_many_items_first"><xliff:g id="first_item">%1$s</xliff:g>, <xliff:g id="all_but_first_and_last_item">%2$s</xliff:g></string>
     <!-- [CHAR_LIMIT=NONE] Format to put the middle items together in a series of 4 or more items in a list -->
     <string name="join_many_items_middle"><xliff:g id="added_item">%1$s</xliff:g>, <xliff:g id="rest_of_items">%2$s</xliff:g></string>
+    <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading after the app has tried to send to a premium SMS. [CHAR LIMIT=50] -->
+    <string name="security_settings_billing_desc">This app may charge you money:</string>
+    <!-- Manage applications, text for permission to send to premium SMS short codes. [CHAR LIMIT=40] -->
+    <string name="security_settings_premium_sms_desc">Send premium SMS</string>
     <string name="computing_size">Computing\u2026</string>
     <string name="invalid_size_value">Couldn\'t compute package size.</string>
     <!-- String displayed when list is empty -->
@@ -2582,6 +2843,11 @@
     <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling apps -->
     <string name="app_disable_dlg_text">If you disable a built-in app, other apps
         may misbehave.</string>
+    <!-- [CHAR LIMIT=NONE] Manage applications, title for dialog when disabling updated apps -->
+    <string name="app_special_disable_dlg_title">Delete data and disable app?</string>
+    <!-- [CHAR LIMIT=NONE] Manage applications, text for dialog when disabling update apps -->
+    <string name="app_special_disable_dlg_text">If you disable a built-in app, other apps
+        may misbehave.  Your data will also be deleted.</string>
     <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
     <string name="app_disable_notifications_dlg_title">Turn off notifications?</string>
     <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
@@ -2589,6 +2855,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 -->
@@ -2616,6 +2890,10 @@
     <string name="memory">RAM</string>
     <!-- Text to label a process entry with the process name. -->
     <string name="service_process_name"><xliff:g id="process">%1$s</xliff:g></string>
+    <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+    <string name="running_process_item_user_label">User: <xliff:g id="user_name">%1$s</xliff:g></string>
+    <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
+    <string name="running_process_item_removed_user_label">Removed user</string>
     <!-- Descriptive text of a running process: singular process, singular service. -->
     <string name="running_processes_item_description_s_s"><xliff:g id="numprocess">%1$d</xliff:g>
         process and <xliff:g id="numservices">%2$d</xliff:g> service</string>
@@ -2702,8 +2980,6 @@
     <string name="auto_punctuate_summary">Press Space key twice to insert \u0022.\u0022</string>
     <!-- On Security & location settings screen, setting check box name. Title of the checkbox to set whether password edit fields will show the most recent character typed and then hide it, or just hide it right away.  By hide, I mean mask it out. -->
     <string name="show_password">Make passwords visible</string>
-    <!-- On Security & location settings screen, setting check box summary. Summary for the visible passwords setting. -->
-    <string name="show_password_summary"></string>
     <!-- Warning message about security implications of enabling an input method, displayed as a dialog
          message when the user selects to enable an IME. -->
     <string name="ime_security_warning">This input method may be able to collect
@@ -2752,13 +3028,9 @@
     <string name="keyboard_layout_picker_title">Keyboard layouts</string>
 
     <!-- User dictionary settings --><skip />
-    <!-- User dictionary settings, The titlebar text of the User dictionary settings screen. -->
-    <string name="user_dict_settings_titlebar">User dictionary</string>
-    <!-- User dictionary settings, The title of the list item to go into the User dictionary settings screen when there is only one user dictionary. [CHAR LIMIT=35] -->
-    <string name="user_dict_single_settings_title">Personal dictionary</string>
-    <!-- User dictionary settings, The title of the list item to go into the User dictionary list when there are several user dictionaries. [CHAR LIMIT=35] -->
-    <string name="user_dict_multiple_settings_title">Personal dictionaries</string>
-    <!-- User dictionary settings.  The summary of the listem item to go into the User dictionary settings screen. -->
+    <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
+    <string name="user_dict_settings_title">Personal dictionary</string>
+    <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
     <string name="user_dict_settings_summary">""</string>
     <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
     <string name="user_dict_settings_add_menu_title">Add</string>
@@ -2778,6 +3050,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 -->
@@ -2865,13 +3141,37 @@
     <!-- 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 -->
+    <string name="bugreport_in_power_summary">Include option in power menu for taking a bug report</string>
     <!-- Setting Checkbox title whether to keep the screen on when plugged in to a power source -->
     <string name="keep_screen_on">Stay awake</string>
     <!-- setting Checkbox summary whether to keep the screen on when plugged in  -->
     <string name="keep_screen_on_summary">Screen will never sleep while charging</string>
+    <!-- Setting Checkbox title whether to enable bluetooth HCI snoop log -->
+    <string name="bt_hci_snoop_log">Enable Bluetooth HCI snoop log</string>
+    <!-- setting Checkbox summary whether to capture all bluetooth HCI packets in a file -->
+    <string name="bt_hci_snoop_log_summary">Capture all bluetooth HCI packets in a file</string>
+
+    <!-- Runtime selection title, used for debug purposes only. [CHAR LIMIT=25] -->
+    <string name="select_runtime_title">Select runtime </string>
+    <!-- Runtime selection dialog title, used for debug purposes only. [CHAR LIMIT=25] -->
+    <string name="select_runtime_dialog_title">Select runtime</string>
+    <!-- Message of dialog confirming that user wants to restart their device with a new runtime -->
+    <string name="select_runtime_warning_message">Reboot to change runtime from <xliff:g id="old" example="libdvm.so">%1$s</xliff:g> to <xliff:g id="new" example="libart.so">%2$s</xliff:g>?</string>
+
+    <!-- Setting Checkbox title whether to show options for wireless display certification -->
+    <string name="wifi_display_certification">Wireless display certification</string>
+    <!-- setting Checkbox summary whether to show options for wireless display certification  -->
+    <string name="wifi_display_certification_summary">Show options for wireless display certification</string>
     <!-- Setting Checkbox title whether to allow mock locations -->
     <string name="allow_mock_location">Allow mock locations</string>
     <!-- setting Checkbox summary whether to allow mock locations  -->
@@ -2880,10 +3180,16 @@
     <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 -->
     <string name="dev_settings_warning_message">These settings are intended for development use only.  They can cause your device and the applications on it to break or misbehave.</string>
+    <!-- Title of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=32] -->
+    <string name="verify_apps_over_usb_title">Verify apps over USB</string>
+    <!-- Summary of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=NONE] -->
+    <string name="verify_apps_over_usb_summary">Check apps installed via ADB/ADT for harmful behavior.</string>
 
     <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
     <string name="enforce_read_external_title" product="nosdcard">Protect USB storage</string>
@@ -2903,6 +3209,11 @@
     <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
     <string name="enforce_read_external_confirm_message" product="default">When SD card is protected, apps must request permission to read data from external storage.\n\nSome apps may not work until updated by their developers.</string>
 
+    <!-- Title of checkbox setting that enables the terminal app. [CHAR LIMIT=32] -->
+    <string name="enable_terminal_title">Local terminal</string>
+    <!-- Summary of checkbox setting that enables the terminal app. [CHAR LIMIT=64] -->
+    <string name="enable_terminal_summary">Enable terminal app that offers local shell access</string>
+
     <!-- Title for the screen that lets the user choose a gadget to add to the home screen
          (or other screens that can host gadgets).  Note to translators: we're still determining
          the final name for Gadgets/Widgets, so please translate both for now. -->
@@ -2934,6 +3245,15 @@
     <!-- Used to show an amount of time in the form "s seconds" in BatteryHistory -->
     <string name="battery_history_seconds"><xliff:g id="seconds">%1$d</xliff:g>s</string>
 
+    <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
+    <string name="battery_history_days_no_seconds"><xliff:g id="days">%1$d</xliff:g>d <xliff:g id="hours">%2$d</xliff:g>h <xliff:g id="minutes">%3$d</xliff:g>m</string>
+
+    <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
+    <string name="battery_history_hours_no_seconds"><xliff:g id="hours">%1$d</xliff:g>h <xliff:g id="minutes">%2$d</xliff:g>m</string>
+
+    <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
+    <string name="battery_history_minutes_no_seconds"><xliff:g id="minutes">%1$d</xliff:g>m</string>
+
     <!-- XXX remove? Strings used for displaying usage statistics -->
     <string name="usage_stats_label">Usage statistics</string>
 
@@ -2955,65 +3275,122 @@
     <string name="accessibility_settings">Accessibility</string>
     <!-- Settings title for accessibility settings screen -->
     <string name="accessibility_settings_title">Accessibility settings</string>
-
-    <!--  Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
+    <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
     <string name="accessibility_services_title">Services</string>
-
     <!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] -->
     <string name="accessibility_system_title">System</string>
+    <!-- Title for the accessibility preference screen to enable video captioning. [CHAR LIMIT=35] -->
+    <string name="accessibility_captioning_title">Captions</string>
+    <!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->
+    <string name="accessibility_screen_magnification_title">Magnification gestures</string>
+    <!-- Summary for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=none] -->
+    <string name="accessibility_screen_magnification_summary">When this feature is turned on, you can zoom in and out by triple-tapping the screen.\n\nWhile zoomed in, you can:\n<ul><li>Pan: Drag two or more fingers across the screen.</li>\n<li>Adjust zoom level: Pinch two or more fingers together or spread them apart.</li></ul>\n\nYou can also temporarily magnify what\'s under your finger by triple-tapping and holding. In this magnified state, you can drag your finger to explore different parts of the screen. Lift your finger to return to your previous state.\n\nNote: Triple-tap for magnification works everywhere except the keyboard and navigation bar.</string>
+    <!-- Title for the preference to enable the global geture that turns on accessibility. [CHAR LIMIT=35] -->
+    <string name="accessibility_global_gesture_preference_title">Accessibility shortcut</string>
+    <!-- Summary for the preference to enable the global geture that turns on accessibility (on state). [CHAR LIMIT=60] -->
+    <string name="accessibility_global_gesture_preference_summary_on">On</string>
+    <!-- Summary for the preference screen to enable the global geture that turns on accessibility (off state). [CHAR LIMIT=35] -->
+    <string name="accessibility_global_gesture_preference_summary_off">Off</string>
+    <!--  Description for the preference screen to enable the global geture taht turns on accessibility. [CHAR LIMIT=none] -->
+    <string name="accessibility_global_gesture_preference_description">When this feature is turned on, you can quickly enable accessibility features in two steps:\n\nStep 1: Press and hold the power button until you hear a sound or feel a vibration.\n\nStep 2: Touch and hold two fingers until you hear audio confirmation.\n\nIf the device has multiple users, using this shortcut on the lock screen temporarily enables accessibility until the device is unlocked.</string>
     <!-- Title for the accessibility preference to enable large text. [CHAR LIMIT=35] -->
-    <string name="accessibility_toggle_large_text_title">Large text</string>
+    <string name="accessibility_toggle_large_text_preference_title">Large text</string>
+    <!-- Title for the accessibility preference to enable screen magnification. [CHAR LIMIT=35] -->
+    <string name="accessibility_toggle_screen_magnification_preference_title">Screen magnification</string>
+    <!-- Title for the accessibility preference to auto update screen magnification. [CHAR LIMIT=35] -->
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title">Auto
+        update screen magnification</string>
+    <!-- Summary for the accessibility preference to auto update screen magnification. [CHAR LIMIT=50] -->
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary">Update
+        screen magnification on app transitions</string>
     <!-- Title for the accessibility preference to power button to end a call. [CHAR LIMIT=35] -->
-    <string name="accessibility_power_button_ends_call_title">Power button ends call</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title">Power button ends call</string>
     <!-- Title for the accessibility preference to speak passwords. [CHAR LIMIT=35] -->
-    <string name="accessibility_speak_password_title">Speak passwords</string>
+    <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_title">Touch &amp; hold delay</string>
-    <!-- Title for accessibility preference to install accessibility scripts from Google. [CHAR LIMIT=35] -->
-    <string name="accessibility_script_injection_title">Enhance web accessibility</string>
+    <string name="accessibility_long_press_timeout_preference_title">Touch &amp; hold delay</string>
 
     <!-- Title for accessibility menu item to lauch a settings activity. [CHAR LIMIT=15] -->
     <string name="accessibility_menu_item_settings">Settings</string>
 
-    <!-- Summary for the enabled state of an accessiblity serivce. [CHAR LIMIT=10] -->
-    <string name="accessibility_service_state_on">On</string>
-    <!-- Summary for the disabled state of an accessiblity serivce. [CHAR LIMIT=10] -->
-    <string name="accessibility_service_state_off">Off</string>
+    <!-- Summary for the enabled state of an accessibility feature. [CHAR LIMIT=10] -->
+    <string name="accessibility_feature_state_on">On</string>
+    <!-- Summary for the disabled state of an accessibility 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 preference category containing the video caption preview. [CHAR LIMIT=35] -->
+    <string name="captioning_preview_title">Preview</string>
+    <!-- Title for the preference catgeory containing standard video caption options. [CHAR LIMIT=35] -->
+    <string name="captioning_standard_options_title">Standard options</string>
+    <!-- Title for the preference to change video caption locale. [CHAR LIMIT=35] -->
+    <string name="captioning_locale">Language</string>
+    <!-- Title for the preference to change video caption text size. [CHAR LIMIT=35] -->
+    <string name="captioning_text_size">Text size</string>
+    <!-- Title for the preference category containing video caption property presets. [CHAR LIMIT=35] -->
+    <string name="captioning_preset">Caption style</string>
+    <!-- Title for the preference catgeory containing custom video caption properties. [CHAR LIMIT=35] -->
+    <string name="captioning_custom_options_title">Custom options</string>
+    <!-- Title for the preference to change video caption background color. [CHAR LIMIT=35] -->
+    <string name="captioning_background_color">Background color</string>
+    <!-- Title for the preference to change video caption background opacity. [CHAR LIMIT=35] -->
+    <string name="captioning_background_opacity">Background opacity</string>
+    <!-- Title for the preference to change video caption text color. [CHAR LIMIT=35] -->
+    <string name="captioning_foreground_color">Text color</string>
+    <!-- Title for the preference to change video caption edge color. [CHAR LIMIT=35] -->
+    <string name="captioning_edge_color">Edge color</string>
+    <!-- Title for the preference to change video caption edge type. [CHAR LIMIT=35] -->
+    <string name="captioning_edge_type">Edge type</string>
+    <!-- Title for the preference to change video caption font family (ex. monospace, sans-serif). [CHAR LIMIT=35] -->
+    <string name="captioning_typeface">Font family</string>
+    <!-- Sample text for previewing video caption preferences. [CHAR LIMIT=NONE] -->
+    <string name="captioning_preview_text">Captions will look like this</string>
+    <!-- Sample characters for previewing video caption preferences. [CHAR LIMIT=2] -->
+    <string name="captioning_preview_characters">Aa</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>
+    <!-- Label for the default device locale. [CHAR LIMIT=35] -->
+    <string name="locale_default">Default</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
+    <!-- Label for no color. [CHAR LIMIT=35] -->
+    <string name="color_none">None</string>
+    <!-- Label for the color white. [CHAR LIMIT=35] -->
+    <string name="color_white">White</string>
+    <!-- Label for the color gray. [CHAR LIMIT=35] -->
+    <string name="color_gray">Gray</string>
+    <!-- Label for the color black. [CHAR LIMIT=35] -->
+    <string name="color_black">Black</string>
+    <!-- Label for the color red. [CHAR LIMIT=35] -->
+    <string name="color_red">Red</string>
+    <!-- Label for the color green. [CHAR LIMIT=35] -->
+    <string name="color_green">Green</string>
+    <!-- Label for the color blue. [CHAR LIMIT=35] -->
+    <string name="color_blue">Blue</string>
+    <!-- Label for the color cyan. [CHAR LIMIT=35] -->
+    <string name="color_cyan">Cyan</string>
+    <!-- Label for the color yellow. [CHAR LIMIT=35] -->
+    <string name="color_yellow">Yellow</string>
+    <!-- Label for the color magenta. [CHAR LIMIT=35] -->
+    <string name="color_magenta">Magenta</string>
+    <!-- Label for custom colors, formats as a HTML color. -->
+    <string name="color_custom" translatable="false">#%1$02X%2$02X%3$02X</string>
+
+    <!-- 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] -->
@@ -3028,17 +3405,97 @@
          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>
 
     <!-- Accessibility settings: button for lauching settings for an accessibility service -->
     <string name="settings_button">Settings</string>
 
+     <!-- Printing settings -->
+    <skip />
+
+    <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
+    <string name="print_settings">Printing</string>
+    <!-- Title for print service settings screen [CHAR LIMIT=25] -->
+    <string name="print_settings_title">Print services</string>
+
+    <!-- Title for a warning message about security implications of enabling a print service,
+         displayed as a dialog message when the user selects to enable a print service (tablet). [CHAR LIMIT=NONE] -->
+    <string name="print_service_security_warning_title">Use
+         <xliff:g id="service" example="My Print Service">%1$s</xliff:g>?</string>
+    <!-- Summary for a warning message about security implications of enabling a print service,
+         displayed as a dialog message when the user selects to enable a print service. [CHAR LIMIT=NONE] -->
+    <string name="print_service_security_warning_summary">Your document may pass through
+        one or more servers on its way to the printer.</string>
+
+    <!-- Title for the prompt shown as a placeholder if no print serivices are installed. [CHAR LIMIT=50] -->
+    <string name="print_no_services_installed">No services installed</string>
+
+    <!-- Title for the prompt shown as a placeholder if no printers are found while searching. [CHAR LIMIT=50] -->
+    <string name="print_no_printers_found">No printers found</string>
+
+    <!-- Title for print menu item to launch a settings activity. [CHAR LIMIT=25] -->
+    <string name="print_menu_item_settings">Settings</string>
+
+    <!-- Title for print menu item to launch the add printers activity. [CHAR LIMIT=25] -->
+    <string name="print_menu_item_add_printers">Add printers</string>
+
+    <!-- Summary for the enabled state of a print feature. [CHAR LIMIT=10] -->
+    <string name="print_feature_state_on">On</string>
+    <!-- Summary for the disabled state of a print feature. [CHAR LIMIT=10] -->
+    <string name="print_feature_state_off">Off</string>
+
+    <!-- Title of the action bar button to got to Play Store to download a print service. [CHAR LIMIT=25] -->
+    <string name="print_menu_item_add_service">Add service</string>
+
+    <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+    <string name="print_menu_item_add_printer">Add printer</string>
+
+    <!-- Title for the search action bar menu item. [CHAR LIMIT=20] -->
+    <string name="print_menu_item_search">Search</string>
+
+    <!-- Title for the prompt if no printers are available and the system is searching for such. [CHAR LIMIT=50] -->
+    <string name="print_searching_for_printers">Searching for printers</string>
+
+    <!-- Title for the prompt if no printers are available because the print service is disabled. [CHAR LIMIT=50] -->
+    <string name="print_service_disabled">Service disabled</string>
+
+    <!-- Title for the menu item to open the print jobs screen. [CHAR LIMIT=25] -->
+    <string name="print_print_jobs">Print jobs</string>
+
+    <!-- Title for the print job settings screen. [CHAR LIMIT=25] -->
+    <string name="print_print_job">Print job</string>
+
+    <!-- Title for the button to restart a print job. [CHAR LIMIT=25] -->
+    <string name="print_restart">Restart</string>
+
+    <!-- Title for the button to cancel a print job. [CHAR LIMIT=25] -->
+    <string name="print_cancel">Cancel</string>
+
+    <!-- Template for the summary of a print job. [CHAR LIMIT=25] -->
+    <string name="print_job_summary"><xliff:g id="printer">%1$s</xliff:g>\n<xliff:g id="time">%2$s</xliff:g></string>
+
+    <!-- Template for the label of the state for a ongoing print job. [CHAR LIMIT=25] -->
+    <string name="print_printing_state_title_template">Printing <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string>
+
+    <!-- Template for the label of the state for a failed print job. [CHAR LIMIT=25] -->
+    <string name="print_failed_state_title_template">Printer error <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string>
+
+    <!-- Template for the label of the state for a blocked print job. [CHAR LIMIT=25] -->
+    <string name="print_blocked_state_title_template">Printer blocked <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string>
+
+    <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+    <string name="print_search_box_shown_utterance">Search box shown</string>
+
+    <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+    <string name="print_search_box_hidden_utterance">Search box hidden</string>
+
+    <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+    <plurals name="print_search_result_count_utterance">
+        <item quantity="one"><xliff:g id="count" example="1">%1$s</xliff:g> printer found</item>
+        <item quantity="other"><xliff:g id="count" example="2">%1$s</xliff:g> printers found</item>
+    </plurals>
+
     <!-- App Fuel Gauge strings -->
     <skip />
 
@@ -3065,7 +3522,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 -->
@@ -3075,9 +3532,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>
@@ -3097,7 +3554,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 -->
@@ -3118,15 +3575,19 @@
     <!-- 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 -->
     <string name="usage_type_phone" product="default">Phone</string>
-    <!-- Label for Data sent -->
-    <string name="usage_type_data_send">Data sent</string>
-    <!-- Label for Data received -->
-    <string name="usage_type_data_recv">Data received</string>
+    <!-- Label for mobile network data sent [CHAR LIMIT=32] -->
+    <string name="usage_type_data_send">Mobile data sent</string>
+    <!-- Label for mobile network data received [CHAR LIMIT=32] -->
+    <string name="usage_type_data_recv">Mobile data received</string>
+    <!-- Label for Wi-Fi network data sent [CHAR LIMIT=32] -->
+    <string name="usage_type_data_wifi_send">Wi\u2011Fi data sent</string>
+    <!-- Label for Wi-Fi network data received [CHAR LIMIT=32] -->
+    <string name="usage_type_data_wifi_recv">Wi\u2011Fi data received</string>
     <!-- Label for Audio usage time -->
     <string name="usage_type_audio">Audio</string>
     <!-- Label for Video usage time -->
@@ -3144,7 +3605,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>
 
@@ -3167,9 +3628,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>
@@ -3183,10 +3644,13 @@
     <!-- Suggestion for exploring application info to stop or uninstall -->
     <string name="battery_sugg_apps_info">Stop or uninstall the app</string>
     <!-- [CHAR LIMIT=100] Suggestion for getting apps to consume less power due to GPS-->
-    <string name="battery_sugg_apps_gps">"Manually control GPS to prevent app from using it"</string>
+    <string name="battery_sugg_apps_gps">Select battery-saving mode</string>
     <!-- Suggestion for getting apps to consume less power -->
     <string name="battery_sugg_apps_settings">The app may offer settings to reduce battery use</string>
 
+    <!-- [CHAR LIMIT=50] Description for power consumed by users -->
+    <string name="battery_desc_users">Battery used by user</string>
+
     <!-- Menu label for viewing battery usage since unplugged -->
     <string name="menu_stats_unplugged"><xliff:g id="unplugged">%1$s</xliff:g> since unplugged</string>
     <!-- Menu label for viewing battery usage since unplugged -->
@@ -3201,6 +3665,59 @@
     <!-- Label for mediaserver process -->
     <string name="process_mediaserver_label">Mediaserver</string>
 
+    <!-- Process Stats strings -->
+    <skip />
+
+    <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
+    <string name="process_stats_summary_title">Process Stats</string>
+    <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
+    <string name="process_stats_summary">Geeky stats about running processes</string>
+    <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
+    <string name="app_memory_use">Memory use</string>
+    <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over -->
+    <string name="process_stats_total_duration"><xliff:g id="type">%1$s</xliff:g> apps over
+        <xliff:g id="time">%2$s</xliff:g></string>
+    <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+    <string name="process_stats_type_background">Background</string>
+    <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+    <string name="process_stats_type_foreground">Foreground</string>
+    <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+    <string name="process_stats_type_cached">Cached</string>
+    <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over -->
+    <string name="process_stats_memory_status">Device memory is currently
+        <xliff:g id="memstate">%1$s</xliff:g></string>
+    <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
+    <string name="process_stats_avg_ram_use">Average RAM use</string>
+    <!-- [CHAR LIMIT=NONE] Label for item showing details of maximum RAM use -->
+    <string name="process_stats_max_ram_use">Maximum RAM use</string>
+    <!-- [CHAR LIMIT=NONE] Label for item showing percent of time spent running -->
+    <string name="process_stats_run_time">Run time</string>
+    <!-- [CHAR LIMIT=NONE] Subtitle for process stats services list -->
+    <string name="services_subtitle">Services</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to select duration of stats to show -->
+    <string name="menu_proc_stats_duration">Duration</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+    <string name="menu_duration_3h">3 hours</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+    <string name="menu_duration_6h">6 hours</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+    <string name="menu_duration_12h">12 hours</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+    <string name="menu_duration_1d">1 day</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether system processes are shown -->
+    <string name="menu_show_system">Show system</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether computation should be based
+        on Uss (Unique Set Size) instead of Pss (Proportional Set Size) -->
+    <string name="menu_use_uss">Use Uss</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to select which type of stats to show -->
+    <string name="menu_proc_stats_type">Stats type</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on background processes -->
+    <string name="menu_proc_stats_type_background">Background</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
+    <string name="menu_proc_stats_type_foreground">Foreground</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
+    <string name="menu_proc_stats_type_cached">Cached</string>
+
     <!-- Voice input/output settings --><skip />
     <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
     <string name="voice_input_output_settings">Voice input &amp; output</string>
@@ -3243,8 +3760,11 @@
     <string name="tts_default_pitch_title">Pitch</string>
     <!-- On main TTS Settings screen, summary for default pitch for synthesized voice -->
     <string name="tts_default_pitch_summary">Affects the tone of the spoken text</string>
+
     <!-- On main TTS Settings screen, in default settings section, setting default language for synthesized voice -->
     <string name="tts_default_lang_title">Language</string>
+    <!-- On main TTS Settings screen, language summary if it can't default to system language [CHAR LIMIT=50] -->
+    <string name="tts_lang_not_selected">Language not selected</string>
     <!-- On main TTS Settings screen, summary for default language for synthesized voice -->
     <string name="tts_default_lang_summary">Sets the language-specific voice for the spoken text</string>
     <!-- On main TTS Settings screen, triggers playback of an example of speech synthesis -->
@@ -3271,6 +3791,26 @@
     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>
+    <!-- Text spoken by the TTS engine as an example if the engine doesn't provide sample text [CHAR LIMIT=100] -->
+    <string name="tts_default_sample_string">This is an example of speech synthesis</string>
+    <!-- On main TTS Settings screen, title of a field explaining current TTS engine status for
+	 current default language [CHAR LIMIT=50] -->
+    <string name="tts_status_title">Default language status</string>
+    <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is fully supported by the engine [CHAR LIMIT=150]-->
+    <string name="tts_status_ok"><xliff:g id="locale" example="English (United States)">%1$s</xliff:g> is fully supported</string>
+    <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is supported by the engine only if there's a working network connection [CHAR LIMIT=150] -->
+    <string name="tts_status_requires_network"><xliff:g id="locale" example="English (United States)">%1$s</xliff:g> requires network connection</string>
+    <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is not supported by the engine [CHAR LIMIT=150] -->
+    <string name="tts_status_not_supported"><xliff:g id="locale" example="English (United States)">%1$s</xliff:g> is not supported</string>
+    <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+	 tts engine is queried for status [CHAR LIMIT=150] -->
+    <string name="tts_status_checking">Checking...</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 -->
@@ -3315,8 +3855,36 @@
 
     <!-- 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\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. -->
+    <string name="gadget_state_off">off</string>
+    <!-- Gadget value used to describe turning on state. -->
+    <string name="gadget_state_turning_on">turning on</string>
+    <!-- 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\u2011Fi</string>
+    <!-- Spoken description for the Bluetooth power control gadget. -->
+    <string name="gadget_bluetooth">Bluetooth</string>
+    <!-- Spoken description for the Location power control gadget. -->
+    <string name="gadget_location">Location</string>
+    <!-- Spoken description for the data synchronization gadget. -->
+    <string name="gadget_sync">Sync</string>
+    <!-- Template for brightness gadget toggle button description. -->
+    <string name="gadget_brightness_template">Brightness <xliff:g name="state" example="half">%1$s</xliff:g></string>
+    <!-- Brightness gadget value used to describe automatic brightness state. -->
+    <string name="gadget_brightness_state_auto">auto</string>
+    <!-- Brightness gadget value used to describe maximum brightness state. -->
+    <string name="gadget_brightness_state_full">full</string>
+    <!-- Brightness gadget value used to describe half brightness state. -->
+    <string name="gadget_brightness_state_half">half</string>
+    <!-- Brightness gadget value used to describe minimum brightness state. -->
+    <string name="gadget_brightness_state_off">off</string>
 
     <!-- Title of preference to enter the VPN settings activity -->
     <string name="vpn_settings_title">VPN</string>
@@ -3339,6 +3907,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>
@@ -3386,7 +3960,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]-->
@@ -3396,16 +3970,6 @@
     <!-- Summary text of the "automatic restore" setting -->
     <string name="auto_restore_summary">When reinstalling an app, restore backed up settings and data</string>
 
-    <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
-    <string name="bugreport_title">Take bug report</string>
-    <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
-    <string name="bugreport_message">This will collect information about your
-        current device state, to send as an e-mail message.  It will take a little
-        time from starting the bug report until it is ready to be sent; please be
-        patient.</string>
-    <!-- Button in bugreport dialog to confirm starting the report [CHAR LIMIT=NONE] -->
-    <string name="report">Report</string>
-
     <!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->
     <string name="local_backup_password_title">Desktop backup password</string>
     <!-- Summary text of the "local backup password" setting when the user has not supplied a password -->
@@ -3423,7 +3987,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 -->
@@ -3468,22 +4032,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] -->
@@ -3559,11 +4123,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>
@@ -3663,8 +4227,7 @@
     <!-- Messaage shown in dialog when you can't manually sync -->
     <string name="cant_sync_dialog_message">Sync for this item is currently disabled. To change this setting, temporarily turn on background data and automatic sync.</string>
 
-    <string name="wimax_settings">4G settings</string>
-    <string name="wimax_settings_summary">Set up &amp; manage 4G network and modem</string>
+    <string name="wimax_settings">4G</string>
     <string name="status_wimax_mac_address">4G MAC address</string>
     <!-- This is displayed to the user when the device needs to be decrypted -->
     <string name="enter_password">Type password to decrypt storage</string>
@@ -3715,6 +4278,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>
 
@@ -3744,28 +4310,32 @@
     <!-- UI debug setting: show GPU rendering screen updates summary [CHAR LIMIT=50] -->
     <string name="show_hw_screen_updates_summary">Flash views inside windows when drawn with the GPU</string>
 
+    <!-- UI debug setting: show when hardware layers get updated [CHAR LIMIT=25] -->
+    <string name="show_hw_layers_updates">Show hardware layers updates</string>
+    <!-- UI debug setting: show hardware layers updates summary [CHAR LIMIT=50] -->
+    <string name="show_hw_layers_updates_summary">Flash hardware layers green when they update</string>
+
+    <!-- UI debug setting: show the amount of overdraw in apps using the GPU [CHAR LIMIT=25] -->
+    <string name="debug_hw_overdraw">Debug GPU overdraw</string>
+
     <!-- UI debug setting: disable use of overlays? [CHAR LIMIT=25] -->
     <string name="disable_overlays">Disable HW overlays</string>
     <!-- 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>
 
     <!-- UI debug setting: show layout bounds information [CHAR LIMIT=25] -->
     <string name="debug_layout">Show layout bounds</string>
     <!-- UI debug setting: show layout bounds information summary [CHAR LIMIT=50] -->
     <string name="debug_layout_summary">Show clip bounds, margins, etc.</string>
 
+    <!-- UI debug setting: force right to left layout [CHAR LIMIT=37] -->
+    <string name="force_rtl_layout_all_locales">Force RTL layout direction</string>
+    <!-- UI debug setting: force right to left layout summary [CHAR LIMIT=100] -->
+    <string name="force_rtl_layout_all_locales_summary">Force screen layout direction to RTL for all locales</string>
+
     <!-- UI debug setting: show how CPU is being used? [CHAR LIMIT=25] -->
     <string name="show_cpu_usage">Show CPU usage</string>
     <!-- UI debug setting: show cpu usage summary [CHAR LIMIT=50] -->
@@ -3776,10 +4346,16 @@
     <!-- UI debug setting: force hardware acceleration summary [CHAR LIMIT=50] -->
     <string name="force_hw_ui_summary">Force use of GPU for 2d drawing</string>
 
+    <!-- UI debug setting: force anti-aliasing to render apps [CHAR LIMIT=25] -->
+    <string name="force_msaa">Force 4x MSAA</string>
+    <!-- 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>
@@ -3790,6 +4366,9 @@
     <!-- UI debug setting: scaling factor for all Animator-based animations [CHAR LIMIT=25] -->
     <string name="animator_duration_scale_title">Animator duration scale</string>
 
+    <!-- UI debug setting: simulate secondary display devices using overlays [CHAR LIMIT=25] -->
+    <string name="overlay_display_devices_title">Simulate secondary displays</string>
+
     <!-- Preference category for application debugging development settings. [CHAR LIMIT=25] -->
     <string name="debug_applications_category">Apps</string>
 
@@ -3819,7 +4398,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] -->
@@ -3850,10 +4429,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] -->
@@ -3922,7 +4501,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\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\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>
@@ -3931,6 +4514,8 @@
 
     <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
     <string name="data_usage_uninstalled_apps">Removed apps</string>
+    <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+    <string name="data_usage_uninstalled_apps_users">Removed apps and users</string>
     <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
     <string name="data_usage_received_sent"><xliff:g id="received" example="128KB">%1$s</xliff:g> received, <xliff:g id="sent" example="1.3GB">%2$s</xliff:g> sent</string>
     <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
@@ -3944,13 +4529,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>
@@ -4017,6 +4602,15 @@
     <string name="vpn_menu_edit">Edit profile</string>
     <!-- Menu item to delete a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_menu_delete">Delete profile</string>
+    <!-- Menu item to select always-on VPN profile. [CHAR LIMIT=40] -->
+    <string name="vpn_menu_lockdown">Always-on VPN</string>
+
+    <!-- Summary describing the always-on VPN feature. [CHAR LIMIT=NONE] -->
+    <string name="vpn_lockdown_summary">Select a VPN profile to always remain connected to. Network traffic will only be allowed when connected to this VPN.</string>
+    <!-- List item indicating that no always-on VPN is selected. [CHAR LIMIT=64] -->
+    <string name="vpn_lockdown_none">None</string>
+    <!-- Error indicating that the selected VPN doesn't meet requirements. [CHAR LIMIT=NONE] -->
+    <string name="vpn_lockdown_config_error">Always-on VPN requires an IP address for both server and DNS.</string>
 
     <!-- Toast message when there is no network connection to start VPN. [CHAR LIMIT=100] -->
     <string name="vpn_no_network">There is no network connection. Please try again later.</string>
@@ -4068,45 +4662,153 @@
     <string name="selinux_status_permissive">Permissive</string>
     <string name="selinux_status_enforcing">Enforcing</string>
 
+    <!-- Notification of installed CA Certs --> <skip/>
+
+    <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+    <string name="ssl_ca_cert_warning">Network may be monitored</string>
+    <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
+    <string name="done_button">Done</string>
+    <!-- Title of Dialog warning users of SSL monitoring. [CHAR LIMIT=NONE] -->
+    <string name="ssl_ca_cert_dialog_title">Network monitoring</string>
+    <!-- Text of message to show to users whose administrator has installed a SSL CA Cert.  [CHAR LIMIT=NONE] -->
+    <string name="ssl_ca_cert_info_message">This device is managed by:\n<xliff:g id="managing_domain">%s</xliff:g>\n\nYour administrator is capable of monitoring your network activity, including emails, apps, and secure websites.\n\nFor more information, contact your administrator.</string>
+    <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
+    <string name="ssl_ca_cert_warning_message">A third party is capable of monitoring your network\nactivity, including emails, apps, and secure websites.\n\nA trusted credential installed on your device is making this possible.</string>
+    <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
+    <string name="ssl_ca_cert_settings_button">Check trusted credentials</string>
+
     <!-- User settings -->
     <skip/>
 
     <!-- User settings screen title [CHAR LIMIT=25] -->
-    <string name="user_settings_title">Users &amp; restrictions</string>
-    <!-- User settings user list section header [CHAR LIMIT=30] -->
-    <string name="user_list_title">Users</string>
-    <!-- User settings add user menu [CHAR LIMIT=20] -->
-    <string name="user_add_user_menu">Add user</string>
+    <string name="user_settings_title">Users</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\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] -->
+    <string name="user_setup_button_setup_later">Not now</string>
+    <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
+    <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 -->
-    <skip/>
-
-    <!-- User details screen title [CHAR LIMIT=25] -->
-    <string name="user_details_title">Edit details</string>
-    <!-- User information section title [CHAR LIMIT=30] -->
-    <string name="user_information_heading">User information</string>
-    <!-- User name title [CHAR LIMIT=25] -->
-    <string name="user_name_title">Name</string>
-    <!-- User restrictions section title [CHAR LIMIT=30] -->
-    <string name="user_restrictions_heading">Content restrictions</string>
-    <!-- User restrictions, does market require PIN protection [CHAR LIMIT=30] -->
-    <string name="user_market_requires_pin">Require PIN</string>
-    <!-- User restrictions, maximum content rating for apps [CHAR LIMIT=25] -->
-    <string name="user_max_content_rating">Content rating</string>
-    <!-- Section title for list of system apps [CHAR LIMIT=30] -->
-    <string name="user_system_apps_heading">System apps</string>
-    <!-- Section title for list of downloaded apps [CHAR LIMIT=30] -->
-    <string name="user_market_apps_heading">Installed apps</string>
-    <!-- User details discard user menu [CHAR LIMIT=20] -->
-    <string name="user_discard_user_menu">Discard</string>
     <!-- User details remove user menu [CHAR LIMIT=20] -->
-    <string name="user_remove_user_menu">Remove user</string>
+    <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">Pesky kid</string>
+    <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] -->
+    <string name="user_confirm_remove_self_message" product="default">You will lose your space and data on this phone. You can\'t undo this action.</string>
     <!-- User removal confirmation message [CHAR LIMIT=none] -->
-    <string name="user_confirm_remove_message">Are you sure you want to remove the user and all associated data from the device?</string>
+    <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] -->
+    <string name="user_delete_user_description">Delete user</string>
+    <!-- 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>
+
+    <!-- Home application selection - uninstall button [CHAR LIMIT=80] -->
+    <string name="home_app_uninstall_button">Uninstall this application</string>
+    <!-- Message to user that Home Settings will be hidden because there is now only one available home application -->
+    <string name="only_one_home_message">Home settings will be hidden until you install another home 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] -->
+    <string name="global_change_warning" product="default">This setting affects all users on this phone.</string>
+    <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
+    <string name="global_locale_change_title">Change language</string>
+    <!-- Warning message title for global font change [CHAR LIMIT=40] -->
+    <string name="global_font_change_title">Change font size</string>
+
+    <!-- NFC payment settings --><skip/>
+    <string name="nfc_payment_settings_title">Tap &amp; pay</string>
+    <!-- String shown when there are no NFC payment applications installed -->
+    <string name="nfc_payment_no_apps">Pay with just a tap</string>
+    <!-- String shown when there are no NFC payment applications installed, clickable, pointing to
+         a website to learn more-->
+    <string name="nfc_payment_learn_more">Learn more</string>
+    <string name="nfc_payment_menu_item_add_service">Find apps</string>
+    <!-- Label for the dialog that is shown when the user is asked to set a
+         preferred payment application -->
+    <string name="nfc_payment_set_default_label">Set as your preference?</string>
+    <string name="nfc_payment_set_default">Always use <xliff:g id="app">%1$s</xliff:g> when you tap &amp; pay?</string>
+    <string name="nfc_payment_set_default_instead_of">Always use <xliff:g id="app">%1$s</xliff:g> instead of <xliff:g id="app">%2$s</xliff:g> when you tap &amp; pay?</string>
+    <!-- Restrictions settings --><skip/>
+
+    <!-- Restriction settings title [CHAR LIMIT=35] -->
+    <string name="restriction_settings_title">Restrictions</string>
+    <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
+    <string name="restriction_menu_reset">Remove restrictions</string>
+    <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
+    <string name="restriction_menu_change_pin">Change PIN</string>
 
     <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
     <string name="app_notifications_switch_label">Show notifications</string>
@@ -4136,9 +4838,69 @@
     <string name="help_url_backup_reset" translatable="false"></string>
     <!-- Help URL, Tethering [DO NOT TRANSLATE] -->
     <string name="help_url_tether" translatable="false"></string>
+    <!-- Help URL, Dreams [DO NOT TRANSLATE] -->
+    <string name="help_url_dreams" translatable="false"></string>
+    <!-- Help URL, User settings [DO NOT TRANSLATE] -->
+    <string name="help_url_users" translatable="false"></string>
+    <!-- Help URL, Location access [DO NOT TRANSLATE] -->
+    <string name="help_url_location_access" translatable="false"></string>
+    <!-- Help URL, Security settings [DO NOT TRANSLATE] -->
+    <string name="help_url_security" translatable="false"></string>
+    <!-- Help URL, Tap & pay [DO NOT TRANSLATE] -->
+    <string name="help_url_nfc_payment" translatable="false"></string>
+
+    <!-- User account title [CHAR LIMIT=30] -->
+    <string name="user_account_title">Account for content</string>
+    <!-- User picture title [CHAR LIMIT=30] -->
+    <string name="user_picture_title">Photo ID</string>
 
     <!-- Cell Broadcast settings title [CHAR LIMIT=50] -->
     <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 app restrictions</string>
+    <!-- Summary for app entries that are controlled by another entry [CHAR LIMIT=none] -->
+    <string name="user_restrictions_controlled_by">Controlled by <xliff:g id="app">%1$s</xliff:g></string>
+    <!-- Summary for apps that aren't supported in limited users [CHAR LIMIT=none] -->
+    <string name="app_not_supported_in_limited">This app is not supported in restricted profiles</string>
+    <!-- Summary text for apps that are allowed to access accounts from the primary user [CHAR LIMIT=none] -->
+    <string name="app_sees_restricted_accounts">This app can access your accounts</string>
+
+    <!-- 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</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 42f2837..eee2cd9 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -20,7 +20,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:textAppearance">@style/TextAppearance.info_label</item>
-        <item name="android:paddingRight">4dip</item>
+        <item name="android:paddingEnd">4dip</item>
     </style>
 
     <style name="info_value">
@@ -37,9 +37,9 @@
 
     <style name="info_layout">
         <item name="android:orientation">vertical</item>
-        <item name="android:paddingLeft">10dip</item>
+        <item name="android:paddingStart">10dip</item>
         <item name="android:paddingTop">10dip</item>
-        <item name="android:paddingRight">10dip</item>
+        <item name="android:paddingEnd">10dip</item>
         <item name="android:paddingBottom">10dip</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
@@ -82,8 +82,47 @@
     <style name="Theme.CreateShortCut" parent="android:Theme.Holo.DialogWhenLarge">
     </style>
 
-    <style name="setup_wizard_theme" parent="android:Theme.Holo.NoActionBar">
-        <item name="android:windowSoftInputMode">adjustPan</item>
+    <style name="PreferenceHeaderPanelSinglePane">
+        <item name="android:layout_marginStart">0dp</item>
+        <item name="android:layout_marginEnd">0dp</item>
+        <item name="android:background">@null</item>
+    </style>
+
+    <style name="PreferencePanelSinglePane" parent="@*android:style/PreferencePanel">
+        <item name="android:layout_marginStart">0dp</item>
+        <item name="android:layout_marginEnd">0dp</item>
+        <item name="android:paddingStart">0dp</item>
+        <item name="android:paddingEnd">0dp</item>
+        <item name="android:background">@null</item>
+        <item name="android:scrollbarStyle">outsideOverlay</item>
+    </style>
+
+    <style name="PreferenceHeaderListSinglePane" parent="@*android:style/PreferenceHeaderList">
+        <item name="android:paddingStart">@dimen/settings_side_margin</item>
+        <item name="android:paddingEnd">@dimen/settings_side_margin</item>
+        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingBottom">0dp</item>
+        <item name="android:layout_marginStart">0dp</item>
+        <item name="android:layout_marginEnd">0dp</item>
+        <item name="android:layout_marginTop">0dp</item>
+        <item name="android:layout_marginBottom">0dp</item>
+        <item name="android:scrollbarStyle">outsideOverlay</item>
+    </style>
+
+    <style name="PreferenceFragmentListSinglePane" parent="@*android:style/PreferenceFragmentList">
+        <item name="android:paddingStart">@dimen/settings_side_margin</item>
+        <item name="android:paddingEnd">@dimen/settings_side_margin</item>
+        <item name="android:layout_marginStart">0dp</item>
+        <item name="android:layout_marginEnd">0dp</item>
+        <item name="android:scrollbarStyle">outsideOverlay</item>
+    </style>
+
+    <style name="VertDivider">
+        <item name="android:layout_width">@dimen/vert_divider_width</item>
+        <item name="android:layout_height">fill_parent</item>
+        <item name="android:background">@color/divider_color</item>
+        <item name="android:focusable">false</item>
+        <item name="android:clickable">false</item>
     </style>
 
     <!-- We'd like to have this as 16dip hight including paddingTop/paddingBottom to
@@ -91,7 +130,7 @@
     <style name="TopDivider">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">@dimen/divider_height</item>
-        <item name="android:background">@color/setup_divider_color</item>
+        <item name="android:background">?attr/setup_divider_color</item>
         <item name="android:focusable">false</item>
         <item name="android:clickable">false</item>
         <item name="android:layout_marginTop">@dimen/divider_margin_top</item>
@@ -110,22 +149,30 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">8dip</item>
-        <item name="android:layout_marginLeft">16dip</item>
-        <item name="android:layout_marginRight">16dip</item>
+        <item name="android:layout_marginStart">16dip</item>
+        <item name="android:layout_marginEnd">16dip</item>
         <item name="android:orientation">vertical</item>
-        <item name="android:gravity">left</item>
+        <item name="android:gravity">start</item>
     </style>
 
     <style name="wifi_item_label">
         <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">
@@ -190,4 +237,15 @@
         <item name="android:textAllCaps">true</item>
         <item name="android:textStyle">bold</item>
     </style>
+
+    <style name="KeyguardAppWidgetItem">
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <!-- Scrollbar style OUTSIDE_OVERLAY -->
+    <integer name="preference_scrollbar_style">33554432</integer>
+
+    <style name="ApnPreference">
+        <item name="android:layout">@layout/apn_preference_layout</item>
+    </style>
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index b5f8f64..a87ad33 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -15,8 +15,61 @@
 -->
 
 <resources>
+    <attr name="ic_menu_add" format="reference" />
+    <attr name="ic_menu_moreoverflow" format="reference" />
+    <attr name="ic_wps" format="reference" />
+    <attr name="setup_divider_color" format="reference" />
+    <attr name="wifi_signal" format="reference" />
+
+    <style name="SetupWizardWifiTheme" parent="android:Theme.Holo.NoActionBar">
+        <item name="android:windowSoftInputMode">adjustPan</item>
+        <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
+        <item name="android:alertDialogTheme">@style/Theme.WifiDialog</item>
+        <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
+        <item name="ic_wps">@drawable/ic_wps_dark</item>
+        <item name="setup_divider_color">@color/setup_divider_color_dark</item>
+        <item name="wifi_signal">@drawable/wifi_signal_dark</item>
+    </style>
+
+    <style name="SetupWizardWifiTheme.Light" parent="android:Theme.Holo.Light.NoActionBar">
+        <item name="android:windowSoftInputMode">adjustPan</item>
+        <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
+        <item name="android:alertDialogTheme">@style/Theme.Light.WifiDialog</item>
+        <item name="ic_menu_add">@drawable/ic_menu_add_light</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_light</item>
+        <item name="ic_wps">@drawable/ic_wps_light</item>
+        <item name="setup_divider_color">@color/setup_divider_color_light</item>
+        <item name="wifi_signal">@drawable/wifi_signal_light</item>
+    </style>
 
     <style name="Theme.WifiDialog" parent="@*android:style/Theme.Holo.Dialog.Alert">
         <item name="android:windowSoftInputMode">adjustResize</item>
+        <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
+        <item name="ic_wps">@drawable/ic_wps_dark</item>
+        <item name="wifi_signal">@drawable/wifi_signal_dark</item>
+    </style>
+
+    <style name="Theme.Light.WifiDialog" parent="@*android:style/Theme.Holo.Light.Dialog.Alert">
+        <item name="android:windowSoftInputMode">adjustResize</item>
+        <item name="ic_menu_add">@drawable/ic_menu_add_light</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_light</item>
+        <item name="ic_wps">@drawable/ic_wps_light</item>
+        <item name="wifi_signal">@drawable/wifi_signal_light</item>
+    </style>
+
+    <style name="Theme.Settings" parent="@android:style/Theme.Holo">
+        <item name="@*android:preferenceHeaderPanelStyle">@style/PreferenceHeaderPanelSinglePane</item>
+        <item name="@*android:preferencePanelStyle">@style/PreferencePanelSinglePane</item>
+        <item name="@*android:preferenceListStyle">@style/PreferenceHeaderListSinglePane</item>
+        <item name="@*android:preferenceFragmentListStyle">@style/PreferenceFragmentListSinglePane</item>
+        <item name="@*android:preferenceFragmentPaddingSide">@dimen/settings_side_margin</item>
+        <item name="apnPreferenceStyle">@style/ApnPreference</item>
+        <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
+        <item name="ic_wps">@drawable/ic_wps_dark</item>
+        <item name="wifi_signal">@drawable/wifi_signal_dark</item>
+        <item name="android:actionBarStyle">@android:style/Widget.Holo.ActionBar.Solid</item>
     </style>
 </resources>
diff --git a/res/xml-ar/timezones.xml b/res/xml-ar/timezones.xml
deleted file mode 100644
index 137b153..0000000
--- a/res/xml-ar/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">ماجورو</timezone>
-    <timezone id="Pacific/Midway">ميدواي</timezone>
-    <timezone id="Pacific/Honolulu">هونولولو</timezone>
-    <timezone id="America/Anchorage">أنشوراج</timezone>
-    <timezone id="America/Los_Angeles">لوس انجلوس</timezone>
-    <timezone id="America/Tijuana">تيخوانا</timezone>
-    <timezone id="America/Phoenix">فينكس</timezone>
-    <timezone id="America/Chihuahua">تشيواوا</timezone>
-    <timezone id="America/Denver">دنفر</timezone>
-    <timezone id="America/Costa_Rica">Costa Rica</timezone>
-    <timezone id="America/Chicago">شيكاغو</timezone>
-    <timezone id="America/Mexico_City">مدينة المكسيك</timezone>
-    <timezone id="America/Regina">ريجينا</timezone>
-    <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">نيويورك</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Barbados</timezone>
-    <timezone id="America/Halifax">هاليفاكس</timezone>
-    <timezone id="America/Manaus">ماناوس</timezone>
-    <timezone id="America/Santiago">سانتيجو</timezone>
-    <timezone id="America/St_Johns">سانت جونس</timezone>
-    <timezone id="America/Sao_Paulo">ساو باولو</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">بوينوس أيرس</timezone>
-    <timezone id="America/Godthab">جودثاب</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
-    <timezone id="Atlantic/Azores">أزورس</timezone>
-    <timezone id="Atlantic/Cape_Verde">Cape Verde</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">لندن</timezone>
-    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
-    <timezone id="Europe/Belgrade">صربيا</timezone>
-    <timezone id="Europe/Brussels">Brussels</timezone>
-    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
-    <timezone id="Asia/Amman">Amman</timezone>
-    <timezone id="Europe/Athens">Athens</timezone>
-    <timezone id="Asia/Beirut">Beirut</timezone>
-    <timezone id="Africa/Cairo">Cairo</timezone>
-    <timezone id="Europe/Helsinki">Helsinki</timezone>
-    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
-    <timezone id="Asia/Baghdad">Baghdad</timezone>
-    <timezone id="Europe/Moscow">موسكو</timezone>
-    <timezone id="Asia/Kuwait">Kuwait</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
-    <timezone id="Asia/Tehran">Tehran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Yerevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">أورال</timezone>
-    <timezone id="Asia/Yekaterinburg">يكاترنبيرج</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">ألماتي</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">كراسنويارسك</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">بكين</timezone>
-    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
-    <timezone id="Asia/Irkutsk">ايركيتسك</timezone>
-    <timezone id="Asia/Kuala_Lumpur">كوالالمبور</timezone>
-    <timezone id="Australia/Perth">برثا</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Seoul</timezone>
-    <timezone id="Asia/Tokyo">Tokyo</timezone>
-    <timezone id="Asia/Yakutsk">ياكتسك</timezone>
-    <timezone id="Australia/Adelaide">استراليا(توقيت أدليادا</timezone>
-    <timezone id="Australia/Darwin">دارون</timezone>
-    <timezone id="Australia/Brisbane">برسيبان</timezone>
-    <timezone id="Australia/Hobart">هوبارت</timezone>
-    <timezone id="Australia/Sydney">سيدني</timezone>
-    <timezone id="Asia/Vladivostok">فلاديفوستك</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">مجادن</timezone>
-    <timezone id="Pacific/Auckland">أوكلاند</timezone>
-    <timezone id="Pacific/Fiji">Fiji</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-bg/timezones.xml b/res/xml-bg/timezones.xml
deleted file mode 100644
index a9dc460..0000000
--- a/res/xml-bg/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Мажуро</timezone>
-    <timezone id="Pacific/Midway">о. Мидуей</timezone>
-    <timezone id="Pacific/Honolulu">Хонолулу</timezone>
-    <timezone id="America/Anchorage">Анкоридж</timezone>
-    <timezone id="America/Los_Angeles">Тихоокеанска часова зона (Лос Анжелис)</timezone>
-    <timezone id="America/Tijuana">Тихоокеанска часова зона (Тихуана)</timezone>
-    <timezone id="America/Phoenix">Американска планинска часова зона (Финикс)</timezone>
-    <timezone id="America/Chihuahua">Чиуауа</timezone>
-    <timezone id="America/Denver">Американска планинска часова зона (Денвър)</timezone>
-    <timezone id="America/Costa_Rica">Американска централна часова зона (Сан Хосе)</timezone>
-    <timezone id="America/Chicago">Американска централна часова зона (Чикаго)</timezone>
-    <timezone id="America/Mexico_City">Американска централна часова зона (Мексико)</timezone>
-    <timezone id="America/Regina">Американска централна часова зона (Регина)</timezone>
-    <timezone id="America/Bogota">Богота</timezone>
-    <timezone id="America/New_York">Американска източна часова зона (Ню Йорк)</timezone>
-    <timezone id="America/Caracas">Каракас</timezone>
-    <timezone id="America/Barbados">Атлантическа часова зона (Бриджтаун)</timezone>
-    <timezone id="America/Halifax">Атлантическа часова зона (Халифакс)</timezone>
-    <timezone id="America/Manaus">Мануас</timezone>
-    <timezone id="America/Santiago">Сантиаго</timezone>
-    <timezone id="America/St_Johns">Часова зона Нюфаундленд (Сейнт Джоунс)</timezone>
-    <timezone id="America/Sao_Paulo">Сао Пауло</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Буенос Айрес</timezone>
-    <timezone id="America/Godthab">Готхоб</timezone>
-    <timezone id="America/Montevideo">Монтевидео</timezone>
-    <timezone id="Atlantic/South_Georgia">GST (Южна Джорджия) (Южна Джорджия)</timezone>
-    <timezone id="Atlantic/Azores">Азорски о-ви</timezone>
-    <timezone id="Atlantic/Cape_Verde">Кабо Верде</timezone>
-    <timezone id="Africa/Casablanca">Казабланка</timezone>
-    <timezone id="Europe/London">Часова зона Гринуич (Лондон)</timezone>
-    <timezone id="Europe/Amsterdam">Централноевропейска часова зона (Амстердам)</timezone>
-    <timezone id="Europe/Belgrade">Централноевропейска часова зона (Belgrade)</timezone>
-    <timezone id="Europe/Brussels">Централноевропейска часова зона (Брюксел)</timezone>
-    <timezone id="Europe/Sarajevo">Централноевропейска часова зона (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Виндхук</timezone>
-    <timezone id="Africa/Brazzaville">Бразавил</timezone>
-    <timezone id="Asia/Amman">Източноевропейска часова зона (Аман)</timezone>
-    <timezone id="Europe/Athens">Източноевропейска часова зона (Атина)</timezone>
-    <timezone id="Asia/Beirut">Източноевропейска часова зона (Бейрут)</timezone>
-    <timezone id="Africa/Cairo">Източноевропейска часова зона (Кайро)</timezone>
-    <timezone id="Europe/Helsinki">Източноевропейска часова зона (Хелзинки)</timezone>
-    <timezone id="Asia/Jerusalem">Часова зона Израел (Йерусалим)</timezone>
-    <timezone id="Europe/Minsk">Минск</timezone>
-    <timezone id="Africa/Harare">Хараре</timezone>
-    <timezone id="Asia/Baghdad">AST (Саудитска Арабия) (Багдад)</timezone>
-    <timezone id="Europe/Moscow">Москва</timezone>
-    <timezone id="Asia/Kuwait">AST (Саудитска Арабия) (Кувейт)</timezone>
-    <timezone id="Africa/Nairobi">Найроби</timezone>
-    <timezone id="Asia/Tehran">Техеран</timezone>
-    <timezone id="Asia/Baku">Баку</timezone>
-    <timezone id="Asia/Tbilisi">Тбилиси</timezone>
-    <timezone id="Asia/Yerevan">Ереван</timezone>
-    <timezone id="Asia/Dubai">Дубай</timezone>
-    <timezone id="Asia/Kabul">Кабул</timezone>
-    <timezone id="Asia/Karachi">Карачи</timezone>
-    <timezone id="Asia/Oral">Арал</timezone>
-    <timezone id="Asia/Yekaterinburg">Екатерининбург</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Коломбо</timezone>
-    <timezone id="Asia/Katmandu">Катманду</timezone>
-    <timezone id="Asia/Almaty">Алма Ата</timezone>
-    <timezone id="Asia/Rangoon">Рангун</timezone>
-    <timezone id="Asia/Krasnoyarsk">Красноярск</timezone>
-    <timezone id="Asia/Bangkok">Бангкок</timezone>
-    <timezone id="Asia/Shanghai">Китайска часова зона (Шанхай)</timezone>
-    <timezone id="Asia/Hong_Kong">Хонг Конг</timezone>
-    <timezone id="Asia/Irkutsk">Иркутск</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Куала Лумпур</timezone>
-    <timezone id="Australia/Perth">Пърт</timezone>
-    <timezone id="Asia/Taipei">Китайска часова зона (Тайпей)</timezone>
-    <timezone id="Asia/Seoul">Сеул</timezone>
-    <timezone id="Asia/Tokyo">Японска часова зона (Токио)</timezone>
-    <timezone id="Asia/Yakutsk">Якутск</timezone>
-    <timezone id="Australia/Adelaide">Аделаида</timezone>
-    <timezone id="Australia/Darwin">Даруин</timezone>
-    <timezone id="Australia/Brisbane">Бризбейн</timezone>
-    <timezone id="Australia/Hobart">Хоубарт</timezone>
-    <timezone id="Australia/Sydney">Сидни</timezone>
-    <timezone id="Asia/Vladivostok">Владивосток</timezone>
-    <timezone id="Pacific/Guam">Гуам</timezone>
-    <timezone id="Asia/Magadan">Магадан</timezone>
-    <timezone id="Pacific/Auckland">Окланд</timezone>
-    <timezone id="Pacific/Fiji">Фиджи</timezone>
-    <timezone id="Pacific/Tongatapu">Тонгатапу</timezone>
-</timezones>
diff --git a/res/xml-ca/timezones.xml b/res/xml-ca/timezones.xml
deleted file mode 100644
index b745c50..0000000
--- a/res/xml-ca/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Hora del Pacífic (Los Angeles)</timezone>
-    <timezone id="America/Tijuana">Hora del Pacífic (Tijuana)</timezone>
-    <timezone id="America/Phoenix">Hora de muntanya (Phoenix)</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Hora de muntanya (Denver)</timezone>
-    <timezone id="America/Costa_Rica">Hora central (Costa Rica)</timezone>
-    <timezone id="America/Chicago">Hora central (Chicago)</timezone>
-    <timezone id="America/Mexico_City">Hora central (Mèxic)</timezone>
-    <timezone id="America/Regina">Hora central (Regina)</timezone>
-    <timezone id="America/Bogota">Bogotà</timezone>
-    <timezone id="America/New_York">Hora oriental (Nova York)</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Hora de l'Atlàntic (Barbados)</timezone>
-    <timezone id="America/Halifax">Hora de l'Atlàntic (Halifax)</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">St. John's</timezone>
-    <timezone id="America/Sao_Paulo">São Paulo</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
-    <timezone id="America/Godthab">Godthab</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">Geòrgia del Sud</timezone>
-    <timezone id="Atlantic/Azores">Açores</timezone>
-    <timezone id="Atlantic/Cape_Verde">Cap Verd</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">Hora mitjana de Greenwich (Londres)</timezone>
-    <timezone id="Europe/Amsterdam">Hora Central Europea (Amsterdam)</timezone>
-    <timezone id="Europe/Belgrade">Hora Central Europea (Belgrade)</timezone>
-    <timezone id="Europe/Brussels">Hora Central Europea (Brussel·les)</timezone>
-    <timezone id="Europe/Sarajevo">Hora Central Europea (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Hora d'Àfrica Occidental (Brazzaville)</timezone>
-    <timezone id="Asia/Amman">Hora d'Europa de l'Est (Amman)</timezone>
-    <timezone id="Europe/Athens">Hora d'Europa de l'Est (Atenes)</timezone>
-    <timezone id="Asia/Beirut">Hora d'Europa de l'Est (Beirut)</timezone>
-    <timezone id="Africa/Cairo">Hora d'Europa de l'Est (El Caire)</timezone>
-    <timezone id="Europe/Helsinki">Hora d'Europa de l'Est (Hèlsinki)</timezone>
-    <timezone id="Asia/Jerusalem">Hora estàndard d'Israel (Jerusalem)</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Hora d'Àfrica Central (Harare)</timezone>
-    <timezone id="Asia/Baghdad">Hora d'Aràbia (Bagdad)</timezone>
-    <timezone id="Europe/Moscow">Moscou</timezone>
-    <timezone id="Asia/Kuwait">Hora d'Aràbia (Kuwait)</timezone>
-    <timezone id="Africa/Nairobi">Hora d'Àfrica Oriental (Nairobi)</timezone>
-    <timezone id="Asia/Tehran">Teheran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Yerevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Jekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Hora estàndard de l'Índia (Calcutta)</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandú</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnoiarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Hora estàndard de la Xina (Shanghai)</timezone>
-    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Hora estàndard de la Xina (Taipei)</timezone>
-    <timezone id="Asia/Seoul">Hora estàndard de Corea (Seül)</timezone>
-    <timezone id="Asia/Tokyo">Hora estàndard del Japó (Tòquio)</timezone>
-    <timezone id="Asia/Yakutsk">Jakutsk</timezone>
-    <timezone id="Australia/Adelaide">Adelaide</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Sydney</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fiji</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-cs/timezones.xml b/res/xml-cs/timezones.xml
deleted file mode 100644
index 0a99acf..0000000
--- a/res/xml-cs/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Pacifický standardní čas (Los Angeles)</timezone>
-    <timezone id="America/Tijuana">Pacifický standardní čas (Tichuana)</timezone>
-    <timezone id="America/Phoenix">Horský standardní čas (Phoenix)</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Horský standardní čas (Denver)</timezone>
-    <timezone id="America/Costa_Rica">Centrální standardní čas (Kostarika)</timezone>
-    <timezone id="America/Chicago">Centrální standardní čas (Chicago)</timezone>
-    <timezone id="America/Mexico_City">Centrální standardní čas (Mexico City)</timezone>
-    <timezone id="America/Regina">Centrální standardní čas (Regina)</timezone>
-    <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">New York</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Atlantický standardní čas (Barbados)</timezone>
-    <timezone id="America/Halifax">Atlantický standardní čas (Halifax)</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">Newfoundlandský standardní čas (St. Johns)</timezone>
-    <timezone id="America/Sao_Paulo">Sao Paulo</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
-    <timezone id="America/Godthab">Godthab</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">Jižní Georgia</timezone>
-    <timezone id="Atlantic/Azores">Azorské ostrovy</timezone>
-    <timezone id="Atlantic/Cape_Verde">Kapverdy</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">Greenwichský střední čas (Londýn)</timezone>
-    <timezone id="Europe/Amsterdam">Středoevropský standardní čas (Amsterdam)</timezone>
-    <timezone id="Europe/Belgrade">Středoevropský standardní čas (Belgrade)</timezone>
-    <timezone id="Europe/Brussels">Středoevropský standardní čas (Brusel)</timezone>
-    <timezone id="Europe/Sarajevo">Středoevropský standardní čas (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
-    <timezone id="Asia/Amman">Východoevropský standardní čas (Ammán)</timezone>
-    <timezone id="Europe/Athens">Východoevropský standardní čas (Atény)</timezone>
-    <timezone id="Asia/Beirut">Východoevropský standardní čas (Bejrút)</timezone>
-    <timezone id="Africa/Cairo">Východoevropský standardní čas (Káhira)</timezone>
-    <timezone id="Europe/Helsinki">Východoevropský standardní čas (Helsinki)</timezone>
-    <timezone id="Asia/Jerusalem">Izraelský standardní čas (Jeruzalém)</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
-    <timezone id="Asia/Baghdad">Bagdád</timezone>
-    <timezone id="Europe/Moscow">Moskva</timezone>
-    <timezone id="Asia/Kuwait">Kuvajt</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
-    <timezone id="Asia/Tehran">Teherán</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Jerevan</timezone>
-    <timezone id="Asia/Dubai">Dubaj</timezone>
-    <timezone id="Asia/Kabul">Kábul</timezone>
-    <timezone id="Asia/Karachi">Karáčí</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Jekatěrinburg</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangún</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Čínský standardní čas (Peking)</timezone>
-    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Soul</timezone>
-    <timezone id="Asia/Tokyo">Japonský standardní čas (Tokio)</timezone>
-    <timezone id="Asia/Yakutsk">Jakutsk</timezone>
-    <timezone id="Australia/Adelaide">Adelaide</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Sydney</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fidži</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-da/timezones.xml b/res/xml-da/timezones.xml
deleted file mode 100644
index 63f1793..0000000
--- a/res/xml-da/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Alaska</timezone>
-    <timezone id="America/Los_Angeles">Pacific-tid (Los Angeles)</timezone>
-    <timezone id="America/Tijuana">Pacific-tid (Tijuana)</timezone>
-    <timezone id="America/Phoenix">Mountain-tid (Phoenix)</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Mountain-tid (Denver)</timezone>
-    <timezone id="America/Costa_Rica">Central-tid (Costa Rica)</timezone>
-    <timezone id="America/Chicago">Central-tid (Chicago)</timezone>
-    <timezone id="America/Mexico_City">Central-tid (Mexico City)</timezone>
-    <timezone id="America/Regina">Central-tid (Regina)</timezone>
-    <timezone id="America/Bogota">Colombiansk tid (Bogota)</timezone>
-    <timezone id="America/New_York">Eastern-tid (New York)</timezone>
-    <timezone id="America/Caracas">Venezuelansk tid (Caracas)</timezone>
-    <timezone id="America/Barbados">Atlantic-tid (Barbados)</timezone>
-    <timezone id="America/Halifax">Atlantic-tid (Halifax)</timezone>
-    <timezone id="America/Manaus">Amazonas-tid (Manaus)</timezone>
-    <timezone id="America/Santiago">Chilensk tid (Santiago)</timezone>
-    <timezone id="America/St_Johns">Newfoundland-tid (St. Johns)</timezone>
-    <timezone id="America/Sao_Paulo">Brasiliansk tid (Sao Paulo)</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Argentinsk tid (Buenos Aires)</timezone>
-    <timezone id="America/Godthab">Vestgrønlandsk tid (Nuuk)</timezone>
-    <timezone id="America/Montevideo">Uruguayansk tid (Montevideo)</timezone>
-    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
-    <timezone id="Atlantic/Azores">Azorerne</timezone>
-    <timezone id="Atlantic/Cape_Verde">Kap Verde</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">Verdenstid (London)</timezone>
-    <timezone id="Europe/Amsterdam">Mellemeuropæisk tid (Amsterdam)</timezone>
-    <timezone id="Europe/Belgrade">Mellemeuropæisk tid (Belgrade)</timezone>
-    <timezone id="Europe/Brussels">Mellemeuropæisk tid (Bruxelles)</timezone>
-    <timezone id="Europe/Sarajevo">Mellemeuropæisk tid (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Vestafrikansk tid (Brazzaville)</timezone>
-    <timezone id="Asia/Amman">østeuropæisk tid (Amman)</timezone>
-    <timezone id="Europe/Athens">østeuropæisk tid (Athen)</timezone>
-    <timezone id="Asia/Beirut">østeuropæisk tid (Beirut)</timezone>
-    <timezone id="Africa/Cairo">østeuropæisk tid (Cairo)</timezone>
-    <timezone id="Europe/Helsinki">østeuropæisk tid (Helsinki)</timezone>
-    <timezone id="Asia/Jerusalem">Israelsk normaltid (Jerusalem)</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Centralafrikansk tid (Harare)</timezone>
-    <timezone id="Asia/Baghdad">Arabisk tid (Baghdad)</timezone>
-    <timezone id="Europe/Moscow">Moskva</timezone>
-    <timezone id="Asia/Kuwait">Arabisk tid (Kuwait)</timezone>
-    <timezone id="Africa/Nairobi">østafrikansk tid (Nairobi)</timezone>
-    <timezone id="Asia/Tehran">Teheran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Yerevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Afghansk tid (Kabul)</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Indisk normaltid (Calcutta)</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
-    <timezone id="Asia/Bangkok">Indokinesisk tid (Bangkok)</timezone>
-    <timezone id="Asia/Shanghai">Kinesisk tid (Beijing)</timezone>
-    <timezone id="Asia/Hong_Kong">Hongkong-tid (Hongkong)</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Vestaustralsk tid (Perth)</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Koreansk normaltid (Seoul)</timezone>
-    <timezone id="Asia/Tokyo">Japansk tid (Tokyo)</timezone>
-    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
-    <timezone id="Australia/Adelaide">Centralaustralsk tid (Adelaide)</timezone>
-    <timezone id="Australia/Darwin">Centralaustralsk tid (Darwin)</timezone>
-    <timezone id="Australia/Brisbane">Østaustralsk tid (Brisbane)</timezone>
-    <timezone id="Australia/Hobart">Østaustralsk tid (Hobart)</timezone>
-    <timezone id="Australia/Sydney">Østaustralsk tid (Sydney)</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Newzealandsk tid (Auckland)</timezone>
-    <timezone id="Pacific/Fiji">Fiji</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-de/timezones.xml b/res/xml-de/timezones.xml
deleted file mode 100644
index 6f0661d..0000000
--- a/res/xml-de/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Los Angeles</timezone>
-    <timezone id="America/Tijuana">Tijuana</timezone>
-    <timezone id="America/Phoenix">Phoenix</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Denver</timezone>
-    <timezone id="America/Costa_Rica">Costa Rica</timezone>
-    <timezone id="America/Chicago">Chicago</timezone>
-    <timezone id="America/Mexico_City">Mexiko-Stadt</timezone>
-    <timezone id="America/Regina">Regina</timezone>
-    <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">New York</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Barbados</timezone>
-    <timezone id="America/Halifax">Halifax</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">St. John's</timezone>
-    <timezone id="America/Sao_Paulo">Sao Paulo</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
-    <timezone id="America/Godthab">Godthab</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">Süd-Georgien</timezone>
-    <timezone id="Atlantic/Azores">Azoren</timezone>
-    <timezone id="Atlantic/Cape_Verde">Kap Verde</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">London</timezone>
-    <timezone id="Europe/Amsterdam">Mitteleuropäische Zeit (Amsterdam)</timezone>
-    <timezone id="Europe/Belgrade">Mitteleuropäische Zeit (Belgrade)</timezone>
-    <timezone id="Europe/Brussels">Mitteleuropäische Zeit (Brüssel)</timezone>
-    <timezone id="Europe/Sarajevo">Mitteleuropäische Zeit (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Westafrikanische Zeit (Brazzaville)</timezone>
-    <timezone id="Asia/Amman">Osteuropäische Zeit (Amman)</timezone>
-    <timezone id="Europe/Athens">Osteuropäische Zeit (Athen)</timezone>
-    <timezone id="Asia/Beirut">Osteuropäische Zeit (Beirut)</timezone>
-    <timezone id="Africa/Cairo">Osteuropäische Zeit (Kairo)</timezone>
-    <timezone id="Europe/Helsinki">Osteuropäische Zeit (Helsinki)</timezone>
-    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Zentralafrikanische Zeit (Harare)</timezone>
-    <timezone id="Asia/Baghdad">Bagdad</timezone>
-    <timezone id="Europe/Moscow">Moskau</timezone>
-    <timezone id="Asia/Kuwait">Kuwait</timezone>
-    <timezone id="Africa/Nairobi">Ostafrikanische Zeit (Nairobi)</timezone>
-    <timezone id="Asia/Tehran">Teheran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tiflis</timezone>
-    <timezone id="Asia/Yerevan">Erivan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Afghanistan-Zeit (Kabul)</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Jekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Beijing</timezone>
-    <timezone id="Asia/Hong_Kong">Hongkong</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Taipeh</timezone>
-    <timezone id="Asia/Seoul">Seoul</timezone>
-    <timezone id="Asia/Tokyo">Tokio</timezone>
-    <timezone id="Asia/Yakutsk">Jakutsk</timezone>
-    <timezone id="Australia/Adelaide">Adelaide</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Sydney</timezone>
-    <timezone id="Asia/Vladivostok">Wladiwostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fidschi</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-el/timezones.xml b/res/xml-el/timezones.xml
deleted file mode 100644
index da63019..0000000
--- a/res/xml-el/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Μαχούρο</timezone>
-    <timezone id="Pacific/Midway">Μίντγουεϊ</timezone>
-    <timezone id="Pacific/Honolulu">Χονολουλού</timezone>
-    <timezone id="America/Anchorage">Άνκορατζ</timezone>
-    <timezone id="America/Los_Angeles">Λος Άντζελες</timezone>
-    <timezone id="America/Tijuana">Τιχουάνα</timezone>
-    <timezone id="America/Phoenix">Φοίνιξ</timezone>
-    <timezone id="America/Chihuahua">Τσιουάουα</timezone>
-    <timezone id="America/Denver">Ντένβερ</timezone>
-    <timezone id="America/Costa_Rica">Κόστα Ρίκα</timezone>
-    <timezone id="America/Chicago">Σικάγο</timezone>
-    <timezone id="America/Mexico_City">Πόλη του Μεξικού</timezone>
-    <timezone id="America/Regina">Ρετζίνα</timezone>
-    <timezone id="America/Bogota">Μπογκοτά</timezone>
-    <timezone id="America/New_York">Νέα Υόρκη</timezone>
-    <timezone id="America/Caracas">Καράκας</timezone>
-    <timezone id="America/Barbados">Μπαρμπέιντος</timezone>
-    <timezone id="America/Halifax">Χάλιφαξ</timezone>
-    <timezone id="America/Manaus">Μανάος</timezone>
-    <timezone id="America/Santiago">Σαντιάγκο</timezone>
-    <timezone id="America/St_Johns">Σεντ Τζονς</timezone>
-    <timezone id="America/Sao_Paulo">Σάο Πάολο</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Μπουένος Άιρες</timezone>
-    <timezone id="America/Godthab">Γκόνθαμπ</timezone>
-    <timezone id="America/Montevideo">Μοντεβίδεο</timezone>
-    <timezone id="Atlantic/South_Georgia">Νότια Γεωργία</timezone>
-    <timezone id="Atlantic/Azores">Αζόρες</timezone>
-    <timezone id="Atlantic/Cape_Verde">Cape Verde</timezone>
-    <timezone id="Africa/Casablanca">Καζαμπλάνκα</timezone>
-    <timezone id="Europe/London">Λονδίνο</timezone>
-    <timezone id="Europe/Amsterdam">Άμστερνταμ</timezone>
-    <timezone id="Europe/Belgrade">Belgrade</timezone>
-    <timezone id="Europe/Brussels">Βρυξέλλες</timezone>
-    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
-    <timezone id="Africa/Windhoek">Γουιντχόεκ</timezone>
-    <timezone id="Africa/Brazzaville">ώρα Δυτικής Αφρικής (Μπράζαβιλ)</timezone>
-    <timezone id="Asia/Amman">Αμάν</timezone>
-    <timezone id="Europe/Athens">Αθήνα</timezone>
-    <timezone id="Asia/Beirut">Βηρυτός</timezone>
-    <timezone id="Africa/Cairo">Αίγυπτος</timezone>
-    <timezone id="Europe/Helsinki">Ελσίνκι</timezone>
-    <timezone id="Asia/Jerusalem">Ιερουσαλήμ</timezone>
-    <timezone id="Europe/Minsk">Μινσκ</timezone>
-    <timezone id="Africa/Harare">ώρα Κεντρικής Αφρικής (Ζιμπάμπουε)</timezone>
-    <timezone id="Asia/Baghdad">Βαγδάτη</timezone>
-    <timezone id="Europe/Moscow">Μόσχα</timezone>
-    <timezone id="Asia/Kuwait">Kuwait</timezone>
-    <timezone id="Africa/Nairobi">ώρα Ανατολικής Αφρικής (Κένυα)</timezone>
-    <timezone id="Asia/Tehran">Τεχεράνη</timezone>
-    <timezone id="Asia/Baku">Μπακού</timezone>
-    <timezone id="Asia/Tbilisi">Τμπιλίσι</timezone>
-    <timezone id="Asia/Yerevan">Γερεβάν</timezone>
-    <timezone id="Asia/Dubai">Ντουμπάι</timezone>
-    <timezone id="Asia/Kabul">Καμπούλ</timezone>
-    <timezone id="Asia/Karachi">Καράτσι</timezone>
-    <timezone id="Asia/Oral">Όραλ</timezone>
-    <timezone id="Asia/Yekaterinburg">Αικατερινούπολη</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Κολόμπο</timezone>
-    <timezone id="Asia/Katmandu">Κατμαντού</timezone>
-    <timezone id="Asia/Almaty">Αλμάτυ</timezone>
-    <timezone id="Asia/Rangoon">Ρανγκούν</timezone>
-    <timezone id="Asia/Krasnoyarsk">Κρασνογιάρσκ</timezone>
-    <timezone id="Asia/Bangkok">Μπανγκόκ</timezone>
-    <timezone id="Asia/Shanghai">Πεκίνο</timezone>
-    <timezone id="Asia/Hong_Kong">Χονγκ Κονγκ</timezone>
-    <timezone id="Asia/Irkutsk">Ιρκούτσκ</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Κουάλα Λουμπούρ</timezone>
-    <timezone id="Australia/Perth">Περθ</timezone>
-    <timezone id="Asia/Taipei">Ταϊπέι</timezone>
-    <timezone id="Asia/Seoul">Σεούλ</timezone>
-    <timezone id="Asia/Tokyo">Τόκυο</timezone>
-    <timezone id="Asia/Yakutsk">Γιάκουτσκ</timezone>
-    <timezone id="Australia/Adelaide">Αδελαΐδα</timezone>
-    <timezone id="Australia/Darwin">Ντάργουιν</timezone>
-    <timezone id="Australia/Brisbane">Μπρίσμπεϊν</timezone>
-    <timezone id="Australia/Hobart">Χόμπαρτ</timezone>
-    <timezone id="Australia/Sydney">Σίδνεϊ</timezone>
-    <timezone id="Asia/Vladivostok">Βλαδιβοστόκ</timezone>
-    <timezone id="Pacific/Guam">Γκουάμ</timezone>
-    <timezone id="Asia/Magadan">Μαγκαντάν</timezone>
-    <timezone id="Pacific/Auckland">Όκλαντ</timezone>
-    <timezone id="Pacific/Fiji">Φίτζι</timezone>
-    <timezone id="Pacific/Tongatapu">Τονγκατάπου</timezone>
-</timezones>
diff --git a/res/xml-es/timezones.xml b/res/xml-es/timezones.xml
deleted file mode 100644
index c5f0a05..0000000
--- a/res/xml-es/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulú</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Hora del Pacífico (Los Ángeles)</timezone>
-    <timezone id="America/Tijuana">Hora del Pacífico (Tijuana)</timezone>
-    <timezone id="America/Phoenix">Hora estándar de Montaña (Phoenix)</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Hora estándar de Montaña (Denver)</timezone>
-    <timezone id="America/Costa_Rica">Hora central (Costa Rica)</timezone>
-    <timezone id="America/Chicago">Hora central (Chicago)</timezone>
-    <timezone id="America/Mexico_City">Hora central (Ciudad de México)</timezone>
-    <timezone id="America/Regina">Hora central (Hora de Canadá (Regina))</timezone>
-    <timezone id="America/Bogota">Hora de Colombia (Bogotá)</timezone>
-    <timezone id="America/New_York">Hora oriental (Nueva York)</timezone>
-    <timezone id="America/Caracas">Hora de Venezuela (Caracas)</timezone>
-    <timezone id="America/Barbados">Hora del Atlántico (Barbados)</timezone>
-    <timezone id="America/Halifax">Hora del Atlántico (Hora de Canadá (Halifax))</timezone>
-    <timezone id="America/Manaus">Hora del Amazonas (Manaus)</timezone>
-    <timezone id="America/Santiago">Hora de Chile (Santiago)</timezone>
-    <timezone id="America/St_Johns">Hora estándar de Newfoundland (St. John’s)</timezone>
-    <timezone id="America/Sao_Paulo">Hora de Brasilia (São Paulo)</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Hora de Argentina (Hora de Argentina (Buenos Aires))</timezone>
-    <timezone id="America/Godthab">Hora de Groenlandia occidental (Godthab)</timezone>
-    <timezone id="America/Montevideo">Hora de Uruguay (Montevideo)</timezone>
-    <timezone id="Atlantic/South_Georgia">Hora de Georgia meridional (Georgia del Sur)</timezone>
-    <timezone id="Atlantic/Azores">Azores</timezone>
-    <timezone id="Atlantic/Cape_Verde">Hora de Cabo Verde (Cabo Verde)</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">Hora media de Greenwich (Londres)</timezone>
-    <timezone id="Europe/Amsterdam">Hora estándar de Europa Central (Amsterdam)</timezone>
-    <timezone id="Europe/Belgrade">Hora estándar de Europa Central (Belgrade)</timezone>
-    <timezone id="Europe/Brussels">Hora estándar de Europa Central (Bruselas)</timezone>
-    <timezone id="Europe/Sarajevo">Hora estándar de Europa Central (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Hora de África occidental (Brazzaville)</timezone>
-    <timezone id="Asia/Amman">Hora estándar de Europa del Este (Amman)</timezone>
-    <timezone id="Europe/Athens">Hora estándar de Europa del Este (Atenas)</timezone>
-    <timezone id="Asia/Beirut">Hora estándar de Europa del Este (Beirut)</timezone>
-    <timezone id="Africa/Cairo">Hora estándar de Europa del Este (El Cairo)</timezone>
-    <timezone id="Europe/Helsinki">Hora estándar de Europa del Este (Helsinki)</timezone>
-    <timezone id="Asia/Jerusalem">Hora estándar de Israel (Jerusalén)</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Hora de África central (Harare)</timezone>
-    <timezone id="Asia/Baghdad">Hora de Arabia (Bagdad)</timezone>
-    <timezone id="Europe/Moscow">Moscú</timezone>
-    <timezone id="Asia/Kuwait">Hora de Arabia (Kuwait)</timezone>
-    <timezone id="Africa/Nairobi">Hora de África oriental (Nairobi)</timezone>
-    <timezone id="Asia/Tehran">Teherán</timezone>
-    <timezone id="Asia/Baku">Bakú</timezone>
-    <timezone id="Asia/Tbilisi">Tiflis</timezone>
-    <timezone id="Asia/Yerevan">Ereván</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Hora de Afganistán (Kabul)</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Yekaterinburgo</timezone>
-    <timezone id="Asia/Calcutta">Hora estándar de la India (Calcutta)</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandú</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangún</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Hora de China (Beijing)</timezone>
-    <timezone id="Asia/Hong_Kong">Hora de Hong Kong (Hong Kong)</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Hora de Australia occidental (Perth)</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Hora de Corea (Seúl)</timezone>
-    <timezone id="Asia/Tokyo">Hora estándar de Japón (Tokio)</timezone>
-    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
-    <timezone id="Australia/Adelaide">Hora de Australia central (Adelaida)</timezone>
-    <timezone id="Australia/Darwin">Hora de Australia central (Darwin)</timezone>
-    <timezone id="Australia/Brisbane">Hora de Australia oriental (Brisbane)</timezone>
-    <timezone id="Australia/Hobart">Hora de Australia oriental (Hobart)</timezone>
-    <timezone id="Australia/Sydney">Hora de Australia oriental (Sídney)</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Hora de Nueva Zelanda (Auckland)</timezone>
-    <timezone id="Pacific/Fiji">Fiyi</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-fa/timezones.xml b/res/xml-fa/timezones.xml
deleted file mode 100644
index a2de828..0000000
--- a/res/xml-fa/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">وقت جزایر مارشال (ماجورو)</timezone>
-    <timezone id="Pacific/Midway">میدوی</timezone>
-    <timezone id="Pacific/Honolulu">هونولولو</timezone>
-    <timezone id="America/Anchorage">انکریج</timezone>
-    <timezone id="America/Los_Angeles">وقت غرب امریکا (لوس‌آنجلس)</timezone>
-    <timezone id="America/Tijuana">وقت غرب امریکا (تی جوانا)</timezone>
-    <timezone id="America/Phoenix">وقت کوهستانی امریکا (فینکس)</timezone>
-    <timezone id="America/Chihuahua">چیئوائوا</timezone>
-    <timezone id="America/Denver">وقت کوهستانی امریکا (دنور)</timezone>
-    <timezone id="America/Costa_Rica">وقت مرکز امریکا (کستا ریکا)</timezone>
-    <timezone id="America/Chicago">وقت مرکز امریکا (شیکاگو)</timezone>
-    <timezone id="America/Mexico_City">وقت مرکز امریکا (مکزیکوسیتی)</timezone>
-    <timezone id="America/Regina">وقت مرکز امریکا (رجاینا)</timezone>
-    <timezone id="America/Bogota">وقت کلمبیا (Bogota)</timezone>
-    <timezone id="America/New_York">وقت شرق امریکا (نیویورک)</timezone>
-    <timezone id="America/Caracas">وقت ونزوئلا (Caracas)</timezone>
-    <timezone id="America/Barbados">وقت آتلانتیک (باربادس)</timezone>
-    <timezone id="America/Halifax">وقت آتلانتیک (هلیفکس)</timezone>
-    <timezone id="America/Manaus">وقت آمازون (ماناوس)</timezone>
-    <timezone id="America/Santiago">وقت شیلی (سانتیاگو)</timezone>
-    <timezone id="America/St_Johns">سنت جان</timezone>
-    <timezone id="America/Sao_Paulo">وقت برازیلیا (سائوپائولو)</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">وقت آرژانتین (بوئنوس‌آیرس)</timezone>
-    <timezone id="America/Godthab">وقت غرب گروئنلند (گودهوب)</timezone>
-    <timezone id="America/Montevideo">وقت اروگوئه (Montevideo)</timezone>
-    <timezone id="Atlantic/South_Georgia">وقت جورجیای جنوبی (South Georgia)</timezone>
-    <timezone id="Atlantic/Azores">آزورس</timezone>
-    <timezone id="Atlantic/Cape_Verde">وقت کیپ ورد (کیپ ورد)</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">وقت گرینویچ (London)</timezone>
-    <timezone id="Europe/Amsterdam">وقت مرکز اروپا (Amsterdam)</timezone>
-    <timezone id="Europe/Belgrade">وقت مرکز اروپا (Belgrade)</timezone>
-    <timezone id="Europe/Brussels">وقت مرکز اروپا (Brussels)</timezone>
-    <timezone id="Europe/Sarajevo">وقت مرکز اروپا (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">وقت غرب افریقا (Brazzaville)</timezone>
-    <timezone id="Asia/Amman">وقت شرق اروپا (Amman)</timezone>
-    <timezone id="Europe/Athens">وقت شرق اروپا (Athens)</timezone>
-    <timezone id="Asia/Beirut">وقت شرق اروپا (Beirut)</timezone>
-    <timezone id="Africa/Cairo">وقت شرق اروپا (Cairo)</timezone>
-    <timezone id="Europe/Helsinki">وقت شرق اروپا (Helsinki)</timezone>
-    <timezone id="Asia/Jerusalem">وقت اسرائیل (Jerusalem)</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">وقت مرکز افریقا (Harare)</timezone>
-    <timezone id="Asia/Baghdad">وقت عربستان (Baghdad)</timezone>
-    <timezone id="Europe/Moscow">مسکو</timezone>
-    <timezone id="Asia/Kuwait">وقت عربستان (کویت)</timezone>
-    <timezone id="Africa/Nairobi">وقت شرق افریقا (Nairobi)</timezone>
-    <timezone id="Asia/Tehran">وقت ایران (تهران)</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Yerevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">وقت افغانستان (کابل)</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">اورال</timezone>
-    <timezone id="Asia/Yekaterinburg">یکاترینبرگ</timezone>
-    <timezone id="Asia/Calcutta">وقت عادی هند (Calcutta)</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">وقت نپال (Katmandu)</timezone>
-    <timezone id="Asia/Almaty">آلماتی</timezone>
-    <timezone id="Asia/Rangoon">وقت میانمار (Rangoon)</timezone>
-    <timezone id="Asia/Krasnoyarsk">کراسنویارسک</timezone>
-    <timezone id="Asia/Bangkok">وقت هندوچین (Bangkok)</timezone>
-    <timezone id="Asia/Shanghai">وقت چین (شانگهای)</timezone>
-    <timezone id="Asia/Hong_Kong">وقت هنگ‌کنگ (هونگ کنگ)</timezone>
-    <timezone id="Asia/Irkutsk">وقت ایرکوتسک (ایرکوتسک)</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">وقت غرب استرالیا (پرت)</timezone>
-    <timezone id="Asia/Taipei">وقت چین (Taipei)</timezone>
-    <timezone id="Asia/Seoul">وقت کره (Seoul)</timezone>
-    <timezone id="Asia/Tokyo">وقت ژاپن (Tokyo)</timezone>
-    <timezone id="Asia/Yakutsk">وقت یاکوتسک (یاکوتسک)</timezone>
-    <timezone id="Australia/Adelaide">وقت مرکز استرالیا (آدلاید)</timezone>
-    <timezone id="Australia/Darwin">وقت مرکز استرالیا (داروین)</timezone>
-    <timezone id="Australia/Brisbane">وقت شرق استرالیا (بریسبین)</timezone>
-    <timezone id="Australia/Hobart">وقت شرق استرالیا (هوبارت)</timezone>
-    <timezone id="Australia/Sydney">وقت شرق استرالیا (سیدنی)</timezone>
-    <timezone id="Asia/Vladivostok">ولادی‌وستوک</timezone>
-    <timezone id="Pacific/Guam">گوام</timezone>
-    <timezone id="Asia/Magadan">مگادن</timezone>
-    <timezone id="Pacific/Auckland">وقت زلاند نو (Auckland)</timezone>
-    <timezone id="Pacific/Fiji">وقت فیجی (فیجی)</timezone>
-    <timezone id="Pacific/Tongatapu">وقت تونگا (Tongatapu)</timezone>
-</timezones>
diff --git a/res/xml-fi/timezones.xml b/res/xml-fi/timezones.xml
deleted file mode 100644
index 67e91ac..0000000
--- a/res/xml-fi/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Yhdysvaltain Tyynenmeren aika (Los Angeles)</timezone>
-    <timezone id="America/Tijuana">Yhdysvaltain Tyynenmeren aika (Tijuana)</timezone>
-    <timezone id="America/Phoenix">Kalliovuorten aika (Phoenix)</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Kalliovuorten aika (Denver)</timezone>
-    <timezone id="America/Costa_Rica">Yhdysvaltain keskinen aika (Costa Rica)</timezone>
-    <timezone id="America/Chicago">Yhdysvaltain keskinen aika (Chicago)</timezone>
-    <timezone id="America/Mexico_City">Yhdysvaltain keskinen aika (Ciudad de México)</timezone>
-    <timezone id="America/Regina">Yhdysvaltain keskinen aika (Regina)</timezone>
-    <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">Yhdysvaltain itäinen aika (New York)</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Kanadan Atlantin aika (Barbados)</timezone>
-    <timezone id="America/Halifax">Kanadan Atlantin aika (Halifax)</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">Newfoundlandin normaaliaika (St. Johns)</timezone>
-    <timezone id="America/Sao_Paulo">São Paulo</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
-    <timezone id="America/Godthab">Godthåb</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">Etelä-Georgia</timezone>
-    <timezone id="Atlantic/Azores">Azorit</timezone>
-    <timezone id="Atlantic/Cape_Verde">Kap Verde</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">Greenwichin normaaliaika (Lontoo)</timezone>
-    <timezone id="Europe/Amsterdam">Keski-Euroopan normaaliaika (Amsterdam)</timezone>
-    <timezone id="Europe/Belgrade">Keski-Euroopan normaaliaika (Belgrad)</timezone>
-    <timezone id="Europe/Brussels">Keski-Euroopan normaaliaika (Bryssel)</timezone>
-    <timezone id="Europe/Sarajevo">Keski-Euroopan normaaliaika (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Länsi-Afrikan aika (Brazzaville)</timezone>
-    <timezone id="Asia/Amman">Itä-Euroopan normaaliaika (Amman)</timezone>
-    <timezone id="Europe/Athens">Itä-Euroopan normaaliaika (Ateena)</timezone>
-    <timezone id="Asia/Beirut">Itä-Euroopan normaaliaika (Beirut)</timezone>
-    <timezone id="Africa/Cairo">Itä-Euroopan normaaliaika (Kairo)</timezone>
-    <timezone id="Europe/Helsinki">Itä-Euroopan normaaliaika (Helsinki)</timezone>
-    <timezone id="Asia/Jerusalem">Israelin normaaliaika (Jerusalem)</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Keski-Afrikan aika (Harare)</timezone>
-    <timezone id="Asia/Baghdad">Baghdad</timezone>
-    <timezone id="Europe/Moscow">Moskova</timezone>
-    <timezone id="Asia/Kuwait">Kuwait</timezone>
-    <timezone id="Africa/Nairobi">Itä-Afrikan aika (Nairobi)</timezone>
-    <timezone id="Asia/Tehran">Teheran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Jerevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Jekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Kiinan normaaliaika (Peking)</timezone>
-    <timezone id="Asia/Hong_Kong">Hongkong</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Seoul</timezone>
-    <timezone id="Asia/Tokyo">Japanin normaaliaika (Tokio)</timezone>
-    <timezone id="Asia/Yakutsk">Jakutsk</timezone>
-    <timezone id="Australia/Adelaide">Adelaide</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Sydney</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fidzi</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-fr/timezones.xml b/res/xml-fr/timezones.xml
deleted file mode 100644
index 6b8e46b..0000000
--- a/res/xml-fr/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Heure des îles Marshall (Majuro)</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Alaska</timezone>
-    <timezone id="America/Los_Angeles">Heure du Pacifique (Los Angeles)</timezone>
-    <timezone id="America/Tijuana">Heure du Pacifique (Tijuana)</timezone>
-    <timezone id="America/Phoenix">Heure des Rocheuses (Phoenix)</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Heure des Rocheuses (Denver)</timezone>
-    <timezone id="America/Costa_Rica">Heure du Centre (San José)</timezone>
-    <timezone id="America/Chicago">Heure du Centre (Chicago)</timezone>
-    <timezone id="America/Mexico_City">Heure du Centre (Mexico)</timezone>
-    <timezone id="America/Regina">Heure du Centre (Régina)</timezone>
-    <timezone id="America/Bogota">Heure de Colombie (Bogota)</timezone>
-    <timezone id="America/New_York">Heure de l’Est (New York)</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Heure de l’Atlantique (Barbade (La))</timezone>
-    <timezone id="America/Halifax">Heure de l’Atlantique (Halifax)</timezone>
-    <timezone id="America/Manaus">Heure de l’Amazonie (Manaos)</timezone>
-    <timezone id="America/Santiago">Heure du Chili (Santiago)</timezone>
-    <timezone id="America/St_Johns">Heure de Terre-Neuve (Saint-Jean de Terre-Neuve)</timezone>
-    <timezone id="America/Sao_Paulo">Heure de Brasilia (São Paulo)</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Heure de l’Est argentin (Buenos Aires)</timezone>
-    <timezone id="America/Godthab">Heure de l’Ouest du Groenland (Godthåb)</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">Heure de Géorgie du Sud (Géorgie du Sud)</timezone>
-    <timezone id="Atlantic/Azores">Açores</timezone>
-    <timezone id="Atlantic/Cape_Verde">Heure du Cap-Vert (Cap Vert)</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">Heure moyenne de Greenwich (Londres)</timezone>
-    <timezone id="Europe/Amsterdam">Heure de l’Europe centrale (Amsterdam)</timezone>
-    <timezone id="Europe/Belgrade">Heure de l’Europe centrale (Belgrade)</timezone>
-    <timezone id="Europe/Brussels">Heure de l’Europe centrale (Bruxelles)</timezone>
-    <timezone id="Europe/Sarajevo">Heure de l’Europe centrale (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Heure d’Afrique de l’Ouest (Brazzaville)</timezone>
-    <timezone id="Asia/Amman">Heure normale de l’Europe de l’Est (Amman)</timezone>
-    <timezone id="Europe/Athens">Heure normale de l’Europe de l’Est (Athènes)</timezone>
-    <timezone id="Asia/Beirut">Heure normale de l’Europe de l’Est (Beyrouth)</timezone>
-    <timezone id="Africa/Cairo">Heure normale de l’Europe de l’Est (Le Caire)</timezone>
-    <timezone id="Europe/Helsinki">Heure normale de l’Europe de l’Est (Helsinki)</timezone>
-    <timezone id="Asia/Jerusalem">Heure d’Israël (Jérusalem)</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Heure d’Afrique centrale (Harare)</timezone>
-    <timezone id="Asia/Baghdad">Heure de l’Arabie (Bagdad)</timezone>
-    <timezone id="Europe/Moscow">Moscou</timezone>
-    <timezone id="Asia/Kuwait">Heure de l’Arabie (Koweït)</timezone>
-    <timezone id="Africa/Nairobi">Heure d’Afrique de l’Est (Nairobi)</timezone>
-    <timezone id="Asia/Tehran">Heure d’Iran (Téhéran)</timezone>
-    <timezone id="Asia/Baku">Bakou</timezone>
-    <timezone id="Asia/Tbilisi">Tbilissi</timezone>
-    <timezone id="Asia/Yerevan">Erevan</timezone>
-    <timezone id="Asia/Dubai">Heure du Golfe (Dubaï)</timezone>
-    <timezone id="Asia/Kabul">Heure d’Afghanistan (Kaboul)</timezone>
-    <timezone id="Asia/Karachi">Karâchi</timezone>
-    <timezone id="Asia/Oral">Ouralsk</timezone>
-    <timezone id="Asia/Yekaterinburg">Ekaterinbourg</timezone>
-    <timezone id="Asia/Calcutta">Heure de l’Inde (Kolkata)</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandou</timezone>
-    <timezone id="Asia/Almaty">Alma Ata</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Heure de Krasnoïarsk (Krasnoïarsk)</timezone>
-    <timezone id="Asia/Bangkok">Heure d’Indochine (Bangkok)</timezone>
-    <timezone id="Asia/Shanghai">Heure de Chine (Beijing)</timezone>
-    <timezone id="Asia/Hong_Kong">Heure de Hong Kong (Hong-Kong)</timezone>
-    <timezone id="Asia/Irkutsk">Heure d’Irkoutsk (Irkoutsk)</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Heure de l’Ouest australien (Perth)</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Heure de Corée (Séoul)</timezone>
-    <timezone id="Asia/Tokyo">Heure du Japon (Tokyo)</timezone>
-    <timezone id="Asia/Yakutsk">Iakoutsk</timezone>
-    <timezone id="Australia/Adelaide">Heure du Centre australien (Adélaïde)</timezone>
-    <timezone id="Australia/Darwin">Heure du Centre australien (Darwin)</timezone>
-    <timezone id="Australia/Brisbane">Heure de l’Est australien (Brisbane)</timezone>
-    <timezone id="Australia/Hobart">Heure de l’Est australien (Hobart)</timezone>
-    <timezone id="Australia/Sydney">Heure de l’Est australien (Sydney)</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Hagåtña</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Heure de Nouvelle-Zélande (Auckland)</timezone>
-    <timezone id="Pacific/Fiji">Heure des îles Fidji (Fidji)</timezone>
-    <timezone id="Pacific/Tongatapu">Heure de Tonga (Nukuʻalofa)</timezone>
-</timezones>
diff --git a/res/xml-he/timezones.xml b/res/xml-he/timezones.xml
deleted file mode 100644
index 4174880..0000000
--- a/res/xml-he/timezones.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">מאג'ורו</timezone>
-    <timezone id="Pacific/Midway">מידוויי</timezone>
-    <timezone id="Pacific/Honolulu">פסיפי/הונולולו</timezone>
-    <timezone id="America/Anchorage">זמן אלסקה</timezone>
-    <timezone id="America/Los_Angeles">אמריקה/לוס-אנג'לס</timezone>
-    <timezone id="America/Tijuana">Tijuana</timezone>
-    <timezone id="America/Phoenix">אמריקה/פיניקס</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">אמריקה/דנוור</timezone>
-    <timezone id="America/Costa_Rica">קוסטה ריקה</timezone>
-    <timezone id="America/Chicago">אמריקה/שיקגו</timezone>
-    <timezone id="America/Mexico_City">אמריקה/מקסיקו סיטי</timezone>
-    <timezone id="America/Regina">Regina</timezone>
-    <timezone id="America/Bogota">בוגוטה</timezone>
-    <timezone id="America/New_York">אמריקה/ניו-יורק</timezone>
-    <timezone id="America/Caracas">קאראקאס</timezone>
-    <timezone id="America/Barbados">ברבדוס</timezone>
-    <timezone id="America/Manaus">מנאוס</timezone>
-    <timezone id="America/Santiago">אמריקה/סנטיאגו</timezone>
-    <timezone id="America/St_Johns">St. John's</timezone>
-    <timezone id="America/Sao_Paulo">אמריקה/סאן-פאולו</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">בואנוס איירס</timezone>
-    <timezone id="America/Godthab">גודת'אב</timezone>
-    <timezone id="America/Montevideo">מונטווידאו</timezone>
-    <timezone id="Atlantic/South_Georgia">איי ג'ורג'יה הדרומית</timezone>
-    <timezone id="Atlantic/Azores">האיים האזורים</timezone>
-    <timezone id="Atlantic/Cape_Verde">קייפ ורדה</timezone>
-    <timezone id="Africa/Casablanca">קזבלנקה</timezone>
-    <timezone id="Europe/London">אירופה/לונדון</timezone>
-    <timezone id="Europe/Amsterdam">אמסטרדם</timezone>
-    <timezone id="Europe/Belgrade">Belgrade</timezone>
-    <timezone id="Europe/Brussels">בריסל</timezone>
-    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
-    <timezone id="Africa/Windhoek">ווינדהוק</timezone>
-    <timezone id="Africa/Brazzaville">בראזאווייל</timezone>
-    <timezone id="Asia/Amman">רבת עמון</timezone>
-    <timezone id="Europe/Athens">אתונה</timezone>
-    <timezone id="Asia/Beirut">ביירות</timezone>
-    <timezone id="Africa/Cairo">קהיר</timezone>
-    <timezone id="Europe/Helsinki">הלסינקי</timezone>
-    <timezone id="Asia/Jerusalem">ירושלים</timezone>
-    <timezone id="Europe/Minsk">מינסק</timezone>
-    <timezone id="Africa/Harare">הררה</timezone>
-    <timezone id="Asia/Baghdad">בגדד</timezone>
-    <timezone id="Europe/Moscow">אירופה/מוסקבה</timezone>
-    <timezone id="Asia/Kuwait">כווית</timezone>
-    <timezone id="Africa/Nairobi">ניירובי</timezone>
-    <timezone id="Asia/Tehran">טהרן</timezone>
-    <timezone id="Asia/Baku">באקו</timezone>
-    <timezone id="Asia/Tbilisi">טביליסי</timezone>
-    <timezone id="Asia/Yerevan">ירבאן</timezone>
-    <timezone id="Asia/Dubai">דובאי</timezone>
-    <timezone id="Asia/Kabul">קאבול</timezone>
-    <timezone id="Asia/Karachi">קאראצ'י</timezone>
-    <timezone id="Asia/Oral">אסיה/אורל</timezone>
-    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">קולומבו</timezone>
-    <timezone id="Asia/Katmandu">קטמנדו</timezone>
-    <timezone id="Asia/Almaty">אלמאטי</timezone>
-    <timezone id="Asia/Rangoon">ראנגון</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
-    <timezone id="Asia/Bangkok">בנקוק</timezone>
-    <timezone id="Asia/Shanghai">בייג'ין</timezone>
-    <timezone id="Asia/Hong_Kong">הונג קונג</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">קואלה לומפור</timezone>
-    <timezone id="Australia/Perth">אוסטרליה/פרת'</timezone>
-    <timezone id="Asia/Taipei">טייפה</timezone>
-    <timezone id="Asia/Seoul">דרום קוריאה</timezone>
-    <timezone id="Asia/Tokyo">טוקיו</timezone>
-    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
-    <timezone id="Australia/Adelaide">אדלייד</timezone>
-    <timezone id="Australia/Darwin">אוסטרליה/דרווין</timezone>
-    <timezone id="Australia/Brisbane">אוסטרליה/בריסבן</timezone>
-    <timezone id="Australia/Hobart">אוסטרליה/הוברט</timezone>
-    <timezone id="Australia/Sydney">אוסטרליה/סידני</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">גואם</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">פסיפי/אוקלנד</timezone>
-    <timezone id="Pacific/Fiji">פיג'י</timezone>
-    <timezone id="Pacific/Tongatapu">טונגטאפו</timezone>
-</timezones>
diff --git a/res/xml-hr/timezones.xml b/res/xml-hr/timezones.xml
deleted file mode 100644
index 8b3373b..0000000
--- a/res/xml-hr/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Alaska vremenska zona</timezone>
-    <timezone id="America/Los_Angeles">Pacifičko vrijeme (Los Angeles)</timezone>
-    <timezone id="America/Tijuana">Pacifičko vrijeme (Tijuana)</timezone>
-    <timezone id="America/Phoenix">Planinsko vrijeme (Phoenix)</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Planinsko vrijeme (Denver)</timezone>
-    <timezone id="America/Costa_Rica">Središnje vrijeme (Kostarika)</timezone>
-    <timezone id="America/Chicago">Središnje vrijeme (Chicago)</timezone>
-    <timezone id="America/Mexico_City">Središnje vrijeme (Mexico City)</timezone>
-    <timezone id="America/Regina">Središnje vrijeme (Regina)</timezone>
-    <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">Istočno vrijeme (New York)</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Atlantsko vrijeme (Barbados)</timezone>
-    <timezone id="America/Halifax">Atlantsko vrijeme (Halifax)</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">St. John's</timezone>
-    <timezone id="America/Sao_Paulo">Sao Paulo</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
-    <timezone id="America/Godthab">Godthab</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">Južna Georgia</timezone>
-    <timezone id="Atlantic/Azores">Azorski otoci</timezone>
-    <timezone id="Atlantic/Cape_Verde">Zelenortska Republika</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">London</timezone>
-    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
-    <timezone id="Europe/Belgrade">Belgrade</timezone>
-    <timezone id="Europe/Brussels">Brussels</timezone>
-    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Zapadna Afrika (Brazzaville)</timezone>
-    <timezone id="Asia/Amman">Amman</timezone>
-    <timezone id="Europe/Athens">Atena</timezone>
-    <timezone id="Asia/Beirut">Beirut</timezone>
-    <timezone id="Africa/Cairo">Cairo</timezone>
-    <timezone id="Europe/Helsinki">Helsinki</timezone>
-    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Središnja Afrika (Harare)</timezone>
-    <timezone id="Asia/Baghdad">Baghdad</timezone>
-    <timezone id="Europe/Moscow">Moskva</timezone>
-    <timezone id="Asia/Kuwait">Kuvajt</timezone>
-    <timezone id="Africa/Nairobi">Istočna Afrika (Nairobi)</timezone>
-    <timezone id="Asia/Tehran">Tehran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Yerevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Peking</timezone>
-    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Seoul</timezone>
-    <timezone id="Asia/Tokyo">Tokio</timezone>
-    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
-    <timezone id="Australia/Adelaide">Adelaide</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Sydney</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fidži</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-hu/timezones.xml b/res/xml-hu/timezones.xml
deleted file mode 100644
index b466b8a..0000000
--- a/res/xml-hu/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Marshall-szigeteki idő (Majuro-zátony)</timezone>
-    <timezone id="Pacific/Midway">Midway-szigetek</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Csendes-óceáni idő (Los Angeles)</timezone>
-    <timezone id="America/Tijuana">Csendes-óceáni idő (Tijuana)</timezone>
-    <timezone id="America/Phoenix">Hegyvidéki idő (Phoenix)</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Hegyvidéki idő (Denver)</timezone>
-    <timezone id="America/Costa_Rica">Középső államokbeli idő (Costa Rica)</timezone>
-    <timezone id="America/Chicago">Középső államokbeli idő (Chicago)</timezone>
-    <timezone id="America/Mexico_City">Középső államokbeli idő (Mexikóváros)</timezone>
-    <timezone id="America/Regina">Középső államokbeli idő (Regina)</timezone>
-    <timezone id="America/Bogota">Kolumbiai idő (Bogota)</timezone>
-    <timezone id="America/New_York">Keleti államokbeli idő (New York)</timezone>
-    <timezone id="America/Caracas">Venezuelai idő (Caracas)</timezone>
-    <timezone id="America/Barbados">Atlanti-óceáni idő (Barbadosz)</timezone>
-    <timezone id="America/Halifax">Atlanti-óceáni idő (Halifax)</timezone>
-    <timezone id="America/Manaus">Amazóniai idő (Manaus)</timezone>
-    <timezone id="America/Santiago">Chilei idő (Santiago)</timezone>
-    <timezone id="America/St_Johns">Új-fundlandi idő (St. John's)</timezone>
-    <timezone id="America/Sao_Paulo">Brazíliai idő (Sao Paulo)</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Argentína idő (Buenos Aires)</timezone>
-    <timezone id="America/Godthab">Nyugat-grönlandi idő (Godthåb)</timezone>
-    <timezone id="America/Montevideo">Uruguayi idő (Montevideo)</timezone>
-    <timezone id="Atlantic/South_Georgia">Dél-grúziai idő (Dél-Georgia)</timezone>
-    <timezone id="Atlantic/Azores">Azori-szigetek</timezone>
-    <timezone id="Atlantic/Cape_Verde">Cape verdei idő (Zöld-Foki Szigetek)</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">Greenwichi középidő (London)</timezone>
-    <timezone id="Europe/Amsterdam">Közép-európai idő (Amsterdam)</timezone>
-    <timezone id="Europe/Belgrade">Közép-európai idő (Szerbia)</timezone>
-    <timezone id="Europe/Brussels">Közép-európai idő (Brüsszel)</timezone>
-    <timezone id="Europe/Sarajevo">Közép-európai idő (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Nigériai idő (Brazzaville)</timezone>
-    <timezone id="Asia/Amman">Kelet-európai idő (Amman)</timezone>
-    <timezone id="Europe/Athens">Kelet-európai idő (Athén)</timezone>
-    <timezone id="Asia/Beirut">Kelet-európai idő (Bejrút)</timezone>
-    <timezone id="Africa/Cairo">Kelet-európai idő (Kairó)</timezone>
-    <timezone id="Europe/Helsinki">Kelet-európai idő (Helsinki)</timezone>
-    <timezone id="Asia/Jerusalem">Izraeli zónaidő (Jerusalem)</timezone>
-    <timezone id="Europe/Minsk">Minszk</timezone>
-    <timezone id="Africa/Harare">Mozambiki idő (Harare)</timezone>
-    <timezone id="Asia/Baghdad">Arab idő (Bagdad)</timezone>
-    <timezone id="Europe/Moscow">Moszkva</timezone>
-    <timezone id="Asia/Kuwait">Arab idő (Kuvait)</timezone>
-    <timezone id="Africa/Nairobi">Kenyai idő (Nairobi)</timezone>
-    <timezone id="Asia/Tehran">Iráni zónaidő (Teherán)</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Jereván</timezone>
-    <timezone id="Asia/Dubai">Öbölbeli zónaidő (Dubai)</timezone>
-    <timezone id="Asia/Kabul">Afganisztáni idő (Kabul)</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Jekatyerinburg</timezone>
-    <timezone id="Asia/Calcutta">Indiai zónaidő (Calcutta)</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Nepáli idő (Katmandu)</timezone>
-    <timezone id="Asia/Almaty">Alma-Ata</timezone>
-    <timezone id="Asia/Rangoon">Myanmari idő (Rangoon)</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasznojarszki idő (Krasznojarszk)</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Kínai zónaidő (Peking)</timezone>
-    <timezone id="Asia/Hong_Kong">Hongkongi idő (Hong Kong)</timezone>
-    <timezone id="Asia/Irkutsk">Irkutszki idő (Irkutszk)</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Nyugat-ausztrál idő (Perth)</timezone>
-    <timezone id="Asia/Taipei">Tajvan</timezone>
-    <timezone id="Asia/Seoul">Koreai idő (Dél-Korea)</timezone>
-    <timezone id="Asia/Tokyo">Japán zónaidő (Tokio)</timezone>
-    <timezone id="Asia/Yakutsk">Jakutszki idő (Jakutszk)</timezone>
-    <timezone id="Australia/Adelaide">Közép-ausztráliai idő (Adelaide)</timezone>
-    <timezone id="Australia/Darwin">Közép-ausztráliai idő (Darwin)</timezone>
-    <timezone id="Australia/Brisbane">Kelet-ausztrál idő (Brisbane)</timezone>
-    <timezone id="Australia/Hobart">Kelet-ausztrál idő (Hobart)</timezone>
-    <timezone id="Australia/Sydney">Kelet-ausztrál idő (Sydney)</timezone>
-    <timezone id="Asia/Vladivostok">Vlagyivosztoki idő (Vlagyivosztok)</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadáni idő (Magadán)</timezone>
-    <timezone id="Pacific/Auckland">Új-zélandi idő (Auckland)</timezone>
-    <timezone id="Pacific/Fiji">Fidzsi idő (Fidzsi)</timezone>
-    <timezone id="Pacific/Tongatapu">Tongai idő (Tongatapu)</timezone>
-</timezones>
diff --git a/res/xml-id/timezones.xml b/res/xml-id/timezones.xml
deleted file mode 100644
index 23821a6b..0000000
--- a/res/xml-id/timezones.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Alaska Time</timezone>
-    <timezone id="America/Los_Angeles">Los Angeles</timezone>
-    <timezone id="America/Tijuana">Tijuana</timezone>
-    <timezone id="America/Phoenix">Phoenix</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Denver</timezone>
-    <timezone id="America/Costa_Rica">Kosta Rika</timezone>
-    <timezone id="America/Chicago">Chicago</timezone>
-    <timezone id="America/Mexico_City">Mexico City</timezone>
-    <timezone id="America/Regina">Regina</timezone>
-    <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">New York</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Barbados</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">St. John's</timezone>
-    <timezone id="America/Sao_Paulo">Sao Paulo</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
-    <timezone id="America/Godthab">Godthab</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
-    <timezone id="Atlantic/Azores">Azores</timezone>
-    <timezone id="Atlantic/Cape_Verde">Cape Verde</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">London</timezone>
-    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
-    <timezone id="Europe/Belgrade">Belgrade</timezone>
-    <timezone id="Europe/Brussels">Brussels</timezone>
-    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
-    <timezone id="Asia/Amman">Amman</timezone>
-    <timezone id="Europe/Athens">Athens</timezone>
-    <timezone id="Asia/Beirut">Beirut</timezone>
-    <timezone id="Africa/Cairo">Cairo</timezone>
-    <timezone id="Europe/Helsinki">Helsinki</timezone>
-    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
-    <timezone id="Asia/Baghdad">Baghdad</timezone>
-    <timezone id="Europe/Moscow">Moscow</timezone>
-    <timezone id="Asia/Kuwait">Kuwait</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
-    <timezone id="Asia/Tehran">Tehran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Yerevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Beijing</timezone>
-    <timezone id="Asia/Hong_Kong">Hongkong</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Seoul</timezone>
-    <timezone id="Asia/Tokyo">Tokyo</timezone>
-    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
-    <timezone id="Australia/Adelaide">Adelaide</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Sydney</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fiji</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-in/timezones.xml b/res/xml-in/timezones.xml
deleted file mode 100644
index 7f36436..0000000
--- a/res/xml-in/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Los Angeles</timezone>
-    <timezone id="America/Tijuana">Tijuana</timezone>
-    <timezone id="America/Phoenix">Phoenix</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Denver</timezone>
-    <timezone id="America/Costa_Rica">Costa Rica</timezone>
-    <timezone id="America/Chicago">Chicago</timezone>
-    <timezone id="America/Mexico_City">Mexico City</timezone>
-    <timezone id="America/Regina">Regina</timezone>
-    <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">New York</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Barbados</timezone>
-    <timezone id="America/Halifax">Halifax</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">St. John's</timezone>
-    <timezone id="America/Sao_Paulo">Sao Paulo</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
-    <timezone id="America/Godthab">Godthab</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
-    <timezone id="Atlantic/Azores">Azores</timezone>
-    <timezone id="Atlantic/Cape_Verde">Cape Verde</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">London</timezone>
-    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
-    <timezone id="Europe/Belgrade">Belgrade</timezone>
-    <timezone id="Europe/Brussels">Brussels</timezone>
-    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
-    <timezone id="Asia/Amman">Amman</timezone>
-    <timezone id="Europe/Athens">Athens</timezone>
-    <timezone id="Asia/Beirut">Beirut</timezone>
-    <timezone id="Africa/Cairo">Cairo</timezone>
-    <timezone id="Europe/Helsinki">Helsinki</timezone>
-    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
-    <timezone id="Asia/Baghdad">Baghdad</timezone>
-    <timezone id="Europe/Moscow">Moscow</timezone>
-    <timezone id="Asia/Kuwait">Kuwait</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
-    <timezone id="Asia/Tehran">Tehran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Yerevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Shanghai</timezone>
-    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Seoul</timezone>
-    <timezone id="Asia/Tokyo">Tokyo</timezone>
-    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
-    <timezone id="Australia/Adelaide">Adelaide</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Sydney</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fiji</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-it/timezones.xml b/res/xml-it/timezones.xml
deleted file mode 100644
index ca841f6..0000000
--- a/res/xml-it/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Fuso orario Alaska</timezone>
-    <timezone id="America/Los_Angeles">Los Angeles</timezone>
-    <timezone id="America/Tijuana">Tijuana</timezone>
-    <timezone id="America/Phoenix">Phoenix</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Denver</timezone>
-    <timezone id="America/Costa_Rica">Costa Rica</timezone>
-    <timezone id="America/Chicago">Chicago</timezone>
-    <timezone id="America/Mexico_City">Città del Messico</timezone>
-    <timezone id="America/Regina">Regina</timezone>
-    <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">New York</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Barbados</timezone>
-    <timezone id="America/Halifax">Halifax</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">St. Johns</timezone>
-    <timezone id="America/Sao_Paulo">San Paolo</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
-    <timezone id="America/Godthab">Godthab</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">Georgia meridionale</timezone>
-    <timezone id="Atlantic/Azores">Azzorre</timezone>
-    <timezone id="Atlantic/Cape_Verde">Capo Verde</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">Londra</timezone>
-    <timezone id="Europe/Amsterdam">Ora Standard Europa Centrale (Amsterdam)</timezone>
-    <timezone id="Europe/Belgrade">Ora Standard Europa Centrale (Belgrade)</timezone>
-    <timezone id="Europe/Brussels">Ora Standard Europa Centrale (Bruxelles)</timezone>
-    <timezone id="Europe/Sarajevo">Ora Standard Europa Centrale (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
-    <timezone id="Asia/Amman">Ora Standard Europa Orientale (Amman)</timezone>
-    <timezone id="Europe/Athens">Ora Standard Europa Orientale (Atene)</timezone>
-    <timezone id="Asia/Beirut">Ora Standard Europa Orientale (Beirut)</timezone>
-    <timezone id="Africa/Cairo">Ora Standard Europa Orientale (Cairo)</timezone>
-    <timezone id="Europe/Helsinki">Ora Standard Europa Orientale (Helsinki)</timezone>
-    <timezone id="Asia/Jerusalem">Ora Standard Israele (Gerusalemme)</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
-    <timezone id="Asia/Baghdad">Baghdad</timezone>
-    <timezone id="Europe/Moscow">Mosca</timezone>
-    <timezone id="Asia/Kuwait">Kuwait</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
-    <timezone id="Asia/Tehran">Teheran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Yerevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Ora Standard Cina (Pechino)</timezone>
-    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Seul</timezone>
-    <timezone id="Asia/Tokyo">Ora Standard Giappone (Tokyo)</timezone>
-    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
-    <timezone id="Australia/Adelaide">Adelaide</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Sydney</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Figi</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-iw/timezones.xml b/res/xml-iw/timezones.xml
deleted file mode 100644
index 7f36436..0000000
--- a/res/xml-iw/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Los Angeles</timezone>
-    <timezone id="America/Tijuana">Tijuana</timezone>
-    <timezone id="America/Phoenix">Phoenix</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Denver</timezone>
-    <timezone id="America/Costa_Rica">Costa Rica</timezone>
-    <timezone id="America/Chicago">Chicago</timezone>
-    <timezone id="America/Mexico_City">Mexico City</timezone>
-    <timezone id="America/Regina">Regina</timezone>
-    <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">New York</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Barbados</timezone>
-    <timezone id="America/Halifax">Halifax</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">St. John's</timezone>
-    <timezone id="America/Sao_Paulo">Sao Paulo</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
-    <timezone id="America/Godthab">Godthab</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
-    <timezone id="Atlantic/Azores">Azores</timezone>
-    <timezone id="Atlantic/Cape_Verde">Cape Verde</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">London</timezone>
-    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
-    <timezone id="Europe/Belgrade">Belgrade</timezone>
-    <timezone id="Europe/Brussels">Brussels</timezone>
-    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
-    <timezone id="Asia/Amman">Amman</timezone>
-    <timezone id="Europe/Athens">Athens</timezone>
-    <timezone id="Asia/Beirut">Beirut</timezone>
-    <timezone id="Africa/Cairo">Cairo</timezone>
-    <timezone id="Europe/Helsinki">Helsinki</timezone>
-    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
-    <timezone id="Asia/Baghdad">Baghdad</timezone>
-    <timezone id="Europe/Moscow">Moscow</timezone>
-    <timezone id="Asia/Kuwait">Kuwait</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
-    <timezone id="Asia/Tehran">Tehran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Yerevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Shanghai</timezone>
-    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Seoul</timezone>
-    <timezone id="Asia/Tokyo">Tokyo</timezone>
-    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
-    <timezone id="Australia/Adelaide">Adelaide</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Sydney</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fiji</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-ja/timezones.xml b/res/xml-ja/timezones.xml
deleted file mode 100644
index 69a13cc..0000000
--- a/res/xml-ja/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">マジュロ</timezone>
-    <timezone id="Pacific/Midway">ミッドウェー</timezone>
-    <timezone id="Pacific/Honolulu">ホノルル</timezone>
-    <timezone id="America/Anchorage">アンカレッジ</timezone>
-    <timezone id="America/Los_Angeles">アメリカ太平洋時間 (ロサンゼルス)</timezone>
-    <timezone id="America/Tijuana">アメリカ太平洋時間 (ティフアナ)</timezone>
-    <timezone id="America/Phoenix">アメリカ山地時間 (フェニックス)</timezone>
-    <timezone id="America/Chihuahua">チワワ</timezone>
-    <timezone id="America/Denver">アメリカ山地時間 (デンバー)</timezone>
-    <timezone id="America/Costa_Rica">アメリカ中部時間 (コスタリカ共和国)</timezone>
-    <timezone id="America/Chicago">アメリカ中部時間 (シカゴ)</timezone>
-    <timezone id="America/Mexico_City">アメリカ中部時間 (メキシコシティー)</timezone>
-    <timezone id="America/Regina">アメリカ中部時間 (レジャイナ)</timezone>
-    <timezone id="America/Bogota">ボゴタ</timezone>
-    <timezone id="America/New_York">アメリカ東部時間 (ニューヨーク)</timezone>
-    <timezone id="America/Caracas">カラカス</timezone>
-    <timezone id="America/Barbados">大西洋時間 (バルバドス)</timezone>
-    <timezone id="America/Halifax">大西洋時間 (ハリファクス)</timezone>
-    <timezone id="America/Manaus">アマゾン時間 (マナウス)</timezone>
-    <timezone id="America/Santiago">アメリカ/サンチアゴ</timezone>
-    <timezone id="America/St_Johns">ニューファンドランド島標準時 (セントジョンズ)</timezone>
-    <timezone id="America/Sao_Paulo">ブラジリア時間 (サンパウロ)</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">アルゼンチン時間 (ブエノスアイレス)</timezone>
-    <timezone id="America/Godthab">アメリカ/ゴッドホープ</timezone>
-    <timezone id="America/Montevideo">モンテビデオ</timezone>
-    <timezone id="Atlantic/South_Georgia">南ジョージア島</timezone>
-    <timezone id="Atlantic/Azores">アゾレス諸島</timezone>
-    <timezone id="Atlantic/Cape_Verde">カボベルデ共和国</timezone>
-    <timezone id="Africa/Casablanca">カサブランカ</timezone>
-    <timezone id="Europe/London">グリニッジ標準時 (ヨーロッパ/ロンドン)</timezone>
-    <timezone id="Europe/Amsterdam">中欧標準時 (アムステルダム)</timezone>
-    <timezone id="Europe/Belgrade">中欧標準時 (Belgrade)</timezone>
-    <timezone id="Europe/Brussels">中欧標準時 (ブリュッセル)</timezone>
-    <timezone id="Europe/Sarajevo">中欧標準時 (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">ビントフック</timezone>
-    <timezone id="Africa/Brazzaville">西アフリカ時間 (ブラザビル)</timezone>
-    <timezone id="Asia/Amman">東欧標準時 (アンマン)</timezone>
-    <timezone id="Europe/Athens">東欧標準時 (アテネ)</timezone>
-    <timezone id="Asia/Beirut">東欧標準時 (ベイルート)</timezone>
-    <timezone id="Africa/Cairo">東欧標準時 (カイロ)</timezone>
-    <timezone id="Europe/Helsinki">東欧標準時 (ヘルシンキ)</timezone>
-    <timezone id="Asia/Jerusalem">イスラエル標準時 (エルサレム)</timezone>
-    <timezone id="Europe/Minsk">ミンスク</timezone>
-    <timezone id="Africa/Harare">中央アフリカ時間 (ハラーレ)</timezone>
-    <timezone id="Asia/Baghdad">バグダッド</timezone>
-    <timezone id="Europe/Moscow">モスクワ</timezone>
-    <timezone id="Asia/Kuwait">クウェート国</timezone>
-    <timezone id="Africa/Nairobi">東アフリカ時間 (ナイロビ)</timezone>
-    <timezone id="Asia/Tehran">テヘラン</timezone>
-    <timezone id="Asia/Baku">バクー</timezone>
-    <timezone id="Asia/Tbilisi">トビリシ</timezone>
-    <timezone id="Asia/Yerevan">エレバン</timezone>
-    <timezone id="Asia/Dubai">ドバイ</timezone>
-    <timezone id="Asia/Kabul">カブール</timezone>
-    <timezone id="Asia/Karachi">カラチ</timezone>
-    <timezone id="Asia/Oral">オラル</timezone>
-    <timezone id="Asia/Yekaterinburg">エカテリンブルグ</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">コロンボ</timezone>
-    <timezone id="Asia/Katmandu">カトマンズ</timezone>
-    <timezone id="Asia/Almaty">アルマトイ</timezone>
-    <timezone id="Asia/Rangoon">ラングーン</timezone>
-    <timezone id="Asia/Krasnoyarsk">クラスノヤルスク</timezone>
-    <timezone id="Asia/Bangkok">バンコク</timezone>
-    <timezone id="Asia/Shanghai">中国標準時 (北京)</timezone>
-    <timezone id="Asia/Hong_Kong">香港</timezone>
-    <timezone id="Asia/Irkutsk">イルクーツク</timezone>
-    <timezone id="Asia/Kuala_Lumpur">アジア/クアラルンプール</timezone>
-    <timezone id="Australia/Perth">パース</timezone>
-    <timezone id="Asia/Taipei">台北</timezone>
-    <timezone id="Asia/Seoul">ソウル</timezone>
-    <timezone id="Asia/Tokyo">日本標準時 (東京)</timezone>
-    <timezone id="Asia/Yakutsk">ヤクーツク</timezone>
-    <timezone id="Australia/Adelaide">アデレード</timezone>
-    <timezone id="Australia/Darwin">ダーウィン</timezone>
-    <timezone id="Australia/Brisbane">ブリスベン</timezone>
-    <timezone id="Australia/Hobart">ホバート</timezone>
-    <timezone id="Australia/Sydney">シドニー</timezone>
-    <timezone id="Asia/Vladivostok">ウラジオストク</timezone>
-    <timezone id="Pacific/Guam">グアム</timezone>
-    <timezone id="Asia/Magadan">マガダン</timezone>
-    <timezone id="Pacific/Auckland">太平洋/オークランド</timezone>
-    <timezone id="Pacific/Fiji">フィジー共和国</timezone>
-    <timezone id="Pacific/Tongatapu">トンガタプ</timezone>
-</timezones>
diff --git a/res/xml-ko/timezones.xml b/res/xml-ko/timezones.xml
deleted file mode 100644
index d52dde1..0000000
--- a/res/xml-ko/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">마주로</timezone>
-    <timezone id="Pacific/Midway">미드웨이</timezone>
-    <timezone id="Pacific/Honolulu">호놀룰루</timezone>
-    <timezone id="America/Anchorage">앵커리지</timezone>
-    <timezone id="America/Los_Angeles">태평양 표준시 (로스앤젤레스)</timezone>
-    <timezone id="America/Tijuana">태평양 표준시 (티후아나)</timezone>
-    <timezone id="America/Phoenix">산지 표준시 (피닉스)</timezone>
-    <timezone id="America/Chihuahua">치와와</timezone>
-    <timezone id="America/Denver">산지 표준시 (덴버)</timezone>
-    <timezone id="America/Costa_Rica">중부 표준시 (코스타리카)</timezone>
-    <timezone id="America/Chicago">중부 표준시 (시카고)</timezone>
-    <timezone id="America/Mexico_City">중부 표준시 (멕시코 시티)</timezone>
-    <timezone id="America/Regina">중부 표준시 (리자이나)</timezone>
-    <timezone id="America/Bogota">보고타</timezone>
-    <timezone id="America/New_York">동부 표준시 (뉴욕)</timezone>
-    <timezone id="America/Caracas">카라카스</timezone>
-    <timezone id="America/Barbados">대서양 표준시 (바베이도스)</timezone>
-    <timezone id="America/Halifax">대서양 표준시 (핼리팩스)</timezone>
-    <timezone id="America/Manaus">아마존 표준시 (마나우스)</timezone>
-    <timezone id="America/Santiago">산티아고</timezone>
-    <timezone id="America/St_Johns">뉴펀들랜드 표준시 (세인트존)</timezone>
-    <timezone id="America/Sao_Paulo">브라질리아 표준시 (상파울로)</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">부에노스 아이레스</timezone>
-    <timezone id="America/Godthab">고드호프</timezone>
-    <timezone id="America/Montevideo">몬테비데오</timezone>
-    <timezone id="Atlantic/South_Georgia">사우스 조지아 표준시 (남부 조지아)</timezone>
-    <timezone id="Atlantic/Azores">아조레스</timezone>
-    <timezone id="Atlantic/Cape_Verde">카보 베르데 표준시 (카보 베르데)</timezone>
-    <timezone id="Africa/Casablanca">카사블랑카</timezone>
-    <timezone id="Europe/London">그리니치 표준시 (런던)</timezone>
-    <timezone id="Europe/Amsterdam">중부유럽 표준시 (암스텔담)</timezone>
-    <timezone id="Europe/Belgrade">중부유럽 표준시 (Belgrade)</timezone>
-    <timezone id="Europe/Brussels">중부유럽 표준시 (브뤼셀)</timezone>
-    <timezone id="Europe/Sarajevo">중부유럽 표준시 (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">빈트후크</timezone>
-    <timezone id="Africa/Brazzaville">서아프리카 시간 (브라자빌)</timezone>
-    <timezone id="Asia/Amman">동부유럽 표준시 (암만)</timezone>
-    <timezone id="Europe/Athens">동부유럽 표준시 (아테네)</timezone>
-    <timezone id="Asia/Beirut">동부유럽 표준시 (베이루트)</timezone>
-    <timezone id="Africa/Cairo">동부유럽 표준시 (카이로)</timezone>
-    <timezone id="Europe/Helsinki">동부유럽 표준시 (헬싱키)</timezone>
-    <timezone id="Asia/Jerusalem">이스라엘 표준시 (예루살렘)</timezone>
-    <timezone id="Europe/Minsk">민스크</timezone>
-    <timezone id="Africa/Harare">중앙아프리카 시간 (하라레)</timezone>
-    <timezone id="Asia/Baghdad">아라비아 시간 (바그다드)</timezone>
-    <timezone id="Europe/Moscow">모스크바</timezone>
-    <timezone id="Asia/Kuwait">아라비아 시간 (쿠웨이트)</timezone>
-    <timezone id="Africa/Nairobi">동아프리카 시간 (나이로비)</timezone>
-    <timezone id="Asia/Tehran">테헤란</timezone>
-    <timezone id="Asia/Baku">바쿠</timezone>
-    <timezone id="Asia/Tbilisi">트빌리시</timezone>
-    <timezone id="Asia/Yerevan">예레반</timezone>
-    <timezone id="Asia/Dubai">두바이</timezone>
-    <timezone id="Asia/Kabul">카불</timezone>
-    <timezone id="Asia/Karachi">카라치</timezone>
-    <timezone id="Asia/Oral">오랄</timezone>
-    <timezone id="Asia/Yekaterinburg">예카테린부르크</timezone>
-    <timezone id="Asia/Calcutta">인도 표준시 (Calcutta)</timezone>
-    <timezone id="Asia/Colombo">콜롬보</timezone>
-    <timezone id="Asia/Katmandu">카트만두</timezone>
-    <timezone id="Asia/Almaty">알마티</timezone>
-    <timezone id="Asia/Rangoon">랑군</timezone>
-    <timezone id="Asia/Krasnoyarsk">크라스노야르스크</timezone>
-    <timezone id="Asia/Bangkok">방콕</timezone>
-    <timezone id="Asia/Shanghai">중국 표준시 (베이징)</timezone>
-    <timezone id="Asia/Hong_Kong">홍콩</timezone>
-    <timezone id="Asia/Irkutsk">이르쿠츠크</timezone>
-    <timezone id="Asia/Kuala_Lumpur">쿠알라룸푸르</timezone>
-    <timezone id="Australia/Perth">서부 오스트레일리아 시간 (퍼스)</timezone>
-    <timezone id="Asia/Taipei">타이베이</timezone>
-    <timezone id="Asia/Seoul">한국 표준시 (서울)</timezone>
-    <timezone id="Asia/Tokyo">일본 표준시 (도쿄)</timezone>
-    <timezone id="Asia/Yakutsk">야쿠츠크</timezone>
-    <timezone id="Australia/Adelaide">중앙 오스트레일리아 시간 (애들레이드)</timezone>
-    <timezone id="Australia/Darwin">중앙 오스트레일리아 시간 (다윈)</timezone>
-    <timezone id="Australia/Brisbane">동부 오스트레일리아 시간 (브리스베인)</timezone>
-    <timezone id="Australia/Hobart">동부 오스트레일리아 시간 (호바트)</timezone>
-    <timezone id="Australia/Sydney">동부 오스트레일리아 시간 (시드니)</timezone>
-    <timezone id="Asia/Vladivostok">블라디보스토크</timezone>
-    <timezone id="Pacific/Guam">괌</timezone>
-    <timezone id="Asia/Magadan">마가단</timezone>
-    <timezone id="Pacific/Auckland">뉴질랜드 시간 (오클랜드)</timezone>
-    <timezone id="Pacific/Fiji">피지 표준시 (피지)</timezone>
-    <timezone id="Pacific/Tongatapu">통가타푸</timezone>
-</timezones>
diff --git a/res/xml-lt/timezones.xml b/res/xml-lt/timezones.xml
deleted file mode 100644
index 2974401..0000000
--- a/res/xml-lt/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Jungtinių Valstijų mažosios aplinkinės salos (Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Ankoridžas</timezone>
-    <timezone id="America/Los_Angeles">Ramiojo vandenyno laikas (Los Andželas)</timezone>
-    <timezone id="America/Tijuana">Ramiojo vandenyno laikas (Tichuana)</timezone>
-    <timezone id="America/Phoenix">Fyniksas</timezone>
-    <timezone id="America/Chihuahua">Čihuahua</timezone>
-    <timezone id="America/Denver">Denveris</timezone>
-    <timezone id="America/Costa_Rica">Centro laikas (Kosta Rika)</timezone>
-    <timezone id="America/Chicago">Centro laikas (Čikaga)</timezone>
-    <timezone id="America/Mexico_City">Centro laikas (Meksikas)</timezone>
-    <timezone id="America/Regina">Centro laikas (Redžina)</timezone>
-    <timezone id="America/Bogota">Kolumbijos laikas (Bogota)</timezone>
-    <timezone id="America/New_York">Rytų laikas (Niujorkas)</timezone>
-    <timezone id="America/Caracas">Venesuelos laikas (Karakasas)</timezone>
-    <timezone id="America/Barbados">Atlanto laikas (Barbadosas)</timezone>
-    <timezone id="America/Halifax">Atlanto laikas (Halifaksas)</timezone>
-    <timezone id="America/Manaus">Amazonės laikas (Manausas)</timezone>
-    <timezone id="America/Santiago">Čilės laikas (Santjagas)</timezone>
-    <timezone id="America/St_Johns">Niufaundlendo laikas (St. John's)</timezone>
-    <timezone id="America/Sao_Paulo">Brazilijos laikas (San Paulas)</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Argentinos laikas (Buenos Airės)</timezone>
-    <timezone id="America/Godthab">Grenlandijos vakarų laikas (Godthabas)</timezone>
-    <timezone id="America/Montevideo">Urugvajaus laikas (Montevidëjas)</timezone>
-    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
-    <timezone id="Atlantic/Azores">Azorai</timezone>
-    <timezone id="Atlantic/Cape_Verde">Cape Verde</timezone>
-    <timezone id="Africa/Casablanca">Kasablanka</timezone>
-    <timezone id="Europe/London">GMT (Londonas)</timezone>
-    <timezone id="Europe/Amsterdam">Vidurio Europos laikas (Amsterdamas)</timezone>
-    <timezone id="Europe/Belgrade">Vidurio Europos laikas (Belgrade)</timezone>
-    <timezone id="Europe/Brussels">Vidurio Europos laikas (Briuselis)</timezone>
-    <timezone id="Europe/Sarajevo">Vidurio Europos laikas (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Vakarų Afrikos laikas (Brazavilis)</timezone>
-    <timezone id="Asia/Amman">Rytų Europos laikas (Amanas)</timezone>
-    <timezone id="Europe/Athens">Rytų Europos laikas (Atėnai)</timezone>
-    <timezone id="Asia/Beirut">Rytų Europos laikas (Beirutas)</timezone>
-    <timezone id="Africa/Cairo">Rytų Europos laikas (Kairas)</timezone>
-    <timezone id="Europe/Helsinki">Rytų Europos laikas (Helsinkis)</timezone>
-    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
-    <timezone id="Europe/Minsk">Minskas</timezone>
-    <timezone id="Africa/Harare">Centrinės Afrikos laikas (Harare)</timezone>
-    <timezone id="Asia/Baghdad">Bagdadas</timezone>
-    <timezone id="Europe/Moscow">Maskva</timezone>
-    <timezone id="Asia/Kuwait">Kuveitas</timezone>
-    <timezone id="Africa/Nairobi">Rytų Afrikos laikas (Nairobis)</timezone>
-    <timezone id="Asia/Tehran">Teheranas</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisis</timezone>
-    <timezone id="Asia/Yerevan">Jerevanas</timezone>
-    <timezone id="Asia/Dubai">Dubajus</timezone>
-    <timezone id="Asia/Kabul">Kabulas</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Uralskas</timezone>
-    <timezone id="Asia/Yekaterinburg">Jekaterinburgas</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Kolombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">Alma Ata</timezone>
-    <timezone id="Asia/Rangoon">Rangūnas</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnojarskas</timezone>
-    <timezone id="Asia/Bangkok">Bankokas</timezone>
-    <timezone id="Asia/Shanghai">Shanghai</timezone>
-    <timezone id="Asia/Hong_Kong">Honkongas</timezone>
-    <timezone id="Asia/Irkutsk">Irkutskas</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Pertas</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Seulas</timezone>
-    <timezone id="Asia/Tokyo">Tokyo</timezone>
-    <timezone id="Asia/Yakutsk">Jakutskas</timezone>
-    <timezone id="Australia/Adelaide">Adelaidė</timezone>
-    <timezone id="Australia/Darwin">Darvinas</timezone>
-    <timezone id="Australia/Brisbane">Brisbanas</timezone>
-    <timezone id="Australia/Hobart">Hobartas</timezone>
-    <timezone id="Australia/Sydney">Sidnėjus</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostokas</timezone>
-    <timezone id="Pacific/Guam">Guamas</timezone>
-    <timezone id="Asia/Magadan">Magadanas</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fidžis</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-lv/timezones.xml b/res/xml-lv/timezones.xml
deleted file mode 100644
index 7442884..0000000
--- a/res/xml-lv/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Madžuro</timezone>
-    <timezone id="Pacific/Midway">Midveja</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Ankurāža</timezone>
-    <timezone id="America/Los_Angeles">Losandželosa</timezone>
-    <timezone id="America/Tijuana">Tihuāna</timezone>
-    <timezone id="America/Phoenix">Fīniksa</timezone>
-    <timezone id="America/Chihuahua">Čihuahua</timezone>
-    <timezone id="America/Denver">Denvera</timezone>
-    <timezone id="America/Costa_Rica">Kostarika</timezone>
-    <timezone id="America/Chicago">Čikāga</timezone>
-    <timezone id="America/Mexico_City">Mehiko</timezone>
-    <timezone id="America/Regina">Regīna</timezone>
-    <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">Ņujorka</timezone>
-    <timezone id="America/Caracas">Karakasa</timezone>
-    <timezone id="America/Barbados">Barbadosa</timezone>
-    <timezone id="America/Halifax">Halifaksa</timezone>
-    <timezone id="America/Manaus">Manausa</timezone>
-    <timezone id="America/Santiago">Santjago</timezone>
-    <timezone id="America/St_Johns">Sentdžonsa</timezone>
-    <timezone id="America/Sao_Paulo">Sanpaulu</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenosairesa</timezone>
-    <timezone id="America/Godthab">Nūka</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">Dienviddžordžija</timezone>
-    <timezone id="Atlantic/Azores">Azoru salas</timezone>
-    <timezone id="Atlantic/Cape_Verde">Kaboverde</timezone>
-    <timezone id="Africa/Casablanca">Kasablanka</timezone>
-    <timezone id="Europe/London">Londona</timezone>
-    <timezone id="Europe/Amsterdam">Centrāleiropas laiks (Amsterdama)</timezone>
-    <timezone id="Europe/Belgrade">Centrāleiropas laiks (Belgrade)</timezone>
-    <timezone id="Europe/Brussels">Centrāleiropas laiks (Brisele)</timezone>
-    <timezone id="Europe/Sarajevo">Centrāleiropas laiks (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Vindhuka</timezone>
-    <timezone id="Africa/Brazzaville">Brazavila</timezone>
-    <timezone id="Asia/Amman">Austrumeiropas laiks (Ammāna)</timezone>
-    <timezone id="Europe/Athens">Austrumeiropas laiks (Atēnas)</timezone>
-    <timezone id="Asia/Beirut">Austrumeiropas laiks (Beirūta)</timezone>
-    <timezone id="Africa/Cairo">Austrumeiropas laiks (Kaira)</timezone>
-    <timezone id="Europe/Helsinki">Austrumeiropas laiks (Helsinki)</timezone>
-    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
-    <timezone id="Europe/Minsk">Minska</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
-    <timezone id="Asia/Baghdad">Bagdāde</timezone>
-    <timezone id="Europe/Moscow">Maskava</timezone>
-    <timezone id="Asia/Kuwait">Kuveita</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
-    <timezone id="Asia/Tehran">Teherāna</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Erevāna</timezone>
-    <timezone id="Asia/Dubai">Dubaija</timezone>
-    <timezone id="Asia/Kabul">Kabula</timezone>
-    <timezone id="Asia/Karachi">Karači</timezone>
-    <timezone id="Asia/Oral">Orāla</timezone>
-    <timezone id="Asia/Yekaterinburg">Jekaterinburga</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Kolombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">Almati</timezone>
-    <timezone id="Asia/Rangoon">Jangona</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnojarska</timezone>
-    <timezone id="Asia/Bangkok">Bangkoka</timezone>
-    <timezone id="Asia/Shanghai">Shanghai</timezone>
-    <timezone id="Asia/Hong_Kong">Honkonga</timezone>
-    <timezone id="Asia/Irkutsk">Irkutska</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kualalumpura</timezone>
-    <timezone id="Australia/Perth">Pērta</timezone>
-    <timezone id="Asia/Taipei">Taipeja</timezone>
-    <timezone id="Asia/Seoul">Seula</timezone>
-    <timezone id="Asia/Tokyo">Tokija</timezone>
-    <timezone id="Asia/Yakutsk">Jakutska</timezone>
-    <timezone id="Australia/Adelaide">Adelaida</timezone>
-    <timezone id="Australia/Darwin">Dārvina</timezone>
-    <timezone id="Australia/Brisbane">Brisbena</timezone>
-    <timezone id="Australia/Hobart">Hobarta</timezone>
-    <timezone id="Australia/Sydney">Sidneja</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostoka</timezone>
-    <timezone id="Pacific/Guam">Guama</timezone>
-    <timezone id="Asia/Magadan">Magadāna</timezone>
-    <timezone id="Pacific/Auckland">Oklenda</timezone>
-    <timezone id="Pacific/Fiji">Fidži</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-nb/timezones.xml b/res/xml-nb/timezones.xml
deleted file mode 100644
index 4df0366..0000000
--- a/res/xml-nb/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Alaska</timezone>
-    <timezone id="America/Los_Angeles">PST (Los Angeles)</timezone>
-    <timezone id="America/Tijuana">PST (Tijuana)</timezone>
-    <timezone id="America/Phoenix">MST (Phoenix)</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">MST (Denver)</timezone>
-    <timezone id="America/Costa_Rica">Normaltid (Costa Rica)</timezone>
-    <timezone id="America/Chicago">Normaltid (Chicago)</timezone>
-    <timezone id="America/Mexico_City">Normaltid (Mexico by)</timezone>
-    <timezone id="America/Regina">Normaltid (Regina)</timezone>
-    <timezone id="America/Bogota">Bogotá</timezone>
-    <timezone id="America/New_York">New York</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">AT (Barbados)</timezone>
-    <timezone id="America/Halifax">AT (Halifax)</timezone>
-    <timezone id="America/Manaus">Amazonas-tid (Manaus)</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">St. John's</timezone>
-    <timezone id="America/Sao_Paulo">Brasilia-tid (São Paulo)</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
-    <timezone id="America/Godthab">Godthåb</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">Sør-Georgia</timezone>
-    <timezone id="Atlantic/Azores">Azorene</timezone>
-    <timezone id="Atlantic/Cape_Verde">Kapp Verde</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">Greenwich middeltid (London)</timezone>
-    <timezone id="Europe/Amsterdam">Sentraleuropeisk normaltid (Amsterdam)</timezone>
-    <timezone id="Europe/Belgrade">Sentraleuropeisk normaltid (Belgrade)</timezone>
-    <timezone id="Europe/Brussels">Sentraleuropeisk normaltid (Brussel)</timezone>
-    <timezone id="Europe/Sarajevo">Sentraleuropeisk normaltid (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Vestafrikansk tid (Brazzaville)</timezone>
-    <timezone id="Asia/Amman">østeuropeisk normaltid (Amman)</timezone>
-    <timezone id="Europe/Athens">østeuropeisk normaltid (Athen)</timezone>
-    <timezone id="Asia/Beirut">østeuropeisk normaltid (Beirut)</timezone>
-    <timezone id="Africa/Cairo">østeuropeisk normaltid (Kairo)</timezone>
-    <timezone id="Europe/Helsinki">østeuropeisk normaltid (Helsinki)</timezone>
-    <timezone id="Asia/Jerusalem">Israelsk standardtid (Jerusalem)</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Sentralafrikansk tid (Harare)</timezone>
-    <timezone id="Asia/Baghdad">Arabisk tid (Bagdad)</timezone>
-    <timezone id="Europe/Moscow">Moskva</timezone>
-    <timezone id="Asia/Kuwait">Arabisk tid (Kuwait)</timezone>
-    <timezone id="Africa/Nairobi">østafrikansk tid (Nairobi)</timezone>
-    <timezone id="Asia/Tehran">Teheran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Jerevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Jekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Indisk standardtid (Calcutta)</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
-    <timezone id="Asia/Bangkok">Indokinesisk tid (Bangkok)</timezone>
-    <timezone id="Asia/Shanghai">Kinesisk standardtid (Beijing)</timezone>
-    <timezone id="Asia/Hong_Kong">Hong Kong-tid (Hong Kong)</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Vestaustralsk tid (Perth)</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Koreansk standardtid (Seoul)</timezone>
-    <timezone id="Asia/Tokyo">Japansk standardtid (Tokyo)</timezone>
-    <timezone id="Asia/Yakutsk">Jakutsk</timezone>
-    <timezone id="Australia/Adelaide">Sentralaustralsk tid (Adelaide)</timezone>
-    <timezone id="Australia/Darwin">Sentralaustralsk tid (Darwin)</timezone>
-    <timezone id="Australia/Brisbane">østaustralsk tid (Brisbane)</timezone>
-    <timezone id="Australia/Hobart">østaustralsk tid (Hobart)</timezone>
-    <timezone id="Australia/Sydney">østaustralsk tid (Sydney)</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Newzealandsk tid (Auckland)</timezone>
-    <timezone id="Pacific/Fiji">Fiji</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-nl/timezones.xml b/res/xml-nl/timezones.xml
deleted file mode 100644
index 3da3ada..0000000
--- a/res/xml-nl/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Pacific-standaardtijd (Los Angeles)</timezone>
-    <timezone id="America/Tijuana">Pacific-standaardtijd (Tijuana)</timezone>
-    <timezone id="America/Phoenix">Mountain-standaardtijd (Phoenix)</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Mountain-standaardtijd (Denver)</timezone>
-    <timezone id="America/Costa_Rica">Central-standaardtijd (Costa Rica)</timezone>
-    <timezone id="America/Chicago">Central-standaardtijd (Chicago)</timezone>
-    <timezone id="America/Mexico_City">Central-standaardtijd (Mexico-stad)</timezone>
-    <timezone id="America/Regina">Central-standaardtijd (Regina)</timezone>
-    <timezone id="America/Bogota">Bogotá</timezone>
-    <timezone id="America/New_York">Eastern-standaardtijd (New York)</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Atlantic - standaardtijd (Barbados)</timezone>
-    <timezone id="America/Halifax">Atlantic - standaardtijd (Halifax)</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">Newfoundland-standaardtijd (St. Johns)</timezone>
-    <timezone id="America/Sao_Paulo">São Paulo</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
-    <timezone id="America/Godthab">Godthab</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">Zuid-Georgië</timezone>
-    <timezone id="Atlantic/Azores">Azoren</timezone>
-    <timezone id="Atlantic/Cape_Verde">Kaapverdië</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">Greenwich Mean Time (Londen)</timezone>
-    <timezone id="Europe/Amsterdam">Midden-Europese standaardtijd (Amsterdam)</timezone>
-    <timezone id="Europe/Belgrade">Midden-Europese standaardtijd (Belgrade)</timezone>
-    <timezone id="Europe/Brussels">Midden-Europese standaardtijd (Brussel)</timezone>
-    <timezone id="Europe/Sarajevo">Midden-Europese standaardtijd (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
-    <timezone id="Asia/Amman">Oost-Europese standaardtijd (Amman)</timezone>
-    <timezone id="Europe/Athens">Oost-Europese standaardtijd (Athene)</timezone>
-    <timezone id="Asia/Beirut">Oost-Europese standaardtijd (Beiroet)</timezone>
-    <timezone id="Africa/Cairo">Oost-Europese standaardtijd (Cairo)</timezone>
-    <timezone id="Europe/Helsinki">Oost-Europese standaardtijd (Helsinki)</timezone>
-    <timezone id="Asia/Jerusalem">Israëlische standaardtijd (Jeruzalem)</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
-    <timezone id="Asia/Baghdad">Baghdad</timezone>
-    <timezone id="Europe/Moscow">Moskou</timezone>
-    <timezone id="Asia/Kuwait">Koeweit</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
-    <timezone id="Asia/Tehran">Teheran</timezone>
-    <timezone id="Asia/Baku">Bakoe</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Erevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Jekaterinenburg</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Kathmandu</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Chinese standaardtijd (Beijing)</timezone>
-    <timezone id="Asia/Hong_Kong">Hongkong</timezone>
-    <timezone id="Asia/Irkutsk">Irkoetsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Seoul</timezone>
-    <timezone id="Asia/Tokyo">Japanse standaardtijd (Tokio)</timezone>
-    <timezone id="Asia/Yakutsk">Jakoetsk</timezone>
-    <timezone id="Australia/Adelaide">Adelaide</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Sydney</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fiji</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-pl/timezones.xml b/res/xml-pl/timezones.xml
deleted file mode 100644
index 580b94c..0000000
--- a/res/xml-pl/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Los Angeles</timezone>
-    <timezone id="America/Tijuana">Tijuana</timezone>
-    <timezone id="America/Phoenix">Phoenix</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Denver</timezone>
-    <timezone id="America/Costa_Rica">Kostaryka</timezone>
-    <timezone id="America/Chicago">Chicago</timezone>
-    <timezone id="America/Mexico_City">Meksyk</timezone>
-    <timezone id="America/Regina">Regina</timezone>
-    <timezone id="America/Bogota">Kolumbia</timezone>
-    <timezone id="America/New_York">Nowy Jork</timezone>
-    <timezone id="America/Caracas">Wenezuela</timezone>
-    <timezone id="America/Barbados">Barbados</timezone>
-    <timezone id="America/Halifax">Halifax</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">St. John's</timezone>
-    <timezone id="America/Sao_Paulo">Săo Paulo</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
-    <timezone id="America/Godthab">Grenlandia</timezone>
-    <timezone id="America/Montevideo">Urugwaj</timezone>
-    <timezone id="Atlantic/South_Georgia">Georgia Południowa</timezone>
-    <timezone id="Atlantic/Azores">Azory</timezone>
-    <timezone id="Atlantic/Cape_Verde">Zielony Przylądek</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">Londyn</timezone>
-    <timezone id="Europe/Amsterdam">Holandia</timezone>
-    <timezone id="Europe/Belgrade">Belgrad</timezone>
-    <timezone id="Europe/Brussels">Bruksela</timezone>
-    <timezone id="Europe/Sarajevo">Sarajewo</timezone>
-    <timezone id="Africa/Windhoek">Windhuk</timezone>
-    <timezone id="Africa/Brazzaville">Kongo Brazzaville</timezone>
-    <timezone id="Asia/Amman">Jordania</timezone>
-    <timezone id="Europe/Athens">Ateny</timezone>
-    <timezone id="Asia/Beirut">Bejrut</timezone>
-    <timezone id="Africa/Cairo">Kair</timezone>
-    <timezone id="Europe/Helsinki">Finlandia</timezone>
-    <timezone id="Asia/Jerusalem">Jerozolima</timezone>
-    <timezone id="Europe/Minsk">Mińsk</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
-    <timezone id="Asia/Baghdad">Bagdad</timezone>
-    <timezone id="Europe/Moscow">Moskwa</timezone>
-    <timezone id="Asia/Kuwait">Kuwejt</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
-    <timezone id="Asia/Tehran">Teheran</timezone>
-    <timezone id="Asia/Baku">Azerbejdżan</timezone>
-    <timezone id="Asia/Tbilisi">Gruzja</timezone>
-    <timezone id="Asia/Yerevan">Erewan</timezone>
-    <timezone id="Asia/Dubai">Dubaj</timezone>
-    <timezone id="Asia/Kabul">Afganistan</timezone>
-    <timezone id="Asia/Karachi">Karaczi</timezone>
-    <timezone id="Asia/Oral">Uralsk</timezone>
-    <timezone id="Asia/Yekaterinburg">Jekaterynburg</timezone>
-    <timezone id="Asia/Calcutta">Kalkuta</timezone>
-    <timezone id="Asia/Colombo">Kolombo</timezone>
-    <timezone id="Asia/Katmandu">Nepal</timezone>
-    <timezone id="Asia/Almaty">Ałma Ata</timezone>
-    <timezone id="Asia/Rangoon">Rangun</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
-    <timezone id="Asia/Bangkok">Tajlandia</timezone>
-    <timezone id="Asia/Shanghai">Pekin</timezone>
-    <timezone id="Asia/Hong_Kong">Hongkong</timezone>
-    <timezone id="Asia/Irkutsk">Irkuck</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Tajpej</timezone>
-    <timezone id="Asia/Seoul">Seul</timezone>
-    <timezone id="Asia/Tokyo">Tokio</timezone>
-    <timezone id="Asia/Yakutsk">Jakuck</timezone>
-    <timezone id="Australia/Adelaide">Adelajda</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Sydney</timezone>
-    <timezone id="Asia/Vladivostok">Władywostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fidżi</timezone>
-    <timezone id="Pacific/Tongatapu">Tonga</timezone>
-</timezones>
diff --git a/res/xml-pt/timezones.xml b/res/xml-pt/timezones.xml
deleted file mode 100644
index b386950..0000000
--- a/res/xml-pt/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Horário das Ilhas Marshall (Majuro)</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Horário do Pacífico (Los Angeles)</timezone>
-    <timezone id="America/Tijuana">Horário do Pacífico (Tijuana)</timezone>
-    <timezone id="America/Phoenix">Horário da Montanha (Phoenix)</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Horário da Montanha (Denver)</timezone>
-    <timezone id="America/Costa_Rica">Horário Central (Costa Rica)</timezone>
-    <timezone id="America/Chicago">Horário Central (Chicago)</timezone>
-    <timezone id="America/Mexico_City">Horário Central (Cidade do México)</timezone>
-    <timezone id="America/Regina">Horário Central (Regina)</timezone>
-    <timezone id="America/Bogota">Horário da Colômbia (Bogotá)</timezone>
-    <timezone id="America/New_York">Horário Oriental (Nova York)</timezone>
-    <timezone id="America/Caracas">Horário da Venezuela (Caracas)</timezone>
-    <timezone id="America/Barbados">Horário do Atlântico (Barbados)</timezone>
-    <timezone id="America/Halifax">Horário do Atlântico (Halifax)</timezone>
-    <timezone id="America/Manaus">Horário do Amazonas (Manaus)</timezone>
-    <timezone id="America/Santiago">Horário do Chile (Santiago)</timezone>
-    <timezone id="America/St_Johns">Horário de Terra Nova (St. Johns)</timezone>
-    <timezone id="America/Sao_Paulo">Horário de Brasília (São Paulo)</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Horário da Argentina (Buenos Aires)</timezone>
-    <timezone id="America/Godthab">Horário da Groenlândia Ocidental (Godthab)</timezone>
-    <timezone id="America/Montevideo">Horário do Uruguai (Montevidéu)</timezone>
-    <timezone id="Atlantic/South_Georgia">Horário da Geórgia do Sul (Geórgia do Sul)</timezone>
-    <timezone id="Atlantic/Azores">Açores</timezone>
-    <timezone id="Atlantic/Cape_Verde">Horário do Cabo Verde (Cabo Verde)</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">Horário do Meridiano de Greenwich (Londres)</timezone>
-    <timezone id="Europe/Amsterdam">Horário da Europa Central (Amsterdã)</timezone>
-    <timezone id="Europe/Belgrade">Horário da Europa Central (Belgrade)</timezone>
-    <timezone id="Europe/Brussels">Horário da Europa Central (Bruxelas)</timezone>
-    <timezone id="Europe/Sarajevo">Horário da Europa Central (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Horário da África Ocidental (Brazzaville)</timezone>
-    <timezone id="Asia/Amman">Horário Padrão da Europa Oriental (Amã)</timezone>
-    <timezone id="Europe/Athens">Horário Padrão da Europa Oriental (Atenas)</timezone>
-    <timezone id="Asia/Beirut">Horário Padrão da Europa Oriental (Beirute)</timezone>
-    <timezone id="Africa/Cairo">Horário Padrão da Europa Oriental (Cairo)</timezone>
-    <timezone id="Europe/Helsinki">Horário Padrão da Europa Oriental (Helsinque)</timezone>
-    <timezone id="Asia/Jerusalem">Horário de Israel (Jerusalém)</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Horário da África Central (Harare)</timezone>
-    <timezone id="Asia/Baghdad">Horário da Arábia (Bagdá)</timezone>
-    <timezone id="Europe/Moscow">Moscou</timezone>
-    <timezone id="Asia/Kuwait">Horário da Arábia (Kuwait)</timezone>
-    <timezone id="Africa/Nairobi">Horário da África Oriental (Nairóbi)</timezone>
-    <timezone id="Asia/Tehran">Horário Padrão do Irã (Teerã)</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Ierevan</timezone>
-    <timezone id="Asia/Dubai">Horário do Golfo (Dubai)</timezone>
-    <timezone id="Asia/Kabul">Horário do Afeganistão (Cabul)</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Ecaterimburgo</timezone>
-    <timezone id="Asia/Calcutta">Horário Padrão da Índia (Calcutta)</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Horário do Nepal (Catmandu)</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Horário de Mianmar (Rangoon)</timezone>
-    <timezone id="Asia/Krasnoyarsk">Horário de Krasnoyarsk (Krasnoyarsk)</timezone>
-    <timezone id="Asia/Bangkok">Horário da Indochina (Bangkok)</timezone>
-    <timezone id="Asia/Shanghai">Horário da China (Beijing)</timezone>
-    <timezone id="Asia/Hong_Kong">Horário de Hong Kong (Hong Kong)</timezone>
-    <timezone id="Asia/Irkutsk">Horário de Irkutsk (Irkutsk)</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Horário da Austrália Ocidental (Perth)</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Horário da Coréia (Seul)</timezone>
-    <timezone id="Asia/Tokyo">Horário do Japão (Tóquio)</timezone>
-    <timezone id="Asia/Yakutsk">Horário de Yakutsk (Yakutsk)</timezone>
-    <timezone id="Australia/Adelaide">Horário da Austrália Central (Adelaide)</timezone>
-    <timezone id="Australia/Darwin">Horário da Austrália Central (Darwin)</timezone>
-    <timezone id="Australia/Brisbane">Horário da Austrália Oriental (Brisbane)</timezone>
-    <timezone id="Australia/Hobart">Horário da Austrália Oriental (Hobart)</timezone>
-    <timezone id="Australia/Sydney">Horário da Austrália Oriental (Sydney)</timezone>
-    <timezone id="Asia/Vladivostok">Horário de Vladivostok (Vladivostok)</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Horário de Magadan (Magadan)</timezone>
-    <timezone id="Pacific/Auckland">Horário da Nova Zelândia (Auckland)</timezone>
-    <timezone id="Pacific/Fiji">Horário de Fiji (Fiji)</timezone>
-    <timezone id="Pacific/Tongatapu">Horário de Tonga (Tongatapu)</timezone>
-</timezones>
diff --git a/res/xml-rm/timezones.xml b/res/xml-rm/timezones.xml
deleted file mode 100644
index 7f36436..0000000
--- a/res/xml-rm/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Los Angeles</timezone>
-    <timezone id="America/Tijuana">Tijuana</timezone>
-    <timezone id="America/Phoenix">Phoenix</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Denver</timezone>
-    <timezone id="America/Costa_Rica">Costa Rica</timezone>
-    <timezone id="America/Chicago">Chicago</timezone>
-    <timezone id="America/Mexico_City">Mexico City</timezone>
-    <timezone id="America/Regina">Regina</timezone>
-    <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">New York</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Barbados</timezone>
-    <timezone id="America/Halifax">Halifax</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">St. John's</timezone>
-    <timezone id="America/Sao_Paulo">Sao Paulo</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
-    <timezone id="America/Godthab">Godthab</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
-    <timezone id="Atlantic/Azores">Azores</timezone>
-    <timezone id="Atlantic/Cape_Verde">Cape Verde</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">London</timezone>
-    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
-    <timezone id="Europe/Belgrade">Belgrade</timezone>
-    <timezone id="Europe/Brussels">Brussels</timezone>
-    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
-    <timezone id="Asia/Amman">Amman</timezone>
-    <timezone id="Europe/Athens">Athens</timezone>
-    <timezone id="Asia/Beirut">Beirut</timezone>
-    <timezone id="Africa/Cairo">Cairo</timezone>
-    <timezone id="Europe/Helsinki">Helsinki</timezone>
-    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
-    <timezone id="Asia/Baghdad">Baghdad</timezone>
-    <timezone id="Europe/Moscow">Moscow</timezone>
-    <timezone id="Asia/Kuwait">Kuwait</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
-    <timezone id="Asia/Tehran">Tehran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Yerevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Shanghai</timezone>
-    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Seoul</timezone>
-    <timezone id="Asia/Tokyo">Tokyo</timezone>
-    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
-    <timezone id="Australia/Adelaide">Adelaide</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Sydney</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fiji</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-ro/timezones.xml b/res/xml-ro/timezones.xml
deleted file mode 100644
index 30b7a3a..0000000
--- a/res/xml-ro/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Ora zonei Pacific (Los Angeles)</timezone>
-    <timezone id="America/Tijuana">Ora zonei Pacific (Tijuana)</timezone>
-    <timezone id="America/Phoenix">Ora zonei montane (Phoenix)</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Ora zonei montane (Denver)</timezone>
-    <timezone id="America/Costa_Rica">Ora Centrală (Costa Rica)</timezone>
-    <timezone id="America/Chicago">Ora Centrală (Chicago)</timezone>
-    <timezone id="America/Mexico_City">Ora Centrală (Mexico City)</timezone>
-    <timezone id="America/Regina">Ora Centrală (Regina)</timezone>
-    <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">Ora orientală (New York)</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Ora zonei Atlantic (Barbados)</timezone>
-    <timezone id="America/Halifax">Ora zonei Atlantic (Halifax)</timezone>
-    <timezone id="America/Manaus">Ora Amazon (Manaus)</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">St. John's</timezone>
-    <timezone id="America/Sao_Paulo">Sao Paulo</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Ora Argentinei (Buenos Aires)</timezone>
-    <timezone id="America/Godthab">Godthab</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">Georgia de Sud</timezone>
-    <timezone id="Atlantic/Azores">Azore</timezone>
-    <timezone id="Atlantic/Cape_Verde">Capul Verde</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">Greenwich Mean Time (Londra)</timezone>
-    <timezone id="Europe/Amsterdam">Ora Europei Centrale (Amsterdam)</timezone>
-    <timezone id="Europe/Belgrade">Ora Europei Centrale (Belgrade)</timezone>
-    <timezone id="Europe/Brussels">Ora Europei Centrale (Bruxelles)</timezone>
-    <timezone id="Europe/Sarajevo">Ora Europei Centrale (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Ora Africii Occidentale (Brazzaville)</timezone>
-    <timezone id="Asia/Amman">Ora Europei de Est (Amman)</timezone>
-    <timezone id="Europe/Athens">Ora Europei de Est (Atena)</timezone>
-    <timezone id="Asia/Beirut">Ora Europei de Est (Beirut)</timezone>
-    <timezone id="Africa/Cairo">Ora Europei de Est (Cairo)</timezone>
-    <timezone id="Europe/Helsinki">Ora Europei de Est (Helsinki)</timezone>
-    <timezone id="Asia/Jerusalem">Ierusalim</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Ora Africii Centrale (Harare)</timezone>
-    <timezone id="Asia/Baghdad">Bagdad</timezone>
-    <timezone id="Europe/Moscow">Moscova</timezone>
-    <timezone id="Asia/Kuwait">Kuweit</timezone>
-    <timezone id="Africa/Nairobi">Ora Africii Orientale (Nairobi)</timezone>
-    <timezone id="Asia/Tehran">Teheran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Erevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Ekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnoiarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Beijing</timezone>
-    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
-    <timezone id="Asia/Irkutsk">Irkuțk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Ora Australiei Occidentale (Perth)</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Seul</timezone>
-    <timezone id="Asia/Tokyo">Tokyo</timezone>
-    <timezone id="Asia/Yakutsk">Yakuțk</timezone>
-    <timezone id="Australia/Adelaide">Ora Australiei Centrale (Adelaide)</timezone>
-    <timezone id="Australia/Darwin">Ora Australiei Centrale (Darwin)</timezone>
-    <timezone id="Australia/Brisbane">Ora Australiei Orientale (Brisbane)</timezone>
-    <timezone id="Australia/Hobart">Ora Australiei Orientale (Hobart)</timezone>
-    <timezone id="Australia/Sydney">Ora Australiei Orientale (Sydney)</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fiji</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-ru/timezones.xml b/res/xml-ru/timezones.xml
deleted file mode 100644
index 7d7295f..0000000
--- a/res/xml-ru/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Маджуро</timezone>
-    <timezone id="Pacific/Midway">Мидуэй, о-ва</timezone>
-    <timezone id="Pacific/Honolulu">Гонолулу</timezone>
-    <timezone id="America/Anchorage">Анкоридж</timezone>
-    <timezone id="America/Los_Angeles">Лос-Анджелес</timezone>
-    <timezone id="America/Tijuana">Тихуана</timezone>
-    <timezone id="America/Phoenix">Финикс</timezone>
-    <timezone id="America/Chihuahua">Чиуауа</timezone>
-    <timezone id="America/Denver">Денвер</timezone>
-    <timezone id="America/Costa_Rica">Коста-Рика</timezone>
-    <timezone id="America/Chicago">Чикаго</timezone>
-    <timezone id="America/Mexico_City">Мехико</timezone>
-    <timezone id="America/Regina">Реджайна</timezone>
-    <timezone id="America/Bogota">Богота</timezone>
-    <timezone id="America/New_York">Нью-Йорк</timezone>
-    <timezone id="America/Caracas">Каракас</timezone>
-    <timezone id="America/Barbados">Барбадос</timezone>
-    <timezone id="America/Halifax">Галифакс</timezone>
-    <timezone id="America/Manaus">Манаус</timezone>
-    <timezone id="America/Santiago">Сантьяго</timezone>
-    <timezone id="America/St_Johns">Сент-Джонс</timezone>
-    <timezone id="America/Sao_Paulo">Сан-Паулу</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Буэнос-Айрес</timezone>
-    <timezone id="America/Godthab">Готхоб</timezone>
-    <timezone id="America/Montevideo">Монтевидео</timezone>
-    <timezone id="Atlantic/South_Georgia">Ю.Джорджия и Ю.Сэндвинчевы о-ва</timezone>
-    <timezone id="Atlantic/Azores">Азорские о-ва</timezone>
-    <timezone id="Atlantic/Cape_Verde">Острова Зеленого Мыса</timezone>
-    <timezone id="Africa/Casablanca">Касабланка</timezone>
-    <timezone id="Europe/London">Лондон</timezone>
-    <timezone id="Europe/Amsterdam">Амстердам</timezone>
-    <timezone id="Europe/Belgrade">Белград</timezone>
-    <timezone id="Europe/Brussels">Брюссель</timezone>
-    <timezone id="Europe/Sarajevo">Сараево</timezone>
-    <timezone id="Africa/Windhoek">Виндхук</timezone>
-    <timezone id="Africa/Brazzaville">Браззавиль</timezone>
-    <timezone id="Asia/Amman">Амман</timezone>
-    <timezone id="Europe/Athens">Афины</timezone>
-    <timezone id="Asia/Beirut">Бейрут</timezone>
-    <timezone id="Africa/Cairo">Каир</timezone>
-    <timezone id="Europe/Helsinki">Хельсинки</timezone>
-    <timezone id="Asia/Jerusalem">Иерусалим</timezone>
-    <timezone id="Europe/Minsk">Минск</timezone>
-    <timezone id="Africa/Harare">Хараре</timezone>
-    <timezone id="Asia/Baghdad">Багдад</timezone>
-    <timezone id="Europe/Moscow">Москва</timezone>
-    <timezone id="Asia/Kuwait">Кувейт</timezone>
-    <timezone id="Africa/Nairobi">Найроби</timezone>
-    <timezone id="Asia/Tehran">Тегеран</timezone>
-    <timezone id="Asia/Baku">Баку</timezone>
-    <timezone id="Asia/Tbilisi">Тбилиси</timezone>
-    <timezone id="Asia/Yerevan">Ереван</timezone>
-    <timezone id="Asia/Dubai">Дубай</timezone>
-    <timezone id="Asia/Kabul">Кабул</timezone>
-    <timezone id="Asia/Karachi">Карачи</timezone>
-    <timezone id="Asia/Oral">Орал (Уральск)</timezone>
-    <timezone id="Asia/Yekaterinburg">Екатеринбург</timezone>
-    <timezone id="Asia/Calcutta">Калькутта</timezone>
-    <timezone id="Asia/Colombo">Коломбо</timezone>
-    <timezone id="Asia/Katmandu">Катманду</timezone>
-    <timezone id="Asia/Almaty">Алматы</timezone>
-    <timezone id="Asia/Rangoon">Рангун</timezone>
-    <timezone id="Asia/Krasnoyarsk">Красноярск</timezone>
-    <timezone id="Asia/Bangkok">Бангкок</timezone>
-    <timezone id="Asia/Shanghai">Пекин</timezone>
-    <timezone id="Asia/Hong_Kong">Гонконг</timezone>
-    <timezone id="Asia/Irkutsk">Иркутск</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Куала-Лумпур</timezone>
-    <timezone id="Australia/Perth">Перт</timezone>
-    <timezone id="Asia/Taipei">Тайбэй</timezone>
-    <timezone id="Asia/Seoul">Сеул</timezone>
-    <timezone id="Asia/Tokyo">Токио</timezone>
-    <timezone id="Asia/Yakutsk">Якутск</timezone>
-    <timezone id="Australia/Adelaide">Аделаида</timezone>
-    <timezone id="Australia/Darwin">Дарвин</timezone>
-    <timezone id="Australia/Brisbane">Брисбен</timezone>
-    <timezone id="Australia/Hobart">Хобарт</timezone>
-    <timezone id="Australia/Sydney">Сидней</timezone>
-    <timezone id="Asia/Vladivostok">Владивосток</timezone>
-    <timezone id="Pacific/Guam">Гуам</timezone>
-    <timezone id="Asia/Magadan">Магадан</timezone>
-    <timezone id="Pacific/Auckland">Окленд</timezone>
-    <timezone id="Pacific/Fiji">Фиджи</timezone>
-    <timezone id="Pacific/Tongatapu">Тонгатапу</timezone>
-</timezones>
diff --git a/res/xml-sk/timezones.xml b/res/xml-sk/timezones.xml
deleted file mode 100644
index 27ad243..0000000
--- a/res/xml-sk/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Aljaška</timezone>
-    <timezone id="America/Los_Angeles">Los Angeles</timezone>
-    <timezone id="America/Tijuana">Tijuana</timezone>
-    <timezone id="America/Phoenix">Phoenix</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Denver</timezone>
-    <timezone id="America/Costa_Rica">Kostarika</timezone>
-    <timezone id="America/Chicago">Chicago</timezone>
-    <timezone id="America/Mexico_City">Mexico City</timezone>
-    <timezone id="America/Regina">Regina</timezone>
-    <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">New York</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Barbados</timezone>
-    <timezone id="America/Halifax">Halifax</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">St. John's</timezone>
-    <timezone id="America/Sao_Paulo">Sao Paulo</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
-    <timezone id="America/Godthab">Godthab</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
-    <timezone id="Atlantic/Azores">Azorské ostrovy</timezone>
-    <timezone id="Atlantic/Cape_Verde">Kapverdy</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">Londýn</timezone>
-    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
-    <timezone id="Europe/Belgrade">Belgrade</timezone>
-    <timezone id="Europe/Brussels">Brussels</timezone>
-    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
-    <timezone id="Asia/Amman">Amman</timezone>
-    <timezone id="Europe/Athens">Athens</timezone>
-    <timezone id="Asia/Beirut">Beirut</timezone>
-    <timezone id="Africa/Cairo">Cairo</timezone>
-    <timezone id="Europe/Helsinki">Helsinki</timezone>
-    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
-    <timezone id="Asia/Baghdad">Baghdad</timezone>
-    <timezone id="Europe/Moscow">Moskva</timezone>
-    <timezone id="Asia/Kuwait">Kuvajt</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
-    <timezone id="Asia/Tehran">Tehran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Yerevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Jekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnojarsko</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Peking</timezone>
-    <timezone id="Asia/Hong_Kong">Hongkong</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsko</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Seoul</timezone>
-    <timezone id="Asia/Tokyo">Tokyo</timezone>
-    <timezone id="Asia/Yakutsk">Jakutsko</timezone>
-    <timezone id="Australia/Adelaide">Adelaide</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Sydney</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fidži</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-sl/timezones.xml b/res/xml-sl/timezones.xml
deleted file mode 100644
index b553930..0000000
--- a/res/xml-sl/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Los Angeles</timezone>
-    <timezone id="America/Tijuana">Tijuana</timezone>
-    <timezone id="America/Phoenix">Phoenix</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Denver</timezone>
-    <timezone id="America/Costa_Rica">Kostarika</timezone>
-    <timezone id="America/Chicago">Chicago</timezone>
-    <timezone id="America/Mexico_City">Mexico City</timezone>
-    <timezone id="America/Regina">Regina</timezone>
-    <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">New York</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Barbados</timezone>
-    <timezone id="America/Halifax">Halifax</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">St. John's</timezone>
-    <timezone id="America/Sao_Paulo">Sao Paulo</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
-    <timezone id="America/Godthab">Godthab</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
-    <timezone id="Atlantic/Azores">Azori</timezone>
-    <timezone id="Atlantic/Cape_Verde">Zelenortski otoki</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">London</timezone>
-    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
-    <timezone id="Europe/Belgrade">Belgrade</timezone>
-    <timezone id="Europe/Brussels">Bruselj</timezone>
-    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
-    <timezone id="Asia/Amman">Aman</timezone>
-    <timezone id="Europe/Athens">Atene</timezone>
-    <timezone id="Asia/Beirut">Bejrut</timezone>
-    <timezone id="Africa/Cairo">Kairo</timezone>
-    <timezone id="Europe/Helsinki">Helsinki</timezone>
-    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
-    <timezone id="Asia/Baghdad">Bagdad</timezone>
-    <timezone id="Europe/Moscow">Moskva</timezone>
-    <timezone id="Asia/Kuwait">Kuvajt</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
-    <timezone id="Asia/Tehran">Teheran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Erevan</timezone>
-    <timezone id="Asia/Dubai">Dubaj</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
-    <timezone id="Asia/Karachi">Karači</timezone>
-    <timezone id="Asia/Oral">Uralsk</timezone>
-    <timezone id="Asia/Yekaterinburg">Jekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">Almati</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Šangaj</timezone>
-    <timezone id="Asia/Hong_Kong">Hongkong</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Seul</timezone>
-    <timezone id="Asia/Tokyo">Tokio</timezone>
-    <timezone id="Asia/Yakutsk">Jakutsk</timezone>
-    <timezone id="Australia/Adelaide">Adelaide</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Sydney</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fidži</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-sr/timezones.xml b/res/xml-sr/timezones.xml
deleted file mode 100644
index 65d855c..0000000
--- a/res/xml-sr/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Маршалска Острва време (Мајуро)</timezone>
-    <timezone id="Pacific/Midway">Мидвеј</timezone>
-    <timezone id="Pacific/Honolulu">Хонолулу</timezone>
-    <timezone id="America/Anchorage">Енкориџ</timezone>
-    <timezone id="America/Los_Angeles">Пацифичко време (Лос Анђелес)</timezone>
-    <timezone id="America/Tijuana">Пацифичко време (Тихуана)</timezone>
-    <timezone id="America/Phoenix">Планинско време (Феникс)</timezone>
-    <timezone id="America/Chihuahua">Чихуахуа</timezone>
-    <timezone id="America/Denver">Планинско време (Денвер)</timezone>
-    <timezone id="America/Costa_Rica">Централно време (Костарика)</timezone>
-    <timezone id="America/Chicago">Централно време (Чикаго)</timezone>
-    <timezone id="America/Mexico_City">Централно време (Мексико Сити)</timezone>
-    <timezone id="America/Regina">Централно време (Регина)</timezone>
-    <timezone id="America/Bogota">Колумбија време (Богота)</timezone>
-    <timezone id="America/New_York">Источно време (Њујорк)</timezone>
-    <timezone id="America/Caracas">Венецуела време (Каракас)</timezone>
-    <timezone id="America/Barbados">Атланско време (Барбадос)</timezone>
-    <timezone id="America/Halifax">Атланско време (Халифакс)</timezone>
-    <timezone id="America/Manaus">Амазон време (Манаус)</timezone>
-    <timezone id="America/Santiago">Чиле време (Сантијаго)</timezone>
-    <timezone id="America/St_Johns">Њуфаундленд време (Св. Џон)</timezone>
-    <timezone id="America/Sao_Paulo">Бразилија време (Сао Паоло)</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Аргентина време (Буенос Аирес)</timezone>
-    <timezone id="America/Godthab">Западни Гренланд време (Нук)</timezone>
-    <timezone id="America/Montevideo">Уругвај време (Монтевидео)</timezone>
-    <timezone id="Atlantic/South_Georgia">Јужна Џорџија време (Јужна Џорџија)</timezone>
-    <timezone id="Atlantic/Azores">Азори</timezone>
-    <timezone id="Atlantic/Cape_Verde">Зелениртско време (Капе Верде)</timezone>
-    <timezone id="Africa/Casablanca">Казабланка</timezone>
-    <timezone id="Europe/London">Гринвич средње време (Лондон)</timezone>
-    <timezone id="Europe/Amsterdam">Средњеевропско време (Амстердам)</timezone>
-    <timezone id="Europe/Belgrade">Средњеевропско време (Belgrade)</timezone>
-    <timezone id="Europe/Brussels">Средњеевропско време (Брисел)</timezone>
-    <timezone id="Europe/Sarajevo">Средњеевропско време (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Виндхук</timezone>
-    <timezone id="Africa/Brazzaville">Западно-афричко време (Бразавил)</timezone>
-    <timezone id="Asia/Amman">Источноевропско време (Аман)</timezone>
-    <timezone id="Europe/Athens">Источноевропско време (Атина)</timezone>
-    <timezone id="Asia/Beirut">Источноевропско време (Бејрут)</timezone>
-    <timezone id="Africa/Cairo">Источноевропско време (Каиро)</timezone>
-    <timezone id="Europe/Helsinki">Источноевропско време (Хелсинки)</timezone>
-    <timezone id="Asia/Jerusalem">Израелско стандардно време (Jerusalem)</timezone>
-    <timezone id="Europe/Minsk">Минск</timezone>
-    <timezone id="Africa/Harare">Централно-афричко време (Хараре)</timezone>
-    <timezone id="Asia/Baghdad">Арабијско време (Багдад)</timezone>
-    <timezone id="Europe/Moscow">Москва</timezone>
-    <timezone id="Asia/Kuwait">Арабијско време (Кувајт)</timezone>
-    <timezone id="Africa/Nairobi">Источно-афричко време (Најроби)</timezone>
-    <timezone id="Asia/Tehran">Иран стандардно време (Техеран)</timezone>
-    <timezone id="Asia/Baku">Баку</timezone>
-    <timezone id="Asia/Tbilisi">Тбилиси</timezone>
-    <timezone id="Asia/Yerevan">Јереван</timezone>
-    <timezone id="Asia/Dubai">Залив време (Дубаи)</timezone>
-    <timezone id="Asia/Kabul">Кабул</timezone>
-    <timezone id="Asia/Karachi">Карачи</timezone>
-    <timezone id="Asia/Oral">Орал</timezone>
-    <timezone id="Asia/Yekaterinburg">Јекатеринбург</timezone>
-    <timezone id="Asia/Calcutta">Индијско стандардно време (Calcutta)</timezone>
-    <timezone id="Asia/Colombo">Коломбо</timezone>
-    <timezone id="Asia/Katmandu">Непал време (Катманду)</timezone>
-    <timezone id="Asia/Almaty">Алмати</timezone>
-    <timezone id="Asia/Rangoon">Мијанмар време (Рангун)</timezone>
-    <timezone id="Asia/Krasnoyarsk">Краснојарск време (Краснојарск)</timezone>
-    <timezone id="Asia/Bangkok">Индокина време (Банкок)</timezone>
-    <timezone id="Asia/Shanghai">Кина време (Пекинг)</timezone>
-    <timezone id="Asia/Hong_Kong">Хонг Конг време (Хонг Конг)</timezone>
-    <timezone id="Asia/Irkutsk">Иркуцк време (Иркуцк)</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Куала Лумпур</timezone>
-    <timezone id="Australia/Perth">Аустралијско западно време (Перт)</timezone>
-    <timezone id="Asia/Taipei">Тајпеј</timezone>
-    <timezone id="Asia/Seoul">Кореја време (Сеул)</timezone>
-    <timezone id="Asia/Tokyo">Јапанско стандардно време (Токио)</timezone>
-    <timezone id="Asia/Yakutsk">Јакутск време (Јакутск)</timezone>
-    <timezone id="Australia/Adelaide">Аустралијско централно време (Аделаида)</timezone>
-    <timezone id="Australia/Darwin">Аустралијско централно време (Дарвин)</timezone>
-    <timezone id="Australia/Brisbane">Аустралијско источно време (Бризбејн)</timezone>
-    <timezone id="Australia/Hobart">Аустралијско источно време (Хобарт)</timezone>
-    <timezone id="Australia/Sydney">Аустралијско источно време (Сиднеј)</timezone>
-    <timezone id="Asia/Vladivostok">Владивосток време (Владивосток)</timezone>
-    <timezone id="Pacific/Guam">Гуам</timezone>
-    <timezone id="Asia/Magadan">Магадан време (Магадан)</timezone>
-    <timezone id="Pacific/Auckland">Нови Зеланд време (Окланд)</timezone>
-    <timezone id="Pacific/Fiji">Фиџи време (Фиџи)</timezone>
-    <timezone id="Pacific/Tongatapu">Тонга време (Тонгатапу)</timezone>
-</timezones>
diff --git a/res/xml-sv/timezones.xml b/res/xml-sv/timezones.xml
deleted file mode 100644
index cf800f2..0000000
--- a/res/xml-sv/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Pacific, normaltid (Los Angeles)</timezone>
-    <timezone id="America/Tijuana">Pacific, normaltid (Tijuana)</timezone>
-    <timezone id="America/Phoenix">Mountain, normaltid (Phoenix)</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Mountain, normaltid (Denver)</timezone>
-    <timezone id="America/Costa_Rica">Central, normaltid (Costa Rica)</timezone>
-    <timezone id="America/Chicago">Central, normaltid (Chicago)</timezone>
-    <timezone id="America/Mexico_City">Central, normaltid (Mexico City)</timezone>
-    <timezone id="America/Regina">Central, normaltid (Régina)</timezone>
-    <timezone id="America/Bogota">Bogotá</timezone>
-    <timezone id="America/New_York">Eastern, normaltid (New York)</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Atlantic, normaltid (Barbados)</timezone>
-    <timezone id="America/Halifax">Atlantic, normaltid (Halifax)</timezone>
-    <timezone id="America/Manaus">Amazonastid (Manaus)</timezone>
-    <timezone id="America/Santiago">Chilensk tid (Santiago)</timezone>
-    <timezone id="America/St_Johns">Newfoundland, normaltid (St. Johns)</timezone>
-    <timezone id="America/Sao_Paulo">Brasiliansk tid (São Paulo)</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">östargentinsk tid (Buenos Aires)</timezone>
-    <timezone id="America/Godthab">Godthåb</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">Grytviken</timezone>
-    <timezone id="Atlantic/Azores">Azorerna</timezone>
-    <timezone id="Atlantic/Cape_Verde">Kap Verde</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">Greenwichtid (London)</timezone>
-    <timezone id="Europe/Amsterdam">Centraleuropa, normaltid (Amsterdam)</timezone>
-    <timezone id="Europe/Belgrade">Centraleuropa, normaltid (Belgrad)</timezone>
-    <timezone id="Europe/Brussels">Centraleuropa, normaltid (Bryssel)</timezone>
-    <timezone id="Europe/Sarajevo">Centraleuropa, normaltid (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Västafrikansk tid (Brazzaville)</timezone>
-    <timezone id="Asia/Amman">Östeuropa, normaltid (Amman)</timezone>
-    <timezone id="Europe/Athens">Östeuropa, normaltid (Aten)</timezone>
-    <timezone id="Asia/Beirut">Östeuropa, normaltid (Beirut)</timezone>
-    <timezone id="Africa/Cairo">Östeuropa, normaltid (Kairo)</timezone>
-    <timezone id="Europe/Helsinki">Östeuropa, normaltid (Helsingfors)</timezone>
-    <timezone id="Asia/Jerusalem">Israel, normaltid (Jerusalem)</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Centralafrikansk tid (Harare)</timezone>
-    <timezone id="Asia/Baghdad">Bagdad</timezone>
-    <timezone id="Europe/Moscow">Moskva</timezone>
-    <timezone id="Asia/Kuwait">Kuwait</timezone>
-    <timezone id="Africa/Nairobi">östafrikansk tid (Nairobi)</timezone>
-    <timezone id="Asia/Tehran">Teheran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Jerevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Jekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Kolkata</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Kathmandu</timezone>
-    <timezone id="Asia/Almaty">Alma-Ata</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Kinesisk tid (Peking)</timezone>
-    <timezone id="Asia/Hong_Kong">Hongkong</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Västaustralisk tid (Perth)</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Söul</timezone>
-    <timezone id="Asia/Tokyo">Japan, normaltid (Tokyo)</timezone>
-    <timezone id="Asia/Yakutsk">Jakutsk</timezone>
-    <timezone id="Australia/Adelaide">Centralaustralisk tid (Adelaide)</timezone>
-    <timezone id="Australia/Darwin">Centralaustralisk tid (Darwin)</timezone>
-    <timezone id="Australia/Brisbane">östaustralisk tid (Brisbane)</timezone>
-    <timezone id="Australia/Hobart">östaustralisk tid (Hobart)</timezone>
-    <timezone id="Australia/Sydney">östaustralisk tid (Sydney)</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fiji</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-th/timezones.xml b/res/xml-th/timezones.xml
deleted file mode 100644
index 2e99aba..0000000
--- a/res/xml-th/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">มาจูโร</timezone>
-    <timezone id="Pacific/Midway">มิดเวย์</timezone>
-    <timezone id="Pacific/Honolulu">โฮโนลูลู</timezone>
-    <timezone id="America/Anchorage">แองเคอเรจ</timezone>
-    <timezone id="America/Los_Angeles">ลอสแองเจลิส</timezone>
-    <timezone id="America/Tijuana">ทิฮัวนา</timezone>
-    <timezone id="America/Phoenix">ฟีนิกซ์</timezone>
-    <timezone id="America/Chihuahua">ชีวาวา</timezone>
-    <timezone id="America/Denver">เดนเวอร์</timezone>
-    <timezone id="America/Costa_Rica">คอสตาริกา</timezone>
-    <timezone id="America/Chicago">ชิคาโก</timezone>
-    <timezone id="America/Mexico_City">เม็กซิโกซิตี</timezone>
-    <timezone id="America/Regina">ริไจนา</timezone>
-    <timezone id="America/Bogota">โบโกตา</timezone>
-    <timezone id="America/New_York">นิวยอร์ก</timezone>
-    <timezone id="America/Caracas">คาราคัส</timezone>
-    <timezone id="America/Barbados">บาร์เบโดส</timezone>
-    <timezone id="America/Halifax">แฮลิแฟกซ์</timezone>
-    <timezone id="America/Manaus">มาเนาส์</timezone>
-    <timezone id="America/Santiago">ซันติอาโก</timezone>
-    <timezone id="America/St_Johns">เซนต์จอนส์</timezone>
-    <timezone id="America/Sao_Paulo">เซาเปาลู</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">บัวโนสไอเรส</timezone>
-    <timezone id="America/Godthab">กอดแธบ</timezone>
-    <timezone id="America/Montevideo">มอนเตวิเดโอ</timezone>
-    <timezone id="Atlantic/South_Georgia">เซาท์ จอร์เจีย</timezone>
-    <timezone id="Atlantic/Azores">อาซอเรส</timezone>
-    <timezone id="Atlantic/Cape_Verde">เคปเวิร์ด</timezone>
-    <timezone id="Africa/Casablanca">คาสซาบลางก้า</timezone>
-    <timezone id="Europe/London">ลอนดอน</timezone>
-    <timezone id="Europe/Amsterdam">อัมสเตอดัม</timezone>
-    <timezone id="Europe/Belgrade">Belgrade</timezone>
-    <timezone id="Europe/Brussels">บรัสเซลส์</timezone>
-    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
-    <timezone id="Africa/Windhoek">วินด์ฮุก</timezone>
-    <timezone id="Africa/Brazzaville">บราซซาวิล</timezone>
-    <timezone id="Asia/Amman">อัมมาน</timezone>
-    <timezone id="Europe/Athens">เอเธนส์</timezone>
-    <timezone id="Asia/Beirut">เบรุต</timezone>
-    <timezone id="Africa/Cairo">ไคโร</timezone>
-    <timezone id="Europe/Helsinki">เฮลซิงกิ</timezone>
-    <timezone id="Asia/Jerusalem">เยรูซาเร็ม</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">ฮาราเร</timezone>
-    <timezone id="Asia/Baghdad">แบกแดด</timezone>
-    <timezone id="Europe/Moscow">มอสโก</timezone>
-    <timezone id="Asia/Kuwait">คูเวต</timezone>
-    <timezone id="Africa/Nairobi">ไนโรเบีย</timezone>
-    <timezone id="Asia/Tehran">เตหะราน</timezone>
-    <timezone id="Asia/Baku">บากู</timezone>
-    <timezone id="Asia/Tbilisi">ทบิลิซิ</timezone>
-    <timezone id="Asia/Yerevan">เยเรวาน</timezone>
-    <timezone id="Asia/Dubai">ดูใบ</timezone>
-    <timezone id="Asia/Kabul">คาบูล</timezone>
-    <timezone id="Asia/Karachi">การาจี</timezone>
-    <timezone id="Asia/Oral">ออรัล</timezone>
-    <timezone id="Asia/Yekaterinburg">ยีคาเตอรินเบิร์ก</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">โคลัมโบ</timezone>
-    <timezone id="Asia/Katmandu">กาตมันดุ</timezone>
-    <timezone id="Asia/Almaty">อัลมาตี</timezone>
-    <timezone id="Asia/Rangoon">ย่างกุ้ง</timezone>
-    <timezone id="Asia/Krasnoyarsk">ครัสโนยาร์สก์</timezone>
-    <timezone id="Asia/Bangkok">กรุงเทพ</timezone>
-    <timezone id="Asia/Shanghai">Beijing</timezone>
-    <timezone id="Asia/Hong_Kong">ฮ่องกง</timezone>
-    <timezone id="Asia/Irkutsk">อีร์คุตสค์</timezone>
-    <timezone id="Asia/Kuala_Lumpur">กัวลาลัมเปอร์</timezone>
-    <timezone id="Australia/Perth">เพิิร์ท</timezone>
-    <timezone id="Asia/Taipei">ไทเป</timezone>
-    <timezone id="Asia/Seoul">โซล</timezone>
-    <timezone id="Asia/Tokyo">โตเกียว</timezone>
-    <timezone id="Asia/Yakutsk">ยาคุตสค์</timezone>
-    <timezone id="Australia/Adelaide">แอดิเลด</timezone>
-    <timezone id="Australia/Darwin">ดาร์วิน</timezone>
-    <timezone id="Australia/Brisbane">บริสเบน</timezone>
-    <timezone id="Australia/Hobart">โฮบาร์ต</timezone>
-    <timezone id="Australia/Sydney">ซิดนีย์</timezone>
-    <timezone id="Asia/Vladivostok">วลาดิโวสต็อก</timezone>
-    <timezone id="Pacific/Guam">กวม</timezone>
-    <timezone id="Asia/Magadan">มากาดาน</timezone>
-    <timezone id="Pacific/Auckland">โอคแลนด์</timezone>
-    <timezone id="Pacific/Fiji">ฟิจิ</timezone>
-    <timezone id="Pacific/Tongatapu">ตองกาตาปู</timezone>
-</timezones>
diff --git a/res/xml-tl/timezones.xml b/res/xml-tl/timezones.xml
deleted file mode 100644
index 7f36436..0000000
--- a/res/xml-tl/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Los Angeles</timezone>
-    <timezone id="America/Tijuana">Tijuana</timezone>
-    <timezone id="America/Phoenix">Phoenix</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Denver</timezone>
-    <timezone id="America/Costa_Rica">Costa Rica</timezone>
-    <timezone id="America/Chicago">Chicago</timezone>
-    <timezone id="America/Mexico_City">Mexico City</timezone>
-    <timezone id="America/Regina">Regina</timezone>
-    <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">New York</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Barbados</timezone>
-    <timezone id="America/Halifax">Halifax</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">St. John's</timezone>
-    <timezone id="America/Sao_Paulo">Sao Paulo</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
-    <timezone id="America/Godthab">Godthab</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">South Georgia</timezone>
-    <timezone id="Atlantic/Azores">Azores</timezone>
-    <timezone id="Atlantic/Cape_Verde">Cape Verde</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">London</timezone>
-    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
-    <timezone id="Europe/Belgrade">Belgrade</timezone>
-    <timezone id="Europe/Brussels">Brussels</timezone>
-    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
-    <timezone id="Asia/Amman">Amman</timezone>
-    <timezone id="Europe/Athens">Athens</timezone>
-    <timezone id="Asia/Beirut">Beirut</timezone>
-    <timezone id="Africa/Cairo">Cairo</timezone>
-    <timezone id="Europe/Helsinki">Helsinki</timezone>
-    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
-    <timezone id="Asia/Baghdad">Baghdad</timezone>
-    <timezone id="Europe/Moscow">Moscow</timezone>
-    <timezone id="Asia/Kuwait">Kuwait</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
-    <timezone id="Asia/Tehran">Tehran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Yerevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Shanghai</timezone>
-    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Seoul</timezone>
-    <timezone id="Asia/Tokyo">Tokyo</timezone>
-    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
-    <timezone id="Australia/Adelaide">Adelaide</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Sydney</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fiji</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-tr/timezones.xml b/res/xml-tr/timezones.xml
deleted file mode 100644
index 0dc6efd..0000000
--- a/res/xml-tr/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Marshall Adaları Saati (Majuro)</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Pasifik Saati (Los Angeles)</timezone>
-    <timezone id="America/Tijuana">Pasifik Saati (Tijuana)</timezone>
-    <timezone id="America/Phoenix">ABD Sıradağlar Saati (Phoenix)</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">ABD Sıradağlar Saati (Denver)</timezone>
-    <timezone id="America/Costa_Rica">Merkezi Saat (Kosta Rika)</timezone>
-    <timezone id="America/Chicago">Merkezi Saat (Chicago)</timezone>
-    <timezone id="America/Mexico_City">Merkezi Saat (Meksiko City)</timezone>
-    <timezone id="America/Regina">Merkezi Saat (Regina)</timezone>
-    <timezone id="America/Bogota">Kolombiya Saati (Bogota)</timezone>
-    <timezone id="America/New_York">Doğu Saati (New York)</timezone>
-    <timezone id="America/Caracas">Venezuela Saati (Caracas)</timezone>
-    <timezone id="America/Barbados">Atlantik Saati (Barbados)</timezone>
-    <timezone id="America/Halifax">Atlantik Saati (Halifax)</timezone>
-    <timezone id="America/Manaus">Amazon Saati (Manaus)</timezone>
-    <timezone id="America/Santiago">Şili Saati (Santiago)</timezone>
-    <timezone id="America/St_Johns">Newfoundland Saati (St. John's)</timezone>
-    <timezone id="America/Sao_Paulo">Brasilia Saati (Sao Paulo)</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Arjantin Saati (Buenos Aires)</timezone>
-    <timezone id="America/Godthab">Batı Grönland Saati (Godthab)</timezone>
-    <timezone id="America/Montevideo">Uruguay Saati (Montevideo)</timezone>
-    <timezone id="Atlantic/South_Georgia">Güney Georgia Saati (Güney Gürcistan)</timezone>
-    <timezone id="Atlantic/Azores">Azor Adaları</timezone>
-    <timezone id="Atlantic/Cape_Verde">Cape Verde Saati (Cape Verde)</timezone>
-    <timezone id="Africa/Casablanca">Kazablanka</timezone>
-    <timezone id="Europe/London">Greenwich Merkez Saati (Londra)</timezone>
-    <timezone id="Europe/Amsterdam">Orta Avrupa Saati (Amsterdam)</timezone>
-    <timezone id="Europe/Belgrade">Orta Avrupa Saati (Belgrade)</timezone>
-    <timezone id="Europe/Brussels">Orta Avrupa Saati (Brüksel)</timezone>
-    <timezone id="Europe/Sarajevo">Orta Avrupa Saati (Sarajevo)</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Batı Afrika Saati (Brazzaville)</timezone>
-    <timezone id="Asia/Amman">Doğu Avrupa Saati (Amman)</timezone>
-    <timezone id="Europe/Athens">Doğu Avrupa Saati (Atina)</timezone>
-    <timezone id="Asia/Beirut">Doğu Avrupa Saati (Beyrut)</timezone>
-    <timezone id="Africa/Cairo">Doğu Avrupa Saati (Kahire)</timezone>
-    <timezone id="Europe/Helsinki">Doğu Avrupa Saati (Helsinki)</timezone>
-    <timezone id="Asia/Jerusalem">İsrail Saati (Kudüs)</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Orta Afrika Saati (Harare)</timezone>
-    <timezone id="Asia/Baghdad">Arabistan Saati (Bağdat)</timezone>
-    <timezone id="Europe/Moscow">Moskova</timezone>
-    <timezone id="Asia/Kuwait">Arabistan Saati (Kuveyt)</timezone>
-    <timezone id="Africa/Nairobi">Doğu Afrika Saati (Nairobi)</timezone>
-    <timezone id="Asia/Tehran">İran Standart Saati (Tahran)</timezone>
-    <timezone id="Asia/Baku">Bakü</timezone>
-    <timezone id="Asia/Tbilisi">Tiflis</timezone>
-    <timezone id="Asia/Yerevan">Yerevan</timezone>
-    <timezone id="Asia/Dubai">Körfez Saati (Dubai)</timezone>
-    <timezone id="Asia/Kabul">Afganistan Saati (Kabil)</timezone>
-    <timezone id="Asia/Karachi">Karaçi</timezone>
-    <timezone id="Asia/Oral">Uralsk</timezone>
-    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Hindistan Standart Saati (Calcutta)</timezone>
-    <timezone id="Asia/Colombo">Kolombo</timezone>
-    <timezone id="Asia/Katmandu">Nepal Saati (Katmandu)</timezone>
-    <timezone id="Asia/Almaty">Almatı</timezone>
-    <timezone id="Asia/Rangoon">Myanmar Saati (Rangoon)</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk Saati (Krasnoyarsk)</timezone>
-    <timezone id="Asia/Bangkok">Çinhindi Saati (Bangkok)</timezone>
-    <timezone id="Asia/Shanghai">Çin Saati (Pekin)</timezone>
-    <timezone id="Asia/Hong_Kong">Hong Kong Saati (Hong Kong)</timezone>
-    <timezone id="Asia/Irkutsk">İrkutsk Saati (İrkutsk)</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Batı Avustralya Saati (Perth)</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Kore Saati (Seul)</timezone>
-    <timezone id="Asia/Tokyo">Japonya Saati (Tokyo)</timezone>
-    <timezone id="Asia/Yakutsk">Yakutsk Saati (Yakutsk)</timezone>
-    <timezone id="Australia/Adelaide">Orta Avustralya Saati (Adelaide)</timezone>
-    <timezone id="Australia/Darwin">Orta Avustralya Saati (Darwin)</timezone>
-    <timezone id="Australia/Brisbane">Doğu Avustralya Saati (Brisbane)</timezone>
-    <timezone id="Australia/Hobart">Doğu Avustralya Saati (Hobart)</timezone>
-    <timezone id="Australia/Sydney">Doğu Avustralya Saati (Sidney)</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok Saati (Vladivostok)</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan Saati (Magadan)</timezone>
-    <timezone id="Pacific/Auckland">Yeni Zelanda Saati (Auckland)</timezone>
-    <timezone id="Pacific/Fiji">Fiji Saati (Fiji)</timezone>
-    <timezone id="Pacific/Tongatapu">Tonga Saati (Tongatapu)</timezone>
-</timezones>
diff --git a/res/xml-uk/timezones.xml b/res/xml-uk/timezones.xml
deleted file mode 100644
index 2b230ba..0000000
--- a/res/xml-uk/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Маджуро</timezone>
-    <timezone id="Pacific/Midway">Мідуей</timezone>
-    <timezone id="Pacific/Honolulu">Гонолулу</timezone>
-    <timezone id="America/Anchorage">Анкоридж</timezone>
-    <timezone id="America/Los_Angeles">Лос-Анджелес</timezone>
-    <timezone id="America/Tijuana">Тіхуана</timezone>
-    <timezone id="America/Phoenix">Фінікс</timezone>
-    <timezone id="America/Chihuahua">Чіуауа</timezone>
-    <timezone id="America/Denver">Денвер</timezone>
-    <timezone id="America/Costa_Rica">Коста Ріка</timezone>
-    <timezone id="America/Chicago">Чикаго</timezone>
-    <timezone id="America/Mexico_City">Мехіко</timezone>
-    <timezone id="America/Regina">Реджайна</timezone>
-    <timezone id="America/Bogota">Богота</timezone>
-    <timezone id="America/New_York">Нью-Йорк</timezone>
-    <timezone id="America/Caracas">Каракас</timezone>
-    <timezone id="America/Barbados">Барбадос</timezone>
-    <timezone id="America/Halifax">Галіфакс</timezone>
-    <timezone id="America/Manaus">Манаус</timezone>
-    <timezone id="America/Santiago">Сантьяго</timezone>
-    <timezone id="America/St_Johns">Сент-Джонс</timezone>
-    <timezone id="America/Sao_Paulo">Сан-Паулу</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Буенос-Айрес</timezone>
-    <timezone id="America/Godthab">Готхоб</timezone>
-    <timezone id="America/Montevideo">Монтевідео</timezone>
-    <timezone id="Atlantic/South_Georgia">Південна Джорджія</timezone>
-    <timezone id="Atlantic/Azores">Азорські острови</timezone>
-    <timezone id="Atlantic/Cape_Verde">Кабо-Верде</timezone>
-    <timezone id="Africa/Casablanca">Касабланка</timezone>
-    <timezone id="Europe/London">Лондон</timezone>
-    <timezone id="Europe/Amsterdam">Амстердам</timezone>
-    <timezone id="Europe/Belgrade">Белград</timezone>
-    <timezone id="Europe/Brussels">Брюссель</timezone>
-    <timezone id="Europe/Sarajevo">Сараєво</timezone>
-    <timezone id="Africa/Windhoek">Віндхук</timezone>
-    <timezone id="Africa/Brazzaville">Браззавіль</timezone>
-    <timezone id="Asia/Amman">Амман</timezone>
-    <timezone id="Europe/Athens">Афіни</timezone>
-    <timezone id="Asia/Beirut">Бейрут</timezone>
-    <timezone id="Africa/Cairo">Каїр</timezone>
-    <timezone id="Europe/Helsinki">Гельсінкі</timezone>
-    <timezone id="Asia/Jerusalem">Єрусалим</timezone>
-    <timezone id="Europe/Minsk">Мінськ</timezone>
-    <timezone id="Africa/Harare">Хараре</timezone>
-    <timezone id="Asia/Baghdad">Багдад</timezone>
-    <timezone id="Europe/Moscow">Москва</timezone>
-    <timezone id="Asia/Kuwait">Кувейт</timezone>
-    <timezone id="Africa/Nairobi">Найробі</timezone>
-    <timezone id="Asia/Tehran">Тегеран</timezone>
-    <timezone id="Asia/Baku">Баку</timezone>
-    <timezone id="Asia/Tbilisi">Тбілісі</timezone>
-    <timezone id="Asia/Yerevan">Єреван</timezone>
-    <timezone id="Asia/Dubai">Дубаї</timezone>
-    <timezone id="Asia/Kabul">Кабул</timezone>
-    <timezone id="Asia/Karachi">Карачі</timezone>
-    <timezone id="Asia/Oral">Орал</timezone>
-    <timezone id="Asia/Yekaterinburg">Єкатеринбург</timezone>
-    <timezone id="Asia/Calcutta">Калькутта</timezone>
-    <timezone id="Asia/Colombo">Коломбо</timezone>
-    <timezone id="Asia/Katmandu">Катманду</timezone>
-    <timezone id="Asia/Almaty">Алмати</timezone>
-    <timezone id="Asia/Rangoon">Рангун</timezone>
-    <timezone id="Asia/Krasnoyarsk">Красноярськ</timezone>
-    <timezone id="Asia/Bangkok">Бангкок</timezone>
-    <timezone id="Asia/Shanghai">Пекін</timezone>
-    <timezone id="Asia/Hong_Kong">Гонконг</timezone>
-    <timezone id="Asia/Irkutsk">Іркутськ</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Куала-Лумпур</timezone>
-    <timezone id="Australia/Perth">Перт</timezone>
-    <timezone id="Asia/Taipei">Тайпей</timezone>
-    <timezone id="Asia/Seoul">Сеул</timezone>
-    <timezone id="Asia/Tokyo">Токіо</timezone>
-    <timezone id="Asia/Yakutsk">Якутськ</timezone>
-    <timezone id="Australia/Adelaide">Аделаїда</timezone>
-    <timezone id="Australia/Darwin">Дарвін</timezone>
-    <timezone id="Australia/Brisbane">Брисбен</timezone>
-    <timezone id="Australia/Hobart">Хобарт</timezone>
-    <timezone id="Australia/Sydney">Сідней</timezone>
-    <timezone id="Asia/Vladivostok">Владивосток</timezone>
-    <timezone id="Pacific/Guam">Гуам</timezone>
-    <timezone id="Asia/Magadan">Магадан</timezone>
-    <timezone id="Pacific/Auckland">Окленд</timezone>
-    <timezone id="Pacific/Fiji">Фіджи</timezone>
-    <timezone id="Pacific/Tongatapu">Тонгатапу</timezone>
-</timezones>
diff --git a/res/xml-vi/timezones.xml b/res/xml-vi/timezones.xml
deleted file mode 100644
index 1c523397..0000000
--- a/res/xml-vi/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">Majuro</timezone>
-    <timezone id="Pacific/Midway">Midway</timezone>
-    <timezone id="Pacific/Honolulu">Honolulu</timezone>
-    <timezone id="America/Anchorage">Anchorage</timezone>
-    <timezone id="America/Los_Angeles">Los Angeles</timezone>
-    <timezone id="America/Tijuana">Tijuana</timezone>
-    <timezone id="America/Phoenix">Phoenix</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Denver</timezone>
-    <timezone id="America/Costa_Rica">Costa Rica Time</timezone>
-    <timezone id="America/Chicago">Chicago</timezone>
-    <timezone id="America/Mexico_City">Mexico City</timezone>
-    <timezone id="America/Regina">Regina</timezone>
-    <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">New York</timezone>
-    <timezone id="America/Caracas">Caracas</timezone>
-    <timezone id="America/Barbados">Barbados Time</timezone>
-    <timezone id="America/Halifax">Halifax</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">St. John's</timezone>
-    <timezone id="America/Sao_Paulo">Sao Paulo</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
-    <timezone id="America/Godthab">Godthab</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">South Georgia and the South Sandwich Islands Time</timezone>
-    <timezone id="Atlantic/Azores">Azores</timezone>
-    <timezone id="Atlantic/Cape_Verde">Cape Verde Time</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">London</timezone>
-    <timezone id="Europe/Amsterdam">Amsterdam</timezone>
-    <timezone id="Europe/Belgrade">Belgrade</timezone>
-    <timezone id="Europe/Brussels">Brussels</timezone>
-    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">Brazzaville</timezone>
-    <timezone id="Asia/Amman">Amman</timezone>
-    <timezone id="Europe/Athens">Athens</timezone>
-    <timezone id="Asia/Beirut">Beirut</timezone>
-    <timezone id="Africa/Cairo">Cairo</timezone>
-    <timezone id="Europe/Helsinki">Helsinki</timezone>
-    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
-    <timezone id="Asia/Baghdad">Baghdad</timezone>
-    <timezone id="Europe/Moscow">Moscow</timezone>
-    <timezone id="Asia/Kuwait">Kuwait Time</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
-    <timezone id="Asia/Tehran">Tehran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Yerevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
-    <timezone id="Asia/Karachi">Karachi</timezone>
-    <timezone id="Asia/Oral">Oral</timezone>
-    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Calcutta</timezone>
-    <timezone id="Asia/Colombo">Colombo</timezone>
-    <timezone id="Asia/Katmandu">Katmandu</timezone>
-    <timezone id="Asia/Almaty">Almaty</timezone>
-    <timezone id="Asia/Rangoon">Rangoon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Shanghai</timezone>
-    <timezone id="Asia/Hong_Kong">Hong Kong SAR China Time</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Taiwan Time</timezone>
-    <timezone id="Asia/Seoul">Seoul</timezone>
-    <timezone id="Asia/Tokyo">Tokyo</timezone>
-    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
-    <timezone id="Australia/Adelaide">Adelaide</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Sydney</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fiji Time</timezone>
-    <timezone id="Pacific/Tongatapu">Tongatapu</timezone>
-</timezones>
diff --git a/res/xml-zh-rTW/timezones.xml b/res/xml-zh-rTW/timezones.xml
deleted file mode 100644
index 4f98aa1..0000000
--- a/res/xml-zh-rTW/timezones.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">馬朱諾</timezone>
-    <timezone id="Pacific/Midway">中途島</timezone>
-    <timezone id="Pacific/Honolulu">檀香山</timezone>
-    <timezone id="America/Anchorage">安克里治</timezone>
-    <timezone id="America/Los_Angeles">太平洋時間 (洛杉磯)</timezone>
-    <timezone id="America/Tijuana">太平洋時間 (提華納)</timezone>
-    <timezone id="America/Phoenix">山區時間 (鳳凰城)</timezone>
-    <timezone id="America/Chihuahua">奇華華</timezone>
-    <timezone id="America/Denver">山區時間 (丹佛)</timezone>
-    <timezone id="America/Costa_Rica">中部時間 (哥斯大黎加)</timezone>
-    <timezone id="America/Chicago">中部時間 (芝加哥)</timezone>
-    <timezone id="America/Mexico_City">中部時間 (墨西哥市)</timezone>
-    <timezone id="America/Regina">中部時間 (利宅那)</timezone>
-    <timezone id="America/Bogota">哥倫比亞</timezone>
-    <timezone id="America/New_York">東部時間 (紐約)</timezone>
-    <timezone id="America/Caracas">卡拉卡斯</timezone>
-    <timezone id="America/Barbados">大西洋時間 (巴貝多)</timezone>
-    <timezone id="America/Halifax">Halifax</timezone>
-    <timezone id="America/Manaus">亞馬遜時間 (瑪瑙斯)</timezone>
-    <timezone id="America/Santiago">聖地牙哥</timezone>
-    <timezone id="America/St_Johns">紐芬蘭標準時間 (St. John's)</timezone>
-    <timezone id="America/Araguaina">阿拉圭那</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">阿根廷時間 (布宜諾斯艾利斯)</timezone>
-    <timezone id="America/Godthab">高特哈市</timezone>
-    <timezone id="America/Montevideo">烏拉圭</timezone>
-    <timezone id="Atlantic/South_Georgia">南喬治亞與南三明治島</timezone>
-    <timezone id="Atlantic/Azores">亞速爾群島</timezone>
-    <timezone id="Atlantic/Cape_Verde">維德角</timezone>
-    <timezone id="Africa/Casablanca">卡薩布蘭卡</timezone>
-    <timezone id="Europe/London">格林威治標準時間 (倫敦)</timezone>
-    <timezone id="Europe/Amsterdam">中歐標準時間 (荷蘭)</timezone>
-    <timezone id="Europe/Belgrade">中歐標準時間 (塞爾維亞)</timezone>
-    <timezone id="Europe/Brussels">中歐標準時間 (布魯塞爾)</timezone>
-    <timezone id="Europe/Sarajevo">中歐標準時間 (沙拉耶佛)</timezone>
-    <timezone id="Africa/Windhoek">溫荷克</timezone>
-    <timezone id="Africa/Brazzaville">西非時間 (剛果共和國)</timezone>
-    <timezone id="Asia/Amman">東歐標準時間 (約旦)</timezone>
-    <timezone id="Europe/Athens">東歐標準時間 (希臘)</timezone>
-    <timezone id="Asia/Beirut">東歐標準時間 (貝鲁特特)</timezone>
-    <timezone id="Africa/Cairo">東歐標準時間 (埃及)</timezone>
-    <timezone id="Europe/Helsinki">東歐標準時間 (芬蘭)</timezone>
-    <timezone id="Asia/Jerusalem">以色列標準時間 (耶路撒冷)</timezone>
-    <timezone id="Europe/Minsk">白俄羅斯</timezone>
-    <timezone id="Africa/Harare">中非時間 (辛巴威)</timezone>
-    <timezone id="Asia/Baghdad">阿拉伯時間 (伊拉克)</timezone>
-    <timezone id="Europe/Moscow">莫斯科</timezone>
-    <timezone id="Asia/Kuwait">阿拉伯時間 (科威特)</timezone>
-    <timezone id="Africa/Nairobi">東非時間 (奈洛比)</timezone>
-    <timezone id="Asia/Tehran">伊朗</timezone>
-    <timezone id="Asia/Baku">亞塞拜然</timezone>
-    <timezone id="Asia/Tbilisi">喬治亞</timezone>
-    <timezone id="Asia/Yerevan">亞美尼亞</timezone>
-    <timezone id="Asia/Dubai">GT (杜拜)</timezone>
-    <timezone id="Asia/Kabul">阿富汗</timezone>
-    <timezone id="Asia/Karachi">喀拉蚩</timezone>
-    <timezone id="Asia/Oral">奧拉爾</timezone>
-    <timezone id="Asia/Yekaterinburg">葉卡捷林堡</timezone>
-    <timezone id="Asia/Calcutta">印度</timezone>
-    <timezone id="Asia/Colombo">可倫坡</timezone>
-    <timezone id="Asia/Katmandu">尼泊爾</timezone>
-    <timezone id="Asia/Almaty">阿拉木圖</timezone>
-    <timezone id="Asia/Rangoon">緬甸</timezone>
-    <timezone id="Asia/Krasnoyarsk">克拉斯諾雅斯克</timezone>
-    <timezone id="Asia/Bangkok">泰國</timezone>
-    <timezone id="Asia/Shanghai">中國標準時間 (上海)</timezone>
-    <timezone id="Asia/Hong_Kong">中華人民共和國香港特別行政區</timezone>
-    <timezone id="Asia/Irkutsk">伊爾庫次克</timezone>
-    <timezone id="Asia/Kuala_Lumpur">吉隆坡</timezone>
-    <timezone id="Australia/Perth">伯斯</timezone>
-    <timezone id="Asia/Taipei">台北標準時間 (台北)</timezone>
-    <timezone id="Asia/Seoul">首爾</timezone>
-    <timezone id="Asia/Tokyo">日本標準時間 (東京)</timezone>
-    <timezone id="Asia/Yakutsk">雅庫次克</timezone>
-    <timezone id="Australia/Adelaide">阿得雷德</timezone>
-    <timezone id="Australia/Darwin">達爾文</timezone>
-    <timezone id="Australia/Brisbane">布利斯班</timezone>
-    <timezone id="Australia/Hobart">荷巴特</timezone>
-    <timezone id="Australia/Sydney">雪梨</timezone>
-    <timezone id="Asia/Vladivostok">海參崴</timezone>
-    <timezone id="Pacific/Guam">關島</timezone>
-    <timezone id="Asia/Magadan">馬加丹</timezone>
-    <timezone id="Pacific/Auckland">奧克蘭</timezone>
-    <timezone id="Pacific/Fiji">斐濟</timezone>
-    <timezone id="Pacific/Tongatapu">東加</timezone>
-</timezones>
diff --git a/res/xml-zh/timezones.xml b/res/xml-zh/timezones.xml
deleted file mode 100644
index be269d1..0000000
--- a/res/xml-zh/timezones.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<timezones>
-    <timezone id="Pacific/Majuro">马朱罗</timezone>
-    <timezone id="Pacific/Midway">中途岛</timezone>
-    <timezone id="Pacific/Honolulu">檀香山</timezone>
-    <timezone id="America/Anchorage">安克雷奇</timezone>
-    <timezone id="America/Los_Angeles">美国太平洋时间 (洛杉矶)</timezone>
-    <timezone id="America/Tijuana">美国太平洋时间 (提华纳)</timezone>
-    <timezone id="America/Phoenix">美国山区时间 (凤凰城)</timezone>
-    <timezone id="America/Chihuahua">奇瓦瓦</timezone>
-    <timezone id="America/Denver">美国山区时间 (丹佛)</timezone>
-    <timezone id="America/Costa_Rica">美国中部时间 (哥斯达黎加)</timezone>
-    <timezone id="America/Chicago">美国中部时间 (芝加哥)</timezone>
-    <timezone id="America/Mexico_City">美国中部时间 (墨西哥城)</timezone>
-    <timezone id="America/Regina">美国中部时间 (里贾纳)</timezone>
-    <timezone id="America/Bogota">哥伦比亚时间 (波哥大)</timezone>
-    <timezone id="America/New_York">美国东部时间 (纽约)</timezone>
-    <timezone id="America/Caracas">委内瑞拉时间 (加拉加斯)</timezone>
-    <timezone id="America/Barbados">大西洋时间 (巴巴多斯)</timezone>
-    <timezone id="America/Manaus">亚马逊标准时间 (马瑙斯)</timezone>
-    <timezone id="America/Santiago">圣地亚哥</timezone>
-    <timezone id="America/St_Johns">纽芬兰时间 (圣约翰)</timezone>
-    <timezone id="America/Sao_Paulo">圣保罗</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">布宜诺斯艾利斯</timezone>
-    <timezone id="America/Godthab">戈特霍布</timezone>
-    <timezone id="America/Montevideo">乌拉圭时间 (蒙得维的亚)</timezone>
-    <timezone id="Atlantic/South_Georgia">南乔治亚</timezone>
-    <timezone id="Atlantic/Azores">亚述尔群岛</timezone>
-    <timezone id="Atlantic/Cape_Verde">佛得角</timezone>
-    <timezone id="Africa/Casablanca">卡萨布兰卡</timezone>
-    <timezone id="Europe/London">格林尼治标准时间 (伦敦)</timezone>
-    <timezone id="Europe/Amsterdam">中欧标准时间 (阿姆斯特丹)</timezone>
-    <timezone id="Europe/Belgrade">中欧标准时间 (贝尔格莱德)</timezone>
-    <timezone id="Europe/Brussels">中欧标准时间 (布鲁塞尔)</timezone>
-    <timezone id="Europe/Sarajevo">中欧标准时间 (萨拉热窝)</timezone>
-    <timezone id="Africa/Windhoek">温得和克</timezone>
-    <timezone id="Africa/Brazzaville">西部非洲标准时间 (布拉扎维)</timezone>
-    <timezone id="Asia/Amman">东欧标准时间 (安曼)</timezone>
-    <timezone id="Europe/Athens">东欧标准时间 (雅典)</timezone>
-    <timezone id="Asia/Beirut">东欧标准时间 (贝鲁特)</timezone>
-    <timezone id="Africa/Cairo">东欧标准时间 (开罗)</timezone>
-    <timezone id="Europe/Helsinki">东欧标准时间 (赫尔辛基)</timezone>
-    <timezone id="Asia/Jerusalem">以色列时间 (耶路撒冷)</timezone>
-    <timezone id="Europe/Minsk">明斯克</timezone>
-    <timezone id="Africa/Harare">中部非洲标准时间 (哈拉雷)</timezone>
-    <timezone id="Asia/Baghdad">巴格达</timezone>
-    <timezone id="Europe/Moscow">莫斯科</timezone>
-    <timezone id="Asia/Kuwait">科威特</timezone>
-    <timezone id="Africa/Nairobi">东部非洲标准时间 (内罗毕)</timezone>
-    <timezone id="Asia/Tehran">伊朗标准时间 (德黑兰)</timezone>
-    <timezone id="Asia/Baku">巴库</timezone>
-    <timezone id="Asia/Tbilisi">第比利斯</timezone>
-    <timezone id="Asia/Yerevan">埃里温</timezone>
-    <timezone id="Asia/Dubai">迪拜</timezone>
-    <timezone id="Asia/Kabul">阿富汗时间 (喀布尔)</timezone>
-    <timezone id="Asia/Karachi">卡拉奇</timezone>
-    <timezone id="Asia/Oral">乌拉尔</timezone>
-    <timezone id="Asia/Yekaterinburg">叶卡捷林堡</timezone>
-    <timezone id="Asia/Calcutta">加尔各答</timezone>
-    <timezone id="Asia/Colombo">科伦坡</timezone>
-    <timezone id="Asia/Katmandu">尼泊尔时间 (加德满都)</timezone>
-    <timezone id="Asia/Almaty">阿拉木图</timezone>
-    <timezone id="Asia/Rangoon">缅甸时间 (仰光)</timezone>
-    <timezone id="Asia/Krasnoyarsk">克拉斯诺亚尔斯克</timezone>
-    <timezone id="Asia/Bangkok">曼谷</timezone>
-    <timezone id="Asia/Shanghai">中国标准时间 (北京)</timezone>
-    <timezone id="Asia/Hong_Kong">香港时间 (香港)</timezone>
-    <timezone id="Asia/Irkutsk">伊尔库茨克时间 (伊尔库茨克)</timezone>
-    <timezone id="Asia/Kuala_Lumpur">吉隆坡</timezone>
-    <timezone id="Australia/Perth">佩思</timezone>
-    <timezone id="Asia/Taipei">台北时间 (台北)</timezone>
-    <timezone id="Asia/Seoul">首尔</timezone>
-    <timezone id="Asia/Tokyo">日本时间 (东京)</timezone>
-    <timezone id="Asia/Yakutsk">雅库茨克时间 (雅库茨克)</timezone>
-    <timezone id="Australia/Adelaide">阿德莱德</timezone>
-    <timezone id="Australia/Darwin">达尔文</timezone>
-    <timezone id="Australia/Brisbane">布里斯班</timezone>
-    <timezone id="Australia/Hobart">霍巴特</timezone>
-    <timezone id="Australia/Sydney">悉尼</timezone>
-    <timezone id="Asia/Vladivostok">海参崴时间 (符拉迪沃斯托克)</timezone>
-    <timezone id="Pacific/Guam">关岛</timezone>
-    <timezone id="Asia/Magadan">马加丹时间 (马加丹)</timezone>
-    <timezone id="Pacific/Auckland">奥克兰</timezone>
-    <timezone id="Pacific/Fiji">斐济</timezone>
-    <timezone id="Pacific/Tongatapu">东加塔布</timezone>
-</timezones>
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index bf93eb5..7b599b8 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -27,14 +27,24 @@
             android:key="system_category"
             android:title="@string/accessibility_system_title">
 
+        <PreferenceScreen
+            android:fragment="com.android.settings.accessibility.ToggleCaptioningPreferenceFragment"
+            android:key="captioning_preference_screen"
+            android:title="@string/accessibility_captioning_title" />
+
+        <PreferenceScreen
+            android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment"
+            android:key="screen_magnification_preference_screen"
+            android:title="@string/accessibility_screen_magnification_title"/>
+
         <CheckBoxPreference
                 android:key="toggle_large_text_preference"
-                android:title="@string/accessibility_toggle_large_text_title"
+                android:title="@string/accessibility_toggle_large_text_preference_title"
                 android:persistent="false"/>
 
         <CheckBoxPreference
                 android:key="toggle_power_button_ends_call_preference"
-                android:title="@string/accessibility_power_button_ends_call_title"
+                android:title="@string/accessibility_power_button_ends_call_prerefence_title"
                 android:persistent="false"/>
 
         <CheckBoxPreference
@@ -44,30 +54,24 @@
 
         <CheckBoxPreference
                 android:key="toggle_speak_password_preference"
-                android:title="@string/accessibility_speak_password_title"
+                android:title="@string/accessibility_toggle_speak_password_preference_title"
                 android:persistent="false"/>
 
-        <PreferenceScreen android:key="tts_settings"
+        <PreferenceScreen
+                android:fragment="com.android.settings.accessibility.ToggleGlobalGesturePreferenceFragment"
+                android:key="enable_global_gesture_preference_screen"
+                android:title="@string/accessibility_global_gesture_preference_title"/>
+
+        <PreferenceScreen android:key="tts_settings_preference"
                 android:fragment="com.android.settings.tts.TextToSpeechSettings"
-                android:title="@string/tts_settings_title" />
+                android:title="@string/tts_settings_title"/>
 
         <ListPreference android:key="select_long_press_timeout_preference"
-                android:title="@string/accessibility_long_press_timeout_title"
+                android:title="@string/accessibility_long_press_timeout_preference_title"
                 android:entries="@array/long_press_timeout_selector_titles"
                 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_script_injection_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/apn_editor.xml b/res/xml/apn_editor.xml
index 604a349..745a83e 100644
--- a/res/xml/apn_editor.xml
+++ b/res/xml/apn_editor.xml
@@ -141,4 +141,17 @@
         android:entries="@array/bearer_entries"
         android:entryValues="@array/bearer_values"
         />
+    <ListPreference
+        android:title="@string/mvno_type"
+        android:key="mvno_type"
+        android:entries="@array/mvno_type_entries"
+        android:entryValues="@array/mvno_type_values"
+        />
+    <EditTextPreference
+        android:title="@string/mvno_match_data"
+        android:dialogTitle="@string/mvno_match_data"
+        android:key="mvno_match_data"
+        android:singleLine="true"
+        android:inputType="text"
+        />
 </PreferenceScreen>   
diff --git a/res/drawable/wifi_signal.xml b/res/xml/app_restrictions.xml
similarity index 68%
copy from res/drawable/wifi_signal.xml
copy to res/xml/app_restrictions.xml
index 86c1ab0..ddc911d 100644
--- a/res/drawable/wifi_signal.xml
+++ b/res/xml/app_restrictions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- 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.
@@ -14,9 +14,12 @@
      limitations under the License.
 -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
+<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">
-    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock" />
-    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open" />
-</selector>
 
+    <Preference
+        android:key="user_info"
+        android:order="0"/>
+
+</PreferenceScreen>
diff --git a/res/xml/captioning_settings.xml b/res/xml/captioning_settings.xml
new file mode 100644
index 0000000..9773943
--- /dev/null
+++ b/res/xml/captioning_settings.xml
@@ -0,0 +1,83 @@
+<?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"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:fragment="com.android.settings.accessibility.ToggleCaptioningPreferenceFragment"
+    android:key="captioning_preference_screen"
+    android:title="@string/accessibility_captioning_title" >
+
+    <PreferenceCategory
+        android:key="standard"
+        android:title="@string/captioning_standard_options_title" >
+        <com.android.settings.accessibility.LocalePreference
+            android:key="captioning_locale"
+            android:persistent="false"
+            android:summary="%s"
+            android:title="@string/captioning_locale" />
+
+        <ListPreference
+            android:entries="@array/captioning_font_size_selector_titles"
+            android:entryValues="@array/captioning_font_size_selector_values"
+            android:key="captioning_font_size"
+            android:persistent="false"
+            android:summary="%s"
+            android:title="@string/captioning_text_size" />
+
+        <com.android.settings.accessibility.PresetPreference
+            android:key="captioning_preset"
+            android:persistent="false"
+            android:title="@string/captioning_preset" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        android:key="custom"
+        android:title="@string/captioning_custom_options_title" >
+        <ListPreference
+            android:entries="@array/captioning_typeface_selector_titles"
+            android:entryValues="@array/captioning_typeface_selector_values"
+            android:key="captioning_typeface"
+            android:persistent="false"
+            android:summary="%s"
+            android:title="@string/captioning_typeface" />
+
+        <com.android.settings.accessibility.ColorPreference
+            android:key="captioning_foreground_color"
+            android:persistent="false"
+            android:title="@string/captioning_foreground_color" />
+
+        <com.android.settings.accessibility.EdgeTypePreference
+            android:key="captioning_edge_type"
+            android:persistent="false"
+            android:title="@string/captioning_edge_type" />
+
+        <com.android.settings.accessibility.ColorPreference
+            android:dependency="captioning_edge_type"
+            android:key="captioning_edge_color"
+            android:persistent="false"
+            android:title="@string/captioning_edge_color" />
+        <com.android.settings.accessibility.ColorPreference
+            android:key="captioning_background_color"
+            android:persistent="false"
+            android:title="@string/captioning_background_color" />
+        <com.android.settings.accessibility.ColorPreference
+            android:dependency="captioning_background_color"
+            android:key="captioning_background_opacity"
+            android:persistent="false"
+            android:title="@string/captioning_background_opacity" />
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 47e58da..5989c90 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -18,8 +18,8 @@
         android:title="@string/development_settings_title">
     <com.android.settings.BugreportPreference
             android:key="bugreport"
-            android:title="@string/bugreport_title"
-            android:dialogTitle="@string/bugreport_title" />
+            android:title="@*android:string/bugreport_title"
+            android:dialogTitle="@*android:string/bugreport_title" />
 
     <PreferenceScreen
             android:key="local_backup_password"
@@ -38,6 +38,13 @@
         android:summary="@string/keep_screen_on_summary"/>
 
     <ListPreference
+        android:key="select_runtime"
+        android:title="@string/select_runtime_title"
+        android:dialogTitle="@string/select_runtime_dialog_title"
+        android:entries="@array/select_runtime_titles"
+        android:entryValues="@array/select_runtime_values" />
+
+    <ListPreference
         android:key="hdcp_checking"
         android:title="@string/hdcp_checking_title"
         android:dialogTitle="@string/hdcp_checking_dialog_title"
@@ -45,9 +52,15 @@
         android:entryValues="@array/hdcp_checking_values" />
 
     <CheckBoxPreference
-        android:key="enforce_read_external"
-        android:title="@string/enforce_read_external_title"
-        android:summary="@string/enforce_read_external_summary" />
+        android:key="bt_hci_snoop_log"
+        android:title="@string/bt_hci_snoop_log"
+        android:summary="@string/bt_hci_snoop_log_summary"/>
+
+    <PreferenceScreen android:key="proc_stats"
+            android:title="@string/process_stats_summary_title"
+            android:summary="@string/process_stats_summary"
+            android:fragment="com.android.settings.applications.ProcessStatsUi">
+    </PreferenceScreen>
 
     <PreferenceCategory android:key="debug_debugging_category"
             android:title="@string/debug_debugging_category">
@@ -57,6 +70,19 @@
             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="enable_terminal"
+            android:title="@string/enable_terminal_title"
+            android:summary="@string/enable_terminal_summary" />
+
+        <CheckBoxPreference
+            android:key="bugreport_in_power"
+            android:title="@string/bugreport_in_power"
+            android:summary="@string/bugreport_in_power_summary"/>
+
         <CheckBoxPreference
             android:key="allow_mock_location"
             android:title="@string/allow_mock_location"
@@ -70,6 +96,15 @@
             android:title="@string/wait_for_debugger"
             android:summary="@string/wait_for_debugger_summary"/>
 
+        <CheckBoxPreference
+            android:key="verify_apps_over_usb"
+            android:title="@string/verify_apps_over_usb_title"
+            android:summary="@string/verify_apps_over_usb_summary"/>
+
+        <CheckBoxPreference
+            android:key="wifi_display_certification"
+            android:title="@string/wifi_display_certification"
+            android:summary="@string/wifi_display_certification_summary"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:key="debug_input_category"
@@ -91,19 +126,19 @@
             android:title="@string/debug_drawing_category">
 
         <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"/>
 
         <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_screen_updates"
-            android:title="@string/show_screen_updates"
-            android:summary="@string/show_screen_updates_summary"/>
+            android:key="force_rtl_layout_all_locales"
+            android:title="@string/force_rtl_layout_all_locales"
+            android:summary="@string/force_rtl_layout_all_locales_summary"/>
 
         <ListPreference
             android:key="window_animation_scale"
@@ -126,15 +161,56 @@
             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"/>
+        <ListPreference
+            android:key="overlay_display_devices"
+            android:title="@string/overlay_display_devices_title"
+            android:persistent="false"
+            android:entries="@array/overlay_display_devices_entries"
+            android:entryValues="@array/overlay_display_devices_values" />
+
+    </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"/>
+                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"/>
+
+        <ListPreference
+                android:key="debug_hw_overdraw"
+                android:title="@string/debug_hw_overdraw"
+                android:persistent="false"
+                android:entries="@array/debug_hw_overdraw_entries"
+                android:entryValues="@array/debug_hw_overdraw_values" />
+
+        <ListPreference
+                android:key="show_non_rect_clip"
+                android:title="@string/show_non_rect_clip"
+                android: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>
 
@@ -151,15 +227,19 @@
             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" />
 
-        <MultiCheckPreference
-            android:key="enable_traces"
-            android:title="@string/enable_traces_title"
-            android:dialogTitle="@string/enable_traces_dialog_title" />
+        <ListPreference
+            android:key="enable_opengl_traces"
+            android:title="@string/enable_opengl_traces_title"
+            android:persistent="false"
+            android:entries="@array/enable_opengl_traces_entries"
+            android:entryValues="@array/enable_opengl_traces_values" />
 
     </PreferenceCategory>
 
@@ -183,6 +263,6 @@
             android:title="@string/show_all_anrs"
             android:summary="@string/show_all_anrs_summary"/>
 
-    </PreferenceCategory>
+     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 324deaa..07abe41 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -89,6 +89,12 @@
         </PreferenceScreen>
         -->
 
+        <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" 
                 style="?android:preferenceInformationStyle"
@@ -106,7 +112,7 @@
                 style="?android:preferenceInformationStyle"
                 android:title="@string/fcc_equipment_id"
                 android:summary="@string/device_info_default"/>
-                
+
         <!-- Device Baseband version -->
         <Preference android:key="baseband_version" 
                 style="?android:preferenceInformationStyle"
diff --git a/res/xml/device_info_status.xml b/res/xml/device_info_status.xml
index aaa90a9..38a3e80 100644
--- a/res/xml/device_info_status.xml
+++ b/res/xml/device_info_status.xml
@@ -42,6 +42,11 @@
         android:title="@string/status_network_type"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
+    <Preference android:key="latest_area_info"
+        style="?android:attr/preferenceInformationStyle"
+        android:title="@string/status_latest_area_info"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
     <Preference android:key="service_state"
         style="?android:attr/preferenceInformationStyle"
         android:title="@string/status_service_state"
diff --git a/res/xml/device_picker.xml b/res/xml/device_picker.xml
index 43b5829..9fef34d 100644
--- a/res/xml/device_picker.xml
+++ b/res/xml/device_picker.xml
@@ -21,7 +21,7 @@
         android:key="bt_scan"
         android:title="@string/bluetooth_preference_scan_title" />
 
-    <com.android.settings.ProgressCategory
+    <com.android.settings.bluetooth.BluetoothProgressCategory
         android:key="bt_device_list"
         android:title="@string/bluetooth_preference_found_devices"
         android:orderingFromXml="false" />
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index b5f072f..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"
@@ -45,7 +44,7 @@
                 android:title="@string/screensaver_settings_title"
                 android:fragment="com.android.settings.DreamSettings" />
 
-        <ListPreference
+        <com.android.settings.WarnedListPreference
                 android:key="font_size"
                 android:title="@string/title_font_size"
                 android:summary="@string/summary_font_size"
@@ -58,4 +57,9 @@
             android:title="@string/notification_pulse_title"
             android:persistent="false" />
 
+        <PreferenceScreen
+                android:key="wifi_display"
+                android:title="@string/wifi_display_settings_title"
+                android:fragment="com.android.settings.wfd.WifiDisplaySettings" />
+
 </PreferenceScreen>
diff --git a/res/xml/dock_settings.xml b/res/xml/dock_settings.xml
deleted file mode 100644
index 177da9f..0000000
--- a/res/xml/dock_settings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-    android:title="@string/dock_settings_title"
-    android:key="parent">
-
-    <PreferenceScreen
-        android:key="dock_audio"
-        android:title="@string/dock_audio_settings_title"
-        android:summary="@string/dock_settings_summary" />
-
-    <CheckBoxPreference
-        android:key="dock_sounds"
-        android:title="@string/dock_sounds_enable_title"
-        android:summaryOn="@string/dock_sounds_enable_summary_on"
-        android:summaryOff="@string/dock_sounds_enable_summary_off"
-        android:defaultValue="false" />
-
-</PreferenceScreen>
diff --git a/res/xml/dream_settings.xml b/res/xml/dream_settings.xml
deleted file mode 100644
index 6569bc7..0000000
--- a/res/xml/dream_settings.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/screensaver_settings_title"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-
-    <com.android.settings.DreamComponentPreference
-            android:key="screensaver_component"
-            android:title="@string/screensaver_component_title"
-            android:persistent="false"
-            />
-
-    <com.android.settings.DreamTesterPreference
-            android:key="test"
-            android:title="@string/screensaver_test"
-            android:persistent="false"
-            />
-
-    <CheckBoxPreference
-            android:key="activate_on_dock"
-            android:persistent="false"
-            android:title="@string/screensaver_activate_on_dock_title"
-            android:defaultValue="true" />
-
-</PreferenceScreen>
diff --git a/res/drawable/wifi_signal.xml b/res/xml/file_paths.xml
similarity index 60%
copy from res/drawable/wifi_signal.xml
copy to res/xml/file_paths.xml
index 86c1ab0..294c0cb 100644
--- a/res/drawable/wifi_signal.xml
+++ b/res/xml/file_paths.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- 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.
@@ -14,9 +14,7 @@
      limitations under the License.
 -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock" />
-    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open" />
-</selector>
-
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Offer access to files under Context.getCacheDir() -->
+    <cache-path name="my_cache" />
+</paths>
diff --git a/res/drawable/wifi_signal.xml b/res/xml/home_selection.xml
similarity index 66%
copy from res/drawable/wifi_signal.xml
copy to res/xml/home_selection.xml
index 86c1ab0..a348f9d 100644
--- a/res/drawable/wifi_signal.xml
+++ b/res/xml/home_selection.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- 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.
@@ -14,9 +14,10 @@
      limitations under the License.
 -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock" />
-    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open" />
-</selector>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/home_settings"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:key="home"
+        android:order="0">
 
+</PreferenceScreen>
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index f001486..3e7fdb5 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -29,7 +29,8 @@
 
     <!-- User dictionary preference title and fragment will be set programmatically. -->
     <PreferenceScreen
-            android:key="key_user_dictionary_settings" />
+            android:key="key_user_dictionary_settings"
+            android:title="@string/user_dict_settings_title" />
 
     <PreferenceCategory android:key="keyboard_settings_category"
             android:title="@string/keyboard_settings_category">
diff --git a/res/xml/location_mode.xml b/res/xml/location_mode.xml
new file mode 100644
index 0000000..3627f11
--- /dev/null
+++ b/res/xml/location_mode.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/location_mode_screen_title">
+
+        <com.android.settings.location.RadioButtonPreference
+            android:key="high_accuracy"
+            android:title="@string/location_mode_high_accuracy_title"
+            android:summary="@string/location_mode_high_accuracy_description"
+            android:persistent="false" />
+        <com.android.settings.location.RadioButtonPreference
+            android:key="battery_saving"
+            android:title="@string/location_mode_battery_saving_title"
+            android:summary="@string/location_mode_battery_saving_description"
+            android:persistent="false" />
+        <com.android.settings.location.RadioButtonPreference
+            android:key="sensors_only"
+            android:title="@string/location_mode_sensors_only_title"
+            android:summary="@string/location_mode_sensors_only_description"
+            android:persistent="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index ab212d8..83b80b1 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -16,38 +16,17 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/location_settings_title">
-
-        <com.android.settings.WrappingSwitchPreference
-            android:key="location_toggle"
-            android:title="@string/location_access_title"
-            android:summary="@string/location_access_summary"
-            android:persistent="true"/>
+        <Preference
+            android:key="location_mode"
+            android:title="@string/location_mode_title"
+            android:summary="@string/location_mode_location_off_title" />
 
         <PreferenceCategory
-            android:key="location_sources"
-            android:title="@string/location_sources_heading" />
+            android:key="recent_location_requests"
+            android:title="@string/location_category_recent_location_requests" />
 
-        <CheckBoxPreference
-            android:key="location_gps"
-            android:title="@string/location_gps"
-            android:summary="@string/location_street_level"
-            android:dependency="location_toggle"
-            android:persistent="false" />
-
-        <com.android.settings.WrappingCheckBoxPreference
-            android:key="location_network"
-            android:title="@string/location_network_based"
-            android:summary="@string/location_neighborhood_level"
-            android:dependency="location_toggle"
-            android:persistent="false" />
-
-<!-- Disabled to avoid confusion on devices with no AGPS
-     For Google experience devices we want AGPS on by default (if supported) so we don't really need this.
-        <CheckBoxPreference
-            android:key="assisted_gps"
-            android:title="@string/assisted_gps"
-            android:summaryOn="@string/assisted_gps_enabled"
-            android:summaryOff="@string/assisted_gps_disabled"/>
--->
+        <PreferenceCategory
+            android:key="location_services"
+            android:title="@string/location_category_location_services" />
 
 </PreferenceScreen>
diff --git a/res/xml/nfc_payment_settings.xml b/res/xml/nfc_payment_settings.xml
new file mode 100644
index 0000000..9b47dda
--- /dev/null
+++ b/res/xml/nfc_payment_settings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+</PreferenceScreen>
diff --git a/res/xml/print_job_settings.xml b/res/xml/print_job_settings.xml
new file mode 100644
index 0000000..a78cec1
--- /dev/null
+++ b/res/xml/print_job_settings.xml
@@ -0,0 +1,30 @@
+<?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"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/print_print_job">
+
+    <Preference
+            android:key="print_job_preference">
+    </Preference>
+
+    <Preference
+            android:key="print_job_message_preference"
+            android:layout="@layout/print_job_summary">
+    </Preference>
+
+</PreferenceScreen>
diff --git a/res/xml/print_settings.xml b/res/xml/print_settings.xml
new file mode 100644
index 0000000..8a29563
--- /dev/null
+++ b/res/xml/print_settings.xml
@@ -0,0 +1,33 @@
+<?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"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/print_settings_title">
+
+    <PreferenceCategory
+            android:key="print_jobs_category"
+            android:title="@string/print_print_jobs"
+            android:order="0">
+    </PreferenceCategory>
+
+    <PreferenceCategory
+            android:key="print_services_category"
+            android:title="@string/print_settings_title"
+            android:order="1">
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/process_stats_summary.xml b/res/xml/process_stats_summary.xml
new file mode 100644
index 0000000..fbd87fd
--- /dev/null
+++ b/res/xml/process_stats_summary.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/app_memory_use"
+        android:key="app_list">
+    <Preference
+        style="?android:attr/preferenceInformationStyle"
+        android:key="mem_status"
+        android:persistent="false"
+    />
+</PreferenceScreen>
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml
index 6593f07..7236673 100644
--- a/res/xml/security_settings_biometric_weak.xml
+++ b/res/xml/security_settings_biometric_weak.xml
@@ -52,8 +52,8 @@
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
         <CheckBoxPreference
-            android:key="unlock_tactile_feedback"
-            android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
+            android:key="keyguard_enable_widgets"
+            android:title="@string/security_enable_widgets_title"/>
 
         <PreferenceScreen
             android:fragment="com.android.settings.OwnerInfoSettings"
diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml
index 60d3a9f..d29d221 100644
--- a/res/xml/security_settings_chooser.xml
+++ b/res/xml/security_settings_chooser.xml
@@ -26,6 +26,10 @@
             android:summary="@string/unlock_set_unlock_mode_none"
             android:persistent="false"/>
 
+        <CheckBoxPreference
+            android:key="keyguard_enable_widgets"
+            android:title="@string/security_enable_widgets_title"/>
+
         <PreferenceScreen
             android:fragment="com.android.settings.OwnerInfoSettings"
             android:key="owner_info_settings"
diff --git a/res/xml/security_settings_lockscreen.xml b/res/xml/security_settings_lockscreen.xml
index fbdee60..eb40bd8 100644
--- a/res/xml/security_settings_lockscreen.xml
+++ b/res/xml/security_settings_lockscreen.xml
@@ -26,6 +26,15 @@
             android:summary="@string/unlock_set_unlock_mode_off"
             android:persistent="false"/>
 
+        <CheckBoxPreference
+            android:key="keyguard_enable_widgets"
+            android:title="@string/security_enable_widgets_title"/>
+
+        <PreferenceScreen
+            android:fragment="com.android.settings.OwnerInfoSettings"
+            android:key="owner_info_settings"
+            android:title="@string/owner_info_settings_title"
+            android:summary="@string/owner_info_settings_summary"/>
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index 9f78820..dbbeb1d 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -33,11 +33,11 @@
 
         <CheckBoxPreference android:key="show_password"
                 android:title="@string/show_password"
-                android:summary="@string/show_password_summary"
                 android:persistent="false"/>
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/device_admin_title"
+    <PreferenceCategory android:key="device_admin_category"
+            android:title="@string/device_admin_title"
             android:persistent="false">
 
         <Preference android:title="@string/manage_device_admin"
@@ -52,16 +52,36 @@
                 android:summaryOn="@string/install_unknown_applications"
                 android:persistent="false" />
 
+        <CheckBoxPreference
+                android:key="toggle_verify_applications"
+                android:title="@string/verify_applications"
+                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:title="@string/credentials_title"
+    <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"
                 android:fragment="com.android.settings.TrustedCredentialsSettings"/>
 
-        <Preference android:title="@string/credentials_install"
+        <Preference android:key="credentials_install"
+                android:title="@string/credentials_install"
                 android:summary="@string/credentials_install_summary"
                 android:persistent="false">
             <intent android:action="android.credentials.INSTALL"
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index 0e9c71d..7cde2f5 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -38,6 +38,10 @@
             android:key="power_button_instantly_locks"
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
+        <CheckBoxPreference
+            android:key="keyguard_enable_widgets"
+            android:title="@string/security_enable_widgets_title"/>
+
         <PreferenceScreen
             android:fragment="com.android.settings.OwnerInfoSettings"
             android:key="owner_info_settings"
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index b91b2b6..d8e06b3 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -43,8 +43,8 @@
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
         <CheckBoxPreference
-            android:key="unlock_tactile_feedback"
-            android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
+            android:key="keyguard_enable_widgets"
+            android:title="@string/security_enable_widgets_title"/>
 
         <PreferenceScreen
             android:fragment="com.android.settings.OwnerInfoSettings"
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index 4562a9a..1e8fbbe 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -39,8 +39,8 @@
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
         <CheckBoxPreference
-            android:key="unlock_tactile_feedback"
-            android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
+            android:key="keyguard_enable_widgets"
+            android:title="@string/security_enable_widgets_title"/>
 
         <PreferenceScreen
             android:fragment="com.android.settings.OwnerInfoSettings"
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 2089bac..8744328 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -19,7 +19,8 @@
 
 
     <!-- WIRELESS and NETWORKS -->
-    <header android:title="@string/header_category_wireless_networks" />
+    <header android:id="@+id/wireless_section"
+        android:title="@string/header_category_wireless_networks" />
 
     <!-- Wifi -->
     <header
@@ -58,7 +59,15 @@
         android:icon="@drawable/empty_icon" />
 
     <!-- DEVICE -->
-    <header android:title="@string/header_category_device" />
+    <header android:id="@+id/device_section"
+        android:title="@string/header_category_device" />
+
+    <!-- Home -->
+    <header
+        android:id="@+id/home_settings"
+        android:icon="@drawable/ic_settings_home"
+        android:fragment="com.android.settings.HomeSettings"
+        android:title="@string/home_settings" />
 
     <!-- Sound -->
     <header
@@ -95,6 +104,20 @@
         android:title="@string/applications_settings"
         android:id="@+id/application_settings" />
 
+    <!-- Manage users -->
+    <header
+        android:fragment="com.android.settings.users.UserSettings"
+        android:icon="@drawable/ic_settings_multiuser"
+        android:title="@string/user_settings_title"
+        android:id="@+id/user_settings" />
+
+    <!-- Manage NFC payment apps -->
+    <header
+        android:fragment="com.android.settings.nfc.PaymentSettings"
+        android:icon="@drawable/ic_settings_nfc_payment"
+        android:title="@string/nfc_payment_settings_title"
+        android:id="@+id/nfc_payment_settings" />
+
     <!-- Manufacturer hook -->
     <header
         android:fragment="com.android.settings.WirelessSettings"
@@ -102,20 +125,13 @@
         <intent android:action="com.android.settings.MANUFACTURER_APPLICATION_SETTING" />
     </header>
 
-
     <!-- PERSONAL -->
-    <header android:title="@string/header_category_personal" />
-
-    <!-- Manage users -->
-    <header
-        android:fragment="com.android.settings.users.UserSettings"
-        android:icon="@drawable/ic_settings_sync"
-        android:title="@string/user_settings_title"
-        android:id="@+id/user_settings" />
+    <header android:id="@+id/personal_section"
+        android:title="@string/header_category_personal" />
 
     <!-- Location -->
     <header
-        android:fragment="com.android.settings.LocationSettings"
+        android:fragment="com.android.settings.location.LocationSettings"
         android:icon="@drawable/ic_settings_location"
         android:title="@string/location_settings_title"
         android:id="@+id/location_settings" />
@@ -149,20 +165,14 @@
     <header
             android:id="@+id/account_add"
             android:title="@string/add_account_label"
-            android:icon="@drawable/ic_menu_add">
+            android:icon="@drawable/ic_menu_add_dark">
         <intent
             android:action="android.settings.ADD_ACCOUNT_SETTINGS"/>
     </header>
 
     <!-- SYSTEM -->
-    <header android:title="@string/header_category_system" />
-
-    <!-- Dock -->
-    <header
-        android:id="@+id/dock_settings"
-        android:fragment="com.android.settings.DockSettings"
-        android:icon="@drawable/ic_settings_dock"
-        android:title="@string/dock_settings" />
+    <header android:id="@+id/system_section"
+        android:title="@string/header_category_system" />
 
     <!-- Date & Time -->
     <header
@@ -174,10 +184,17 @@
     <!-- Accessibility feedback -->
     <header
         android:id="@+id/accessibility_settings"
-        android:fragment="com.android.settings.AccessibilitySettings"
+        android:fragment="com.android.settings.accessibility.AccessibilitySettings"
         android:icon="@drawable/ic_settings_accessibility"
         android:title="@string/accessibility_settings" />
 
+    <!-- Print -->
+    <header
+        android:id="@+id/print_settings"
+        android:fragment="com.android.settings.print.PrintSettingsFragment"
+        android:icon="@*android:drawable/ic_print"
+        android:title="@string/print_settings" />
+
     <!-- Development -->
     <header
         android:id="@+id/development_settings"
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 6da9734..26e2e20 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -88,4 +88,25 @@
             android:entries="@array/emergency_tone_entries"
             android:entryValues="@array/emergency_tone_values" />
 
+    <!-- Dock -->
+    <PreferenceCategory
+        android:key="dock_category"
+        android:title="@string/dock_settings"/>
+
+    <!-- Do not nest these, or removals in code will break -->
+    <PreferenceScreen
+        android:key="dock_audio"
+        android:title="@string/dock_audio_settings_title">
+        <CheckBoxPreference
+            android:title="@string/bluetooth_dock_settings_a2dp"
+            android:key="dock_audio_media_enabled"
+            android:enabled="true"
+            />
+    </PreferenceScreen>
+
+    <CheckBoxPreference
+        android:key="dock_sounds"
+        android:title="@string/dock_sounds_enable_title"
+        android:defaultValue="false" />
+
 </PreferenceScreen>
diff --git a/res/xml/timezones.xml b/res/xml/timezones.xml
index f9a36f3..8c195fb 100644
--- a/res/xml/timezones.xml
+++ b/res/xml/timezones.xml
@@ -1,86 +1,87 @@
 <timezones>
-    <timezone id="Pacific/Majuro">Marshall Islands</timezone>
-    <timezone id="Pacific/Midway">Midway Island</timezone>
-    <timezone id="Pacific/Honolulu">Hawaii</timezone>
-    <timezone id="America/Anchorage">Alaska</timezone>
-    <timezone id="America/Los_Angeles">Pacific Time</timezone>
-    <timezone id="America/Tijuana">Tijuana</timezone>
-    <timezone id="America/Phoenix">Arizona</timezone>
-    <timezone id="America/Chihuahua">Chihuahua</timezone>
-    <timezone id="America/Denver">Mountain Time</timezone>
-    <timezone id="America/Costa_Rica">Central America</timezone>
-    <timezone id="America/Chicago">Central Time</timezone>
-    <timezone id="America/Mexico_City">Mexico City</timezone>
-    <timezone id="America/Regina">Saskatchewan</timezone>
-    <timezone id="America/Bogota">Bogota</timezone>
-    <timezone id="America/New_York">Eastern Time</timezone>
-    <timezone id="America/Caracas">Venezuela</timezone>
-    <timezone id="America/Barbados">Atlantic Time (Barbados)</timezone>
-    <timezone id="America/Halifax">Atlantic Time (Canada)</timezone>
-    <timezone id="America/Manaus">Manaus</timezone>
-    <timezone id="America/Santiago">Santiago</timezone>
-    <timezone id="America/St_Johns">Newfoundland</timezone>
-    <timezone id="America/Sao_Paulo">Brasilia</timezone>
-    <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
-    <timezone id="America/Godthab">Greenland</timezone>
-    <timezone id="America/Montevideo">Montevideo</timezone>
-    <timezone id="Atlantic/South_Georgia">Mid-Atlantic</timezone>
-    <timezone id="Atlantic/Azores">Azores</timezone>
-    <timezone id="Atlantic/Cape_Verde">Cape Verde Islands</timezone>
-    <timezone id="Africa/Casablanca">Casablanca</timezone>
-    <timezone id="Europe/London">London, Dublin</timezone>
-    <timezone id="Europe/Amsterdam">Amsterdam, Berlin</timezone>
-    <timezone id="Europe/Belgrade">Belgrade</timezone>
-    <timezone id="Europe/Brussels">Brussels</timezone>
-    <timezone id="Europe/Sarajevo">Sarajevo</timezone>
-    <timezone id="Africa/Windhoek">Windhoek</timezone>
-    <timezone id="Africa/Brazzaville">W. Africa Time</timezone>
-    <timezone id="Asia/Amman">Amman, Jordan</timezone>
-    <timezone id="Europe/Athens">Athens, Istanbul</timezone>
-    <timezone id="Asia/Beirut">Beirut, Lebanon</timezone>
-    <timezone id="Africa/Cairo">Cairo</timezone>
-    <timezone id="Europe/Helsinki">Helsinki</timezone>
-    <timezone id="Asia/Jerusalem">Jerusalem</timezone>
-    <timezone id="Europe/Minsk">Minsk</timezone>
-    <timezone id="Africa/Harare">Harare</timezone>
-    <timezone id="Asia/Baghdad">Baghdad</timezone>
-    <timezone id="Europe/Moscow">Moscow</timezone>
-    <timezone id="Asia/Kuwait">Kuwait</timezone>
-    <timezone id="Africa/Nairobi">Nairobi</timezone>
-    <timezone id="Asia/Tehran">Tehran</timezone>
-    <timezone id="Asia/Baku">Baku</timezone>
-    <timezone id="Asia/Tbilisi">Tbilisi</timezone>
-    <timezone id="Asia/Yerevan">Yerevan</timezone>
-    <timezone id="Asia/Dubai">Dubai</timezone>
-    <timezone id="Asia/Kabul">Kabul</timezone>
-    <timezone id="Asia/Karachi">Islamabad, Karachi</timezone>
-    <timezone id="Asia/Oral">Ural'sk</timezone>
-    <timezone id="Asia/Yekaterinburg">Yekaterinburg</timezone>
-    <timezone id="Asia/Calcutta">Kolkata</timezone>
-    <timezone id="Asia/Colombo">Sri Lanka</timezone>
-    <timezone id="Asia/Katmandu">Kathmandu</timezone>
-    <timezone id="Asia/Almaty">Astana</timezone>
-    <timezone id="Asia/Rangoon">Yangon</timezone>
-    <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
-    <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Shanghai">Beijing</timezone>
-    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
-    <timezone id="Asia/Irkutsk">Irkutsk</timezone>
-    <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
-    <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Taipei</timezone>
-    <timezone id="Asia/Seoul">Seoul</timezone>
-    <timezone id="Asia/Tokyo">Tokyo, Osaka</timezone>
-    <timezone id="Asia/Yakutsk">Yakutsk</timezone>
-    <timezone id="Australia/Adelaide">Adelaide</timezone>
-    <timezone id="Australia/Darwin">Darwin</timezone>
-    <timezone id="Australia/Brisbane">Brisbane</timezone>
-    <timezone id="Australia/Hobart">Hobart</timezone>
-    <timezone id="Australia/Sydney">Sydney, Canberra</timezone>
-    <timezone id="Asia/Vladivostok">Vladivostok</timezone>
-    <timezone id="Pacific/Guam">Guam</timezone>
-    <timezone id="Asia/Magadan">Magadan</timezone>
-    <timezone id="Pacific/Auckland">Auckland</timezone>
-    <timezone id="Pacific/Fiji">Fiji</timezone>
-    <timezone id="Pacific/Tongatapu">Tonga</timezone>
+    <timezone id="Pacific/Majuro"></timezone>
+    <timezone id="Pacific/Midway"></timezone>
+    <timezone id="Pacific/Honolulu"></timezone>
+    <timezone id="America/Anchorage"></timezone>
+    <timezone id="America/Los_Angeles"></timezone>
+    <timezone id="America/Tijuana"></timezone>
+    <timezone id="America/Phoenix"></timezone>
+    <timezone id="America/Chihuahua"></timezone>
+    <timezone id="America/Denver"></timezone>
+    <timezone id="America/Costa_Rica"></timezone>
+    <timezone id="America/Chicago"></timezone>
+    <timezone id="America/Mexico_City"></timezone>
+    <timezone id="America/Regina"></timezone>
+    <timezone id="America/Bogota"></timezone>
+    <timezone id="America/New_York"></timezone>
+    <timezone id="America/Caracas"></timezone>
+    <timezone id="America/Barbados"></timezone>
+    <timezone id="America/Halifax"></timezone>
+    <timezone id="America/Manaus"></timezone>
+    <timezone id="America/Santiago"></timezone>
+    <timezone id="America/St_Johns"></timezone>
+    <timezone id="America/Sao_Paulo"></timezone>
+    <timezone id="America/Argentina/Buenos_Aires"></timezone>
+    <timezone id="America/Godthab"></timezone>
+    <timezone id="America/Montevideo"></timezone>
+    <timezone id="Atlantic/South_Georgia"></timezone>
+    <timezone id="Atlantic/Azores"></timezone>
+    <timezone id="Atlantic/Cape_Verde"></timezone>
+    <timezone id="Africa/Casablanca"></timezone>
+    <timezone id="Europe/London"></timezone>
+    <timezone id="Europe/Amsterdam"></timezone>
+    <timezone id="Europe/Belgrade"></timezone>
+    <timezone id="Europe/Brussels"></timezone>
+    <timezone id="Europe/Sarajevo"></timezone>
+    <timezone id="Africa/Windhoek"></timezone>
+    <timezone id="Africa/Brazzaville"></timezone>
+    <timezone id="Asia/Amman"></timezone>
+    <timezone id="Europe/Athens"></timezone>
+    <timezone id="Asia/Beirut"></timezone>
+    <timezone id="Africa/Cairo"></timezone>
+    <timezone id="Europe/Helsinki"></timezone>
+    <timezone id="Asia/Jerusalem"></timezone>
+    <timezone id="Europe/Minsk"></timezone>
+    <timezone id="Africa/Harare"></timezone>
+    <timezone id="Asia/Baghdad"></timezone>
+    <timezone id="Europe/Moscow"></timezone>
+    <timezone id="Asia/Kuwait"></timezone>
+    <timezone id="Africa/Nairobi"></timezone>
+    <timezone id="Asia/Tehran"></timezone>
+    <timezone id="Asia/Baku"></timezone>
+    <timezone id="Asia/Tbilisi"></timezone>
+    <timezone id="Asia/Yerevan"></timezone>
+    <timezone id="Asia/Dubai"></timezone>
+    <timezone id="Asia/Kabul"></timezone>
+    <timezone id="Asia/Karachi"></timezone>
+    <timezone id="Asia/Oral"></timezone>
+    <timezone id="Asia/Yekaterinburg"></timezone>
+    <timezone id="Asia/Calcutta"></timezone>
+    <timezone id="Asia/Colombo"></timezone>
+    <timezone id="Asia/Katmandu"></timezone>
+    <timezone id="Asia/Almaty"></timezone>
+    <timezone id="Asia/Rangoon"></timezone>
+    <timezone id="Asia/Krasnoyarsk"></timezone>
+    <timezone id="Asia/Bangkok"></timezone>
+    <timezone id="Asia/Jakarta"></timezone>
+    <timezone id="Asia/Shanghai"></timezone>
+    <timezone id="Asia/Hong_Kong"></timezone>
+    <timezone id="Asia/Irkutsk"></timezone>
+    <timezone id="Asia/Kuala_Lumpur"></timezone>
+    <timezone id="Australia/Perth"></timezone>
+    <timezone id="Asia/Taipei"></timezone>
+    <timezone id="Asia/Seoul"></timezone>
+    <timezone id="Asia/Tokyo"></timezone>
+    <timezone id="Asia/Yakutsk"></timezone>
+    <timezone id="Australia/Adelaide"></timezone>
+    <timezone id="Australia/Darwin"></timezone>
+    <timezone id="Australia/Brisbane"></timezone>
+    <timezone id="Australia/Hobart"></timezone>
+    <timezone id="Australia/Sydney"></timezone>
+    <timezone id="Asia/Vladivostok"></timezone>
+    <timezone id="Pacific/Guam"></timezone>
+    <timezone id="Asia/Magadan"></timezone>
+    <timezone id="Pacific/Auckland"></timezone>
+    <timezone id="Pacific/Fiji"></timezone>
+    <timezone id="Pacific/Tongatapu"></timezone>
 </timezones>
diff --git a/res/xml/tts_engine_settings.xml b/res/xml/tts_engine_settings.xml
index 03414e8..176bdbc 100644
--- a/res/xml/tts_engine_settings.xml
+++ b/res/xml/tts_engine_settings.xml
@@ -19,16 +19,19 @@
         android:key="tts_default_lang"
         android:title="@string/tts_default_lang_title"
         android:summary="@string/tts_default_lang_summary"
-        android:persistent="false" />
+        android:persistent="false"
+        android:order="100" />
 
     <Preference
         android:key="tts_engine_settings"
         android:persistent="false"
-        android:title="@string/tts_engine_settings_title" />
+        android:title="@string/tts_engine_settings_title"
+        android:order="200" />
 
     <Preference
         android:key="tts_install_data"
         android:persistent="false"
         android:title="@string/tts_install_data_title"
-        android:summary="@string/tts_install_data_summary" />
+        android:summary="@string/tts_install_data_summary"
+        android:order="300" />
 </PreferenceScreen>
diff --git a/res/xml/tts_settings.xml b/res/xml/tts_settings.xml
index 2b145d1..ab132df 100644
--- a/res/xml/tts_settings.xml
+++ b/res/xml/tts_settings.xml
@@ -37,4 +37,9 @@
          android:persistent="false"
          android:title="@string/tts_play_example_title"
          android:summary="@string/tts_play_example_summary" />
+
+    <Preference android:key="tts_status"
+         style="?android:attr/preferenceInformationStyle"
+         android:persistent="false"
+         android:title="@string/tts_status_title"/>
 </PreferenceScreen>
diff --git a/res/xml/user_details.xml b/res/xml/user_details.xml
deleted file mode 100644
index 257eee4..0000000
--- a/res/xml/user_details.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:title="@string/user_details_title">
-
-    <PreferenceCategory
-            android:key="information_category"
-            android:title="@string/user_information_heading">
-        <EditTextPreference
-                android:key="user_name"
-                android:title="@string/user_name_title"
-                android:persistent="false"
-                />
-    </PreferenceCategory>
-
-    <PreferenceCategory
-            android:key="restrictions_category"
-            android:title="@string/user_restrictions_heading">
-        <CheckBoxPreference
-                android:key="market_requires_pin"
-                android:title="@string/user_market_requires_pin"
-                android:persistent="false"
-                android:enabled="false"
-                />
-        <ListPreference
-                android:key="content_rating"
-                android:title="@string/user_max_content_rating"
-                android:entries="@array/user_content_ratings_entries"
-                android:entryValues="@array/user_content_ratings_values"
-                android:persistent="false"
-                android:enabled="false"
-                />
-    </PreferenceCategory>
-
-    <PreferenceCategory
-            android:key="system_apps_category"
-            android:title="@string/user_system_apps_heading">
-        <!-- Dynamically added content -->
-    </PreferenceCategory>
-
-    <PreferenceCategory
-            android:key="market_apps_category"
-            android:title="@string/user_market_apps_heading">
-        <!-- Dynamically added content -->
-    </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index 95bc703..3a0ab74 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -23,4 +23,9 @@
             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_dark" />
+
 </PreferenceScreen>
diff --git a/res/xml/vpn_settings2.xml b/res/xml/vpn_settings2.xml
index 38632cc..08075a6 100644
--- a/res/xml/vpn_settings2.xml
+++ b/res/xml/vpn_settings2.xml
@@ -16,8 +16,4 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/vpn_title">
-    <Preference android:key="add_network"
-            android:title="@string/vpn_create"
-            android:order="1"
-            android:persistent="false"/>
 </PreferenceScreen>
diff --git a/res/xml/wifi_access_points.xml b/res/xml/wifi_access_points.xml
index 48104dd..7b8c92b 100644
--- a/res/xml/wifi_access_points.xml
+++ b/res/xml/wifi_access_points.xml
@@ -17,7 +17,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/wifi_settings_category">
 
-    <com.android.settings.ProgressCategory
+    <com.android.settings.bluetooth.BluetoothProgressCategory
             android:key="access_points"
             android:title="@string/wifi_access_points"
             android:persistent="false" />
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index 3000666..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
@@ -47,6 +52,17 @@
             android:entries="@array/wifi_frequency_band_entries"
             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"
+            android:summary="@string/wifi_suspend_optimizations_summary"
+            android:persistent="false" />
     
     <Preference android:key="mac_address" 
         style="?android:attr/preferenceInformationStyle" 
diff --git a/res/drawable/wifi_signal.xml b/res/xml/wifi_display_settings.xml
similarity index 60%
copy from res/drawable/wifi_signal.xml
copy to res/xml/wifi_display_settings.xml
index 86c1ab0..2b32106 100644
--- a/res/drawable/wifi_signal.xml
+++ b/res/xml/wifi_display_settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- 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.
@@ -14,9 +14,8 @@
      limitations under the License.
 -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock" />
-    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open" />
-</selector>
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/wifi_display_settings_title" >
 
+</PreferenceScreen>
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 3cd72b3..c7b9019 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -23,25 +23,10 @@
         android:persistent="false"
         android:disableDependentsState="true" />
 
-    <PreferenceScreen
-        android:fragment="com.android.settings.vpn2.VpnSettings"
-        android:key="vpn_settings"
-        android:title="@string/vpn_settings_title" />
-
-    <PreferenceScreen
-        android:fragment="com.android.settings.TetherSettings"
-        android:key="tether_settings"
-        android:title="@string/tether_settings_title_all" />
-
-    <PreferenceScreen
-        android:key="wimax_settings"
-        android:title="@string/wimax_settings"
-        android:summary="@string/wimax_settings_summary" >
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.settings.wimax"
-            android:targetClass="com.android.settings.wimax.WimaxSettings" />
-    </PreferenceScreen>
+    <com.android.settings.SmsListPreference
+        android:key="sms_application"
+        android:title="@string/sms_application_title"
+        android:persistent="false" />
 
     <CheckBoxPreference
         android:key="toggle_nfc"
@@ -55,6 +40,16 @@
         android:title="@string/android_beam_settings_title" />
 
     <PreferenceScreen
+        android:fragment="com.android.settings.TetherSettings"
+        android:key="tether_settings"
+        android:title="@string/tether_settings_title_all" />
+
+    <PreferenceScreen
+        android:fragment="com.android.settings.vpn2.VpnSettings"
+        android:key="vpn_settings"
+        android:title="@string/vpn_settings_title" />
+
+    <PreferenceScreen
         android:key="mobile_network_settings"
         android:title="@string/network_settings_title"
         android:dependency="toggle_airplane">
@@ -64,6 +59,20 @@
             android:targetClass="com.android.phone.MobileNetworkSettings" />
     </PreferenceScreen>
 
+    <Preference
+        android:key="manage_mobile_plan"
+        android:title="@string/manage_mobile_plan_title"
+        android:persistent="false" />
+
+    <PreferenceScreen
+        android:key="wimax_settings"
+        android:title="@string/wimax_settings" >
+        <intent
+            android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.settings.wimax"
+            android:targetClass="com.android.settings.wimax.WimaxSettings" />
+    </PreferenceScreen>
+
     <CheckBoxPreference
         android:key="toggle_nsd"
         android:title="@string/nsd_quick_toggle_title"
@@ -77,8 +86,7 @@
 
     <PreferenceScreen
         android:key="cell_broadcast_settings"
-        android:title="@string/cell_broadcast_settings"
-        android:summary="@string/cell_broadcast_settings_summary" >
+        android:title="@string/cell_broadcast_settings" >
         <intent
             android:action="android.intent.action.MAIN"
             android:targetPackage="com.android.cellbroadcastreceiver"
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
deleted file mode 100644
index 8cb04cc..0000000
--- a/src/com/android/settings/AccessibilitySettings.java
+++ /dev/null
@@ -1,888 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.accessibilityservice.AccessibilityServiceInfo;
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.ActivityManagerNative;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.content.res.Configuration;
-import android.database.ContentObserver;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.RemoteException;
-import android.os.SystemProperties;
-import android.preference.CheckBoxPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceCategory;
-import android.preference.PreferenceScreen;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.text.TextUtils.SimpleStringSplitter;
-import android.view.Gravity;
-import android.view.KeyCharacterMap;
-import android.view.KeyEvent;
-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.LinearLayout;
-import android.widget.Switch;
-import android.widget.TextView;
-
-import com.android.internal.content.PackageMonitor;
-import com.android.internal.view.RotationPolicy;
-import com.android.settings.AccessibilitySettings.ToggleSwitch.OnBeforeCheckedChangeListener;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Activity with the accessibility settings.
- */
-public class AccessibilitySettings extends SettingsPreferenceFragment implements DialogCreatable,
-        Preference.OnPreferenceChangeListener {
-    private static final String DEFAULT_SCREENREADER_MARKET_LINK =
-        "market://search?q=pname:com.google.android.marvin.talkback";
-
-    private static final float LARGE_FONT_SCALE = 1.3f;
-
-    private static final String SYSTEM_PROPERTY_MARKET_URL = "ro.screenreader.market";
-
-    // Timeout before we update the services if packages are added/removed since
-    // the AccessibilityManagerService has to do that processing first to generate
-    // the AccessibilityServiceInfo we need for proper presentation.
-    private static final long DELAY_UPDATE_SERVICES_MILLIS = 1000;
-
-    private static final char ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR = ':';
-
-    private static final String KEY_INSTALL_ACCESSIBILITY_SERVICE_OFFERED_ONCE =
-        "key_install_accessibility_service_offered_once";
-
-    // Preference categories
-    private static final String SERVICES_CATEGORY = "services_category";
-    private static final String SYSTEM_CATEGORY = "system_category";
-
-    // Preferences
-    private static final String TOGGLE_LARGE_TEXT_PREFERENCE = "toggle_large_text_preference";
-    private static final String TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE =
-        "toggle_power_button_ends_call_preference";
-    private static final String TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE =
-        "toggle_lock_screen_rotation_preference";
-    private static final String TOGGLE_SPEAK_PASSWORD_PREFERENCE =
-        "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";
-
-    // Extras passed to sub-fragments.
-    private static final String EXTRA_PREFERENCE_KEY = "preference_key";
-    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_SETTINGS_COMPONENT_NAME = "settings_component_name";
-
-    // Dialog IDs.
-    private static final int DIALOG_ID_NO_ACCESSIBILITY_SERVICES = 1;
-
-    // Auxiliary members.
-    private final static SimpleStringSplitter sStringColonSplitter =
-        new SimpleStringSplitter(ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR);
-
-    private static final Set<ComponentName> sInstalledServices = new HashSet<ComponentName>();
-
-    private final Map<String, String> mLongPressTimeoutValuetoTitleMap =
-        new HashMap<String, String>();
-
-    private final Configuration mCurConfig = new Configuration();
-
-    private final PackageMonitor mSettingsPackageMonitor = new SettingsPackageMonitor();
-
-    private final Handler mHandler = new Handler() {
-        @Override
-        public void dispatchMessage(Message msg) {
-            super.dispatchMessage(msg);
-            loadInstalledServices();
-            updateServicesPreferences();
-        }
-    };
-
-    private final RotationPolicy.RotationPolicyListener mRotationPolicyListener =
-            new RotationPolicy.RotationPolicyListener() {
-        @Override
-        public void onChange() {
-            updateLockScreenRotationCheckbox();
-        }
-    };
-
-    // Preference controls.
-    private PreferenceCategory mServicesCategory;
-    private PreferenceCategory mSystemsCategory;
-
-    private CheckBoxPreference mToggleLargeTextPreference;
-    private CheckBoxPreference mTogglePowerButtonEndsCallPreference;
-    private CheckBoxPreference mToggleLockScreenRotationPreference;
-    private CheckBoxPreference mToggleSpeakPasswordPreference;
-    private ListPreference mSelectLongPressTimeoutPreference;
-    private AccessibilityEnableScriptInjectionPreference mToggleScriptInjectionPreference;
-    private Preference mNoServicesMessagePreference;
-
-    private int mLongPressTimeoutDefault;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        addPreferencesFromResource(R.xml.accessibility_settings);
-        initializeAllPreferences();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        loadInstalledServices();
-        updateAllPreferences();
-
-        offerInstallAccessibilitySerivceOnce();
-
-        mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
-        RotationPolicy.registerRotationPolicyListener(getActivity(),
-                mRotationPolicyListener);
-    }
-
-    @Override
-    public void onPause() {
-        mSettingsPackageMonitor.unregister();
-        RotationPolicy.unregisterRotationPolicyListener(getActivity(),
-                mRotationPolicyListener);
-        super.onPause();
-    }
-
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference == mSelectLongPressTimeoutPreference) {
-            String stringValue = (String) newValue;
-            Settings.Secure.putInt(getContentResolver(),
-                    Settings.Secure.LONG_PRESS_TIMEOUT, Integer.parseInt(stringValue));
-            mSelectLongPressTimeoutPreference.setSummary(
-                    mLongPressTimeoutValuetoTitleMap.get(stringValue));
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        if (mToggleLargeTextPreference == preference) {
-            handleToggleLargeTextPreferenceClick();
-            return true;
-        } else if (mTogglePowerButtonEndsCallPreference == preference) {
-            handleTogglePowerButtonEndsCallPreferenceClick();
-            return true;
-        } else if (mToggleLockScreenRotationPreference == preference) {
-            handleLockScreenRotationPreferenceClick();
-            return true;
-        } else if (mToggleSpeakPasswordPreference == preference) {
-            handleToggleSpeakPasswordPreferenceClick();
-        }
-        return super.onPreferenceTreeClick(preferenceScreen, preference);
-    }
-
-    private void handleToggleLargeTextPreferenceClick() {
-        try {
-            mCurConfig.fontScale = mToggleLargeTextPreference.isChecked() ? LARGE_FONT_SCALE : 1;
-            ActivityManagerNative.getDefault().updatePersistentConfiguration(mCurConfig);
-        } catch (RemoteException re) {
-            /* ignore */
-        }
-    }
-
-    private void handleTogglePowerButtonEndsCallPreferenceClick() {
-        Settings.Secure.putInt(getContentResolver(),
-                Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
-                (mTogglePowerButtonEndsCallPreference.isChecked()
-                        ? Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP
-                        : Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF));
-    }
-
-    private void handleLockScreenRotationPreferenceClick() {
-        RotationPolicy.setRotationLockForAccessibility(getActivity(),
-                !mToggleLockScreenRotationPreference.isChecked());
-    }
-
-    private void handleToggleSpeakPasswordPreferenceClick() {
-        Settings.Secure.putInt(getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD,
-                mToggleSpeakPasswordPreference.isChecked() ? 1 : 0);
-    }
-
-    private void initializeAllPreferences() {
-        mServicesCategory = (PreferenceCategory) findPreference(SERVICES_CATEGORY);
-        mSystemsCategory = (PreferenceCategory) findPreference(SYSTEM_CATEGORY);
-
-        // Large text.
-        mToggleLargeTextPreference =
-            (CheckBoxPreference) findPreference(TOGGLE_LARGE_TEXT_PREFERENCE);
-
-        // Power button ends calls.
-        mTogglePowerButtonEndsCallPreference =
-            (CheckBoxPreference) findPreference(TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE);
-        if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
-                || !Utils.isVoiceCapable(getActivity())) {
-            mSystemsCategory.removePreference(mTogglePowerButtonEndsCallPreference);
-        }
-
-        // Lock screen rotation.
-        mToggleLockScreenRotationPreference =
-            (CheckBoxPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE);
-
-        // Speak passwords.
-        mToggleSpeakPasswordPreference =
-            (CheckBoxPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE);
-
-        // Long press timeout.
-        mSelectLongPressTimeoutPreference =
-            (ListPreference) findPreference(SELECT_LONG_PRESS_TIMEOUT_PREFERENCE);
-        mSelectLongPressTimeoutPreference.setOnPreferenceChangeListener(this);
-        if (mLongPressTimeoutValuetoTitleMap.size() == 0) {
-            String[] timeoutValues = getResources().getStringArray(
-                    R.array.long_press_timeout_selector_values);
-            mLongPressTimeoutDefault = Integer.parseInt(timeoutValues[0]);
-            String[] timeoutTitles = getResources().getStringArray(
-                    R.array.long_press_timeout_selector_titles);
-            final int timeoutValueCount = timeoutValues.length;
-            for (int i = 0; i < timeoutValueCount; i++) {
-               mLongPressTimeoutValuetoTitleMap.put(timeoutValues[i], timeoutTitles[i]);
-            }
-        }
-
-        // Script injection.
-        mToggleScriptInjectionPreference = (AccessibilityEnableScriptInjectionPreference)
-            findPreference(TOGGLE_SCRIPT_INJECTION_PREFERENCE);
-    }
-
-    private void updateAllPreferences() {
-        updateServicesPreferences();
-        updateSystemPreferences();
-    }
-
-    private void updateServicesPreferences() {
-        // Since services category is auto generated we have to do a pass
-        // to generate it since services can come and go and then based on
-        // the global accessibility state to decided whether it is enabled.
-
-        // Generate.
-        mServicesCategory.removeAll();
-
-        AccessibilityManager accessibilityManager = AccessibilityManager.getInstance(getActivity());
-
-        List<AccessibilityServiceInfo> installedServices =
-            accessibilityManager.getInstalledAccessibilityServiceList();
-        Set<ComponentName> enabledServices = getEnabledServicesFromSettings(getActivity());
-
-        final boolean accessibilityEnabled = Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_ENABLED, 0) == 1;
-
-        for (int i = 0, count = installedServices.size(); i < count; ++i) {
-            AccessibilityServiceInfo info = installedServices.get(i);
-
-            PreferenceScreen preference = getPreferenceManager().createPreferenceScreen(
-                    getActivity());
-            String title = info.getResolveInfo().loadLabel(getPackageManager()).toString();
-
-            ServiceInfo serviceInfo = info.getResolveInfo().serviceInfo;
-            ComponentName componentName = new ComponentName(serviceInfo.packageName,
-                    serviceInfo.name);
-
-            preference.setKey(componentName.flattenToString());
-
-            preference.setTitle(title);
-            final boolean serviceEnabled = accessibilityEnabled
-                && enabledServices.contains(componentName);
-            if (serviceEnabled) {
-                preference.setSummary(getString(R.string.accessibility_service_state_on));
-            } else {
-                preference.setSummary(getString(R.string.accessibility_service_state_off));
-            }
-
-            preference.setOrder(i);
-            preference.setFragment(ToggleAccessibilityServicePreferenceFragment.class.getName());
-            preference.setPersistent(true);
-
-            Bundle extras = preference.getExtras();
-            extras.putString(EXTRA_PREFERENCE_KEY, preference.getKey());
-            extras.putBoolean(EXTRA_CHECKED, serviceEnabled);
-            extras.putString(EXTRA_TITLE, title);
-
-            String description = info.loadDescription(getPackageManager());
-            if (TextUtils.isEmpty(description)) {
-                description = getString(R.string.accessibility_service_default_description);
-            }
-            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,
-                        getString(R.string.accessibility_menu_item_settings));
-                extras.putString(EXTRA_SETTINGS_COMPONENT_NAME,
-                        new ComponentName(info.getResolveInfo().serviceInfo.packageName,
-                                settingsClassName).flattenToString());
-            }
-
-            mServicesCategory.addPreference(preference);
-        }
-
-        if (mServicesCategory.getPreferenceCount() == 0) {
-            if (mNoServicesMessagePreference == null) {
-                mNoServicesMessagePreference = new Preference(getActivity()) {
-                    @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);
-                    }
-                };
-                mNoServicesMessagePreference.setPersistent(false);
-                mNoServicesMessagePreference.setLayoutResource(
-                        R.layout.text_description_preference);
-                mNoServicesMessagePreference.setSelectable(false);
-            }
-            mServicesCategory.addPreference(mNoServicesMessagePreference);
-        }
-    }
-
-    private void updateSystemPreferences() {
-        // Large text.
-        try {
-            mCurConfig.updateFrom(ActivityManagerNative.getDefault().getConfiguration());
-        } catch (RemoteException re) {
-            /* ignore */
-        }
-        mToggleLargeTextPreference.setChecked(mCurConfig.fontScale == LARGE_FONT_SCALE);
-
-        // Power button ends calls.
-        if (KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
-                && Utils.isVoiceCapable(getActivity())) {
-            final int incallPowerBehavior = Settings.Secure.getInt(getContentResolver(),
-                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
-                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT);
-            final boolean powerButtonEndsCall =
-                (incallPowerBehavior == Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP);
-            mTogglePowerButtonEndsCallPreference.setChecked(powerButtonEndsCall);
-        }
-
-        // Auto-rotate screen
-        updateLockScreenRotationCheckbox();
-
-        // Speak passwords.
-        final boolean speakPasswordEnabled = Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0) != 0;
-        mToggleSpeakPasswordPreference.setChecked(speakPasswordEnabled);
-
-        // Long press timeout.
-        final int longPressTimeout = Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.LONG_PRESS_TIMEOUT, mLongPressTimeoutDefault);
-        String value = String.valueOf(longPressTimeout);
-        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);
-    }
-
-    private void updateLockScreenRotationCheckbox() {
-        Context context = getActivity();
-        if (context != null) {
-            mToggleLockScreenRotationPreference.setChecked(
-                    !RotationPolicy.isRotationLocked(context));
-        }
-    }
-
-    private void offerInstallAccessibilitySerivceOnce() {
-        // There is always one preference - if no services it is just a message.
-        if (mServicesCategory.getPreference(0) != mNoServicesMessagePreference) {
-            return;
-        }
-        SharedPreferences preferences = getActivity().getPreferences(Context.MODE_PRIVATE);
-        final boolean offerInstallService = !preferences.getBoolean(
-                KEY_INSTALL_ACCESSIBILITY_SERVICE_OFFERED_ONCE, false);
-        if (offerInstallService) {
-            String screenreaderMarketLink = SystemProperties.get(
-                    SYSTEM_PROPERTY_MARKET_URL,
-                    DEFAULT_SCREENREADER_MARKET_LINK);
-            Uri marketUri = Uri.parse(screenreaderMarketLink);
-            Intent marketIntent = new Intent(Intent.ACTION_VIEW, marketUri);
-
-            if (getPackageManager().resolveActivity(marketIntent, 0) == null) {
-                // Don't show the dialog if no market app is found/installed.
-                return;
-            }
-
-            preferences.edit().putBoolean(KEY_INSTALL_ACCESSIBILITY_SERVICE_OFFERED_ONCE,
-                    true).commit();
-            // Notify user that they do not have any accessibility
-            // services installed and direct them to Market to get TalkBack.
-            showDialog(DIALOG_ID_NO_ACCESSIBILITY_SERVICES);
-        }
-    }
-
-    @Override
-    public Dialog onCreateDialog(int dialogId) {
-        switch (dialogId) {
-            case DIALOG_ID_NO_ACCESSIBILITY_SERVICES:
-                return new AlertDialog.Builder(getActivity())
-                    .setTitle(R.string.accessibility_service_no_apps_title)
-                    .setMessage(R.string.accessibility_service_no_apps_message)
-                    .setPositiveButton(android.R.string.ok,
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int which) {
-                                // dismiss the dialog before launching the activity otherwise
-                                // the dialog removal occurs after onSaveInstanceState which
-                                // triggers an exception
-                                removeDialog(DIALOG_ID_NO_ACCESSIBILITY_SERVICES);
-                                String screenreaderMarketLink = SystemProperties.get(
-                                        SYSTEM_PROPERTY_MARKET_URL,
-                                        DEFAULT_SCREENREADER_MARKET_LINK);
-                                Uri marketUri = Uri.parse(screenreaderMarketLink);
-                                Intent marketIntent = new Intent(Intent.ACTION_VIEW, marketUri);
-                                startActivity(marketIntent);
-                            }
-                    })
-                    .setNegativeButton(android.R.string.cancel, null)
-                    .create();
-            default:
-                return null;
-        }
-    }
-
-    private void loadInstalledServices() {
-        List<AccessibilityServiceInfo> installedServiceInfos =
-            AccessibilityManager.getInstance(getActivity())
-                .getInstalledAccessibilityServiceList();
-        Set<ComponentName> installedServices = sInstalledServices;
-        installedServices.clear();
-        final int installedServiceInfoCount = installedServiceInfos.size();
-        for (int i = 0; i < installedServiceInfoCount; i++) {
-            ResolveInfo resolveInfo = installedServiceInfos.get(i).getResolveInfo();
-            ComponentName installedService = new ComponentName(
-                    resolveInfo.serviceInfo.packageName,
-                    resolveInfo.serviceInfo.name);
-            installedServices.add(installedService);
-        }
-    }
-
-    private static Set<ComponentName> getEnabledServicesFromSettings(Context context) {
-        String enabledServicesSetting = Settings.Secure.getString(context.getContentResolver(),
-                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
-        if (enabledServicesSetting == null) {
-            enabledServicesSetting = "";
-        }
-        Set<ComponentName> enabledServices = new HashSet<ComponentName>();
-        SimpleStringSplitter colonSplitter = sStringColonSplitter;
-        colonSplitter.setString(enabledServicesSetting);
-        while (colonSplitter.hasNext()) {
-            String componentNameString = colonSplitter.next();
-            ComponentName enabledService = ComponentName.unflattenFromString(
-                    componentNameString);
-            if (enabledService != null) {
-                enabledServices.add(enabledService);
-            }
-        }
-        return enabledServices;
-    }
-
-    private class SettingsPackageMonitor extends PackageMonitor {
-
-        @Override
-        public void onPackageAdded(String packageName, int uid) {
-            Message message = mHandler.obtainMessage();
-            mHandler.sendMessageDelayed(message, DELAY_UPDATE_SERVICES_MILLIS);
-        }
-
-        @Override
-        public void onPackageAppeared(String packageName, int reason) {
-            Message message = mHandler.obtainMessage();
-            mHandler.sendMessageDelayed(message, DELAY_UPDATE_SERVICES_MILLIS);
-        }
-
-        @Override
-        public void onPackageDisappeared(String packageName, int reason) {
-            Message message = mHandler.obtainMessage();
-            mHandler.sendMessageDelayed(message, DELAY_UPDATE_SERVICES_MILLIS);
-        }
-
-        @Override
-        public void onPackageRemoved(String packageName, int uid) {
-            Message message = mHandler.obtainMessage();
-            mHandler.sendMessageDelayed(message, DELAY_UPDATE_SERVICES_MILLIS);
-        }
-    }
-
-    private static ToggleSwitch createAndAddActionBarToggleSwitch(Activity activity) {
-        ToggleSwitch toggleSwitch = new ToggleSwitch(activity);
-        final int padding = activity.getResources().getDimensionPixelSize(
-                R.dimen.action_bar_switch_padding);
-        toggleSwitch.setPadding(0, 0, padding, 0);
-        activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
-                ActionBar.DISPLAY_SHOW_CUSTOM);
-        activity.getActionBar().setCustomView(toggleSwitch,
-                new ActionBar.LayoutParams(ActionBar.LayoutParams.WRAP_CONTENT,
-                        ActionBar.LayoutParams.WRAP_CONTENT,
-                        Gravity.CENTER_VERTICAL | Gravity.RIGHT));
-        return toggleSwitch;
-    }
-
-    public static class ToggleSwitch extends Switch {
-
-        private OnBeforeCheckedChangeListener mOnBeforeListener;
-
-        public static interface OnBeforeCheckedChangeListener {
-            public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked);
-        }
-
-        public ToggleSwitch(Context context) {
-            super(context);
-        }
-
-        public void setOnBeforeCheckedChangeListener(OnBeforeCheckedChangeListener listener) {
-            mOnBeforeListener = listener;
-        }
-
-        @Override
-        public void setChecked(boolean checked) {
-            if (mOnBeforeListener != null
-                    && mOnBeforeListener.onBeforeCheckedChanged(this, checked)) {
-                return;
-            }
-            super.setChecked(checked);
-        }
-
-        public void setCheckedInternal(boolean checked) {
-            super.setChecked(checked);
-        }
-    }
-
-    public static class ToggleAccessibilityServicePreferenceFragment
-            extends SettingsPreferenceFragment implements DialogInterface.OnClickListener {
-
-        private static final int DIALOG_ID_ENABLE_WARNING = 1;
-        private static final int DIALOG_ID_DISABLE_WARNING = 2;
-
-        private String mPreferenceKey;
-
-        private ToggleSwitch mToggleSwitch;
-
-        private CharSequence mEnableWarningTitle;
-        private CharSequence mEnableWarningMessage;
-        private CharSequence mDisableWarningTitle;
-        private CharSequence mDisableWarningMessage;
-
-        private Preference mSummaryPreference;
-
-        private CharSequence mSettingsTitle;
-        private Intent mSettingsIntent;
-
-        private int mShownDialogId;
-
-        // TODO: Showing sub-sub fragment does not handle the activity title
-        //       so we do it but this is wrong. Do a real fix when there is time.
-        private CharSequence mOldActivityTitle;
-
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(
-                    getActivity());
-            setPreferenceScreen(preferenceScreen);
-            mSummaryPreference = new Preference(getActivity()) {
-                @Override
-                protected void onBindView(View view) {
-                    super.onBindView(view);
-                    TextView summaryView = (TextView) view.findViewById(R.id.summary);
-                    summaryView.setText(getSummary());
-                    sendAccessibilityEvent(summaryView);
-                }
-
-                private void sendAccessibilityEvent(View view) {
-                    // Since the view is still not attached we create, populate,
-                    // and send the event directly since we do not know when it
-                    // will be attached and posting commands is not as clean.
-                    AccessibilityManager accessibilityManager =
-                        AccessibilityManager.getInstance(getActivity());
-                    if (accessibilityManager.isEnabled()) {
-                        AccessibilityEvent event = AccessibilityEvent.obtain();
-                        event.setEventType(AccessibilityEvent.TYPE_VIEW_FOCUSED);
-                        view.onInitializeAccessibilityEvent(event);
-                        view.dispatchPopulateAccessibilityEvent(event);
-                        accessibilityManager.sendAccessibilityEvent(event);
-                    }
-                }
-            };
-            mSummaryPreference.setPersistent(false);
-            mSummaryPreference.setLayoutResource(R.layout.text_description_preference);
-            preferenceScreen.addPreference(mSummaryPreference);
-        }
-
-        @Override
-        public void onViewCreated(View view, Bundle savedInstanceState) {
-            super.onViewCreated(view, savedInstanceState);
-            installActionBarToggleSwitch();
-            processArguments();
-            getListView().setDivider(null);
-            getListView().setEnabled(false);
-        }
-
-        @Override
-        public void onDestroyView() {
-            getActivity().getActionBar().setCustomView(null);
-            if (mOldActivityTitle != null) {
-                getActivity().getActionBar().setTitle(mOldActivityTitle);
-            }
-            mToggleSwitch.setOnBeforeCheckedChangeListener(null);
-            super.onDestroyView();
-        }
-
-        public void onPreferenceToggled(String preferenceKey, boolean enabled) {
-             // Parse the enabled services.
-            Set<ComponentName> enabledServices = getEnabledServicesFromSettings(getActivity());
-
-            // Determine enabled services and accessibility state.
-            ComponentName toggledService = ComponentName.unflattenFromString(preferenceKey);
-            final boolean accessibilityEnabled;
-            if (enabled) {
-                // Enabling at least one service enables accessibility.
-                accessibilityEnabled = true;
-                enabledServices.add(toggledService);
-            } else {
-                // 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 = enabledAndInstalledServiceCount > 1
-                    || (enabledAndInstalledServiceCount == 1
-                            && !installedServices.contains(toggledService));
-                enabledServices.remove(toggledService);
-            }
-
-            // Update the enabled services setting.
-            StringBuilder enabledServicesBuilder = new StringBuilder();
-            // Keep the enabled services even if they are not installed since we have
-            // no way to know whether the application restore process has completed.
-            // In general the system should be responsible for the clean up not settings.
-            for (ComponentName enabledService : enabledServices) {
-                enabledServicesBuilder.append(enabledService.flattenToString());
-                enabledServicesBuilder.append(ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR);
-            }
-            final int enabledServicesBuilderLength = enabledServicesBuilder.length();
-            if (enabledServicesBuilderLength > 0) {
-                enabledServicesBuilder.deleteCharAt(enabledServicesBuilderLength - 1);
-            }
-            Settings.Secure.putString(getContentResolver(),
-                    Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
-                    enabledServicesBuilder.toString());
-
-            // Update accessibility enabled.
-            Settings.Secure.putInt(getContentResolver(),
-                    Settings.Secure.ACCESSIBILITY_ENABLED, accessibilityEnabled ? 1 : 0);
-        }
-
-        @Override
-        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-            super.onCreateOptionsMenu(menu, inflater);
-            MenuItem menuItem = menu.add(mSettingsTitle);
-            menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            menuItem.setIntent(mSettingsIntent);
-        }
-
-        @Override
-        public Dialog onCreateDialog(int dialogId) {
-            CharSequence title = null;
-            CharSequence message = null;
-            switch (dialogId) {
-                case DIALOG_ID_ENABLE_WARNING:
-                    mShownDialogId = DIALOG_ID_ENABLE_WARNING;
-                    title = mEnableWarningTitle;
-                    message = mEnableWarningMessage;
-                    break;
-                case DIALOG_ID_DISABLE_WARNING:
-                    mShownDialogId = DIALOG_ID_DISABLE_WARNING;
-                    title = mDisableWarningTitle;
-                    message = mDisableWarningMessage;
-                    break;
-                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();
-        }
-
-        @Override
-        public void onClick(DialogInterface dialog, int which) {
-            final boolean checked;
-            switch (which) {
-                case DialogInterface.BUTTON_POSITIVE:
-                    checked = (mShownDialogId == DIALOG_ID_ENABLE_WARNING);
-                    mToggleSwitch.setCheckedInternal(checked);
-                    getArguments().putBoolean(EXTRA_CHECKED, checked);
-                    onPreferenceToggled(mPreferenceKey, checked);
-                    break;
-                case DialogInterface.BUTTON_NEGATIVE:
-                    checked = (mShownDialogId == DIALOG_ID_DISABLE_WARNING);
-                    mToggleSwitch.setCheckedInternal(checked);
-                    getArguments().putBoolean(EXTRA_CHECKED, checked);
-                    onPreferenceToggled(mPreferenceKey, checked);
-                    break;
-                default:
-                    throw new IllegalArgumentException();
-            }
-        }
-
-        private void installActionBarToggleSwitch() {
-            mToggleSwitch = createAndAddActionBarToggleSwitch(getActivity());
-            mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
-                @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);
-                    } else {
-                        if (!TextUtils.isEmpty(mDisableWarningMessage)) {
-                            toggleSwitch.setCheckedInternal(true);
-                            getArguments().putBoolean(EXTRA_CHECKED, true);
-                            showDialog(DIALOG_ID_DISABLE_WARNING);
-                            return true;
-                        }
-                        onPreferenceToggled(mPreferenceKey, false);
-                    }
-                    return false;
-                }
-            });
-        }
-
-        private void processArguments() {
-            Bundle arguments = getArguments();
-
-            // Key.
-            mPreferenceKey = arguments.getString(EXTRA_PREFERENCE_KEY);
-
-            // Enabled.
-            final boolean enabled = arguments.getBoolean(EXTRA_CHECKED);
-            mToggleSwitch.setCheckedInternal(enabled);
-
-            // Title.
-            PreferenceActivity activity = (PreferenceActivity) getActivity();
-            if (!activity.onIsMultiPane() || activity.onIsHidingHeaders()) {
-                mOldActivityTitle = getActivity().getTitle();
-                String title = arguments.getString(EXTRA_TITLE);
-                getActivity().getActionBar().setTitle(title);
-            }
-
-            // Summary.
-            String summary = arguments.getString(EXTRA_SUMMARY);
-            mSummaryPreference.setSummary(summary);
-
-            // Settings title and intent.
-            String settingsTitle = arguments.getString(EXTRA_SETTINGS_TITLE);
-            String settingsComponentName = arguments.getString(EXTRA_SETTINGS_COMPONENT_NAME);
-            if (!TextUtils.isEmpty(settingsTitle) && !TextUtils.isEmpty(settingsComponentName)) {
-                Intent settingsIntent = new Intent(Intent.ACTION_MAIN).setComponent(
-                        ComponentName.unflattenFromString(settingsComponentName.toString()));
-                if (!getPackageManager().queryIntentActivities(settingsIntent, 0).isEmpty()) {
-                    mSettingsTitle = settingsTitle;
-                    mSettingsIntent = settingsIntent;
-                    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);
-        }
-    }
-}
diff --git a/src/com/android/settings/ActivityPicker.java b/src/com/android/settings/ActivityPicker.java
index ac79cea..edbccc3 100644
--- a/src/com/android/settings/ActivityPicker.java
+++ b/src/com/android/settings/ActivityPicker.java
@@ -201,7 +201,7 @@
         /**
          * Item that appears in a {@link PickAdapter} list.
          */
-        public static class Item {
+        public static class Item implements AppWidgetLoader.LabelledItem {
             protected static IconResizer sResizer;
             
             protected IconResizer getResizer(Context context) {
@@ -262,6 +262,10 @@
                 }
                 return intent;
             }
+
+            public CharSequence getLabel() {
+                return label;
+            }
         }
         
         private final LayoutInflater mInflater;
@@ -471,5 +475,5 @@
         public int getOpacity() {
             return PixelFormat.TRANSLUCENT;
         }
-    }    
+    }
 }
diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java
index 94ba5a1..d1c591e 100644
--- a/src/com/android/settings/AirplaneModeEnabler.java
+++ b/src/com/android/settings/AirplaneModeEnabler.java
@@ -22,6 +22,7 @@
 import android.os.Handler;
 import android.os.Message;
 import android.os.SystemProperties;
+import android.os.UserHandle;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.provider.Settings;
@@ -75,7 +76,7 @@
         mPhoneStateReceiver.registerIntent();
         mCheckBoxPref.setOnPreferenceChangeListener(this);
         mContext.getContentResolver().registerContentObserver(
-                Settings.System.getUriFor(Settings.System.AIRPLANE_MODE_ON), true,
+                Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON), true,
                 mAirplaneModeObserver);
     }
     
@@ -86,13 +87,13 @@
     }
 
     public static boolean isAirplaneModeOn(Context context) {
-        return Settings.System.getInt(context.getContentResolver(),
-                Settings.System.AIRPLANE_MODE_ON, 0) != 0;
+        return Settings.Global.getInt(context.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
     }
 
     private void setAirplaneModeOn(boolean enabling) {
         // Change the system setting
-        Settings.System.putInt(mContext.getContentResolver(), Settings.System.AIRPLANE_MODE_ON, 
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 
                                 enabling ? 1 : 0);
         // Update the UI to reflect system setting
         mCheckBoxPref.setChecked(enabling);
@@ -100,7 +101,7 @@
         // Post the intent
         Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
         intent.putExtra("state", enabling);
-        mContext.sendBroadcast(intent);
+        mContext.sendBroadcastAsUser(intent, UserHandle.ALL);
     }
 
     /**
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index 79b6d15..2da2d76 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -57,6 +57,7 @@
     private final static String KEY_ROAMING_PROTOCOL = "apn_roaming_protocol";
     private final static String KEY_CARRIER_ENABLED = "carrier_enabled";
     private final static String KEY_BEARER = "bearer";
+    private final static String KEY_MVNO_TYPE = "mvno_type";
 
     private static final int MENU_DELETE = Menu.FIRST;
     private static final int MENU_SAVE = Menu.FIRST + 1;
@@ -82,6 +83,8 @@
     private ListPreference mRoamingProtocol;
     private CheckBoxPreference mCarrierEnabled;
     private ListPreference mBearer;
+    private ListPreference mMvnoType;
+    private EditTextPreference mMvnoMatchData;
 
     private String mCurMnc;
     private String mCurMcc;
@@ -91,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.
@@ -115,7 +119,9 @@
             Telephony.Carriers.PROTOCOL, // 16
             Telephony.Carriers.CARRIER_ENABLED, // 17
             Telephony.Carriers.BEARER, // 18
-            Telephony.Carriers.ROAMING_PROTOCOL // 19
+            Telephony.Carriers.ROAMING_PROTOCOL, // 19
+            Telephony.Carriers.MVNO_TYPE,   // 20
+            Telephony.Carriers.MVNO_MATCH_DATA  // 21
     };
 
     private static final int ID_INDEX = 0;
@@ -137,6 +143,8 @@
     private static final int CARRIER_ENABLED_INDEX = 17;
     private static final int BEARER_INDEX = 18;
     private static final int ROAMING_PROTOCOL_INDEX = 19;
+    private static final int MVNO_TYPE_INDEX = 20;
+    private static final int MVNO_MATCH_DATA_INDEX = 21;
 
 
     @Override
@@ -174,6 +182,10 @@
         mBearer = (ListPreference) findPreference(KEY_BEARER);
         mBearer.setOnPreferenceChangeListener(this);
 
+        mMvnoType = (ListPreference) findPreference(KEY_MVNO_TYPE);
+        mMvnoType.setOnPreferenceChangeListener(this);
+        mMvnoMatchData = (EditTextPreference) findPreference("mvno_match_data");
+
         mRes = getResources();
 
         final Intent intent = getIntent();
@@ -213,6 +225,8 @@
         mCursor = managedQuery(mUri, sProjection, null, null);
         mCursor.moveToFirst();
 
+        mTelephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
+
         fillUi();
     }
 
@@ -274,6 +288,9 @@
             mRoamingProtocol.setValue(mCursor.getString(ROAMING_PROTOCOL_INDEX));
             mCarrierEnabled.setChecked(mCursor.getInt(CARRIER_ENABLED_INDEX)==1);
             mBearer.setValue(mCursor.getString(BEARER_INDEX));
+            mMvnoType.setValue(mCursor.getString(MVNO_TYPE_INDEX));
+            mMvnoMatchData.setEnabled(false);
+            mMvnoMatchData.setText(mCursor.getString(MVNO_MATCH_DATA_INDEX));
         }
 
         mName.setSummary(checkNull(mName.getText()));
@@ -307,6 +324,9 @@
                 checkNull(protocolDescription(mRoamingProtocol.getValue(), mRoamingProtocol)));
         mBearer.setSummary(
                 checkNull(bearerDescription(mBearer.getValue())));
+        mMvnoType.setSummary(
+                checkNull(mvnoDescription(mMvnoType.getValue())));
+        mMvnoMatchData.setSummary(checkNull(mMvnoMatchData.getText()));
     }
 
     /**
@@ -342,6 +362,39 @@
         }
     }
 
+    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);
+            } 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];
+            } catch (ArrayIndexOutOfBoundsException e) {
+                return null;
+            }
+        }
+    }
+
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         String key = preference.getKey();
         if (KEY_AUTH_TYPE.equals(key)) {
@@ -375,6 +428,13 @@
             }
             mBearer.setValue((String) newValue);
             mBearer.setSummary(bearer);
+        } else if (KEY_MVNO_TYPE.equals(key)) {
+            String mvno = mvnoDescription((String) newValue);
+            if (mvno == null) {
+                return false;
+            }
+            mMvnoType.setValue((String) newValue);
+            mMvnoType.setSummary(mvno);
         }
 
         return true;
@@ -508,6 +568,9 @@
             values.put(Telephony.Carriers.BEARER, Integer.parseInt(bearerVal));
         }
 
+        values.put(Telephony.Carriers.MVNO_TYPE, checkNotSet(mMvnoType.getValue()));
+        values.put(Telephony.Carriers.MVNO_MATCH_DATA, checkNotSet(mMvnoMatchData.getText()));
+
         getContentResolver().update(mUri, values, null, null);
 
         return true;
diff --git a/src/com/android/settings/ApnPreference.java b/src/com/android/settings/ApnPreference.java
index 710eda2..addb695 100644
--- a/src/com/android/settings/ApnPreference.java
+++ b/src/com/android/settings/ApnPreference.java
@@ -35,31 +35,16 @@
         CompoundButton.OnCheckedChangeListener, OnClickListener {
     final static String TAG = "ApnPreference";
 
-    /**
-     * @param context
-     * @param attrs
-     * @param defStyle
-     */
     public ApnPreference(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
-        init();
     }
 
-    /**
-     * @param context
-     * @param attrs
-     */
     public ApnPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
+        this(context, attrs, R.attr.apnPreferenceStyle);
     }
 
-    /**
-     * @param context
-     */
     public ApnPreference(Context context) {
-        super(context);
-        init();
+        this(context, null);
     }
 
     private static String mSelectedKey = null;
@@ -99,10 +84,6 @@
         return view;
     }
 
-    private void init() {
-        setLayoutResource(R.layout.apn_preference_layout);
-    }
-
     public boolean isChecked() {
         return getKey().equals(mSelectedKey);
     }
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 56ee7a9..3fbb5e3 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -164,43 +164,45 @@
                 "_id", "name", "apn", "type"}, where, null,
                 Telephony.Carriers.DEFAULT_SORT_ORDER);
 
-        PreferenceGroup apnList = (PreferenceGroup) findPreference("apn_list");
-        apnList.removeAll();
+        if (cursor != null) {
+            PreferenceGroup apnList = (PreferenceGroup) findPreference("apn_list");
+            apnList.removeAll();
 
-        ArrayList<Preference> mmsApnList = new ArrayList<Preference>();
+            ArrayList<Preference> mmsApnList = new ArrayList<Preference>();
 
-        mSelectedKey = getSelectedApnKey();
-        cursor.moveToFirst();
-        while (!cursor.isAfterLast()) {
-            String name = cursor.getString(NAME_INDEX);
-            String apn = cursor.getString(APN_INDEX);
-            String key = cursor.getString(ID_INDEX);
-            String type = cursor.getString(TYPES_INDEX);
+            mSelectedKey = getSelectedApnKey();
+            cursor.moveToFirst();
+            while (!cursor.isAfterLast()) {
+                String name = cursor.getString(NAME_INDEX);
+                String apn = cursor.getString(APN_INDEX);
+                String key = cursor.getString(ID_INDEX);
+                String type = cursor.getString(TYPES_INDEX);
 
-            ApnPreference pref = new ApnPreference(this);
+                ApnPreference pref = new ApnPreference(this);
 
-            pref.setKey(key);
-            pref.setTitle(name);
-            pref.setSummary(apn);
-            pref.setPersistent(false);
-            pref.setOnPreferenceChangeListener(this);
+                pref.setKey(key);
+                pref.setTitle(name);
+                pref.setSummary(apn);
+                pref.setPersistent(false);
+                pref.setOnPreferenceChangeListener(this);
 
-            boolean selectable = ((type == null) || !type.equals("mms"));
-            pref.setSelectable(selectable);
-            if (selectable) {
-                if ((mSelectedKey != null) && mSelectedKey.equals(key)) {
-                    pref.setChecked();
+                boolean selectable = ((type == null) || !type.equals("mms"));
+                pref.setSelectable(selectable);
+                if (selectable) {
+                    if ((mSelectedKey != null) && mSelectedKey.equals(key)) {
+                        pref.setChecked();
+                    }
+                    apnList.addPreference(pref);
+                } else {
+                    mmsApnList.add(pref);
                 }
-                apnList.addPreference(pref);
-            } else {
-                mmsApnList.add(pref);
+                cursor.moveToNext();
             }
-            cursor.moveToNext();
-        }
-        cursor.close();
+            cursor.close();
 
-        for (Preference preference : mmsApnList) {
-            apnList.addPreference(preference);
+            for (Preference preference : mmsApnList) {
+                apnList.addPreference(preference);
+            }
         }
     }
 
@@ -209,7 +211,8 @@
         super.onCreateOptionsMenu(menu);
         menu.add(0, MENU_NEW, 0,
                 getResources().getString(R.string.menu_new))
-                .setIcon(android.R.drawable.ic_menu_add);
+                .setIcon(android.R.drawable.ic_menu_add)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         menu.add(0, MENU_RESTORE, 0,
                 getResources().getString(R.string.menu_restore))
                 .setIcon(android.R.drawable.ic_menu_upload);
@@ -329,7 +332,7 @@
             switch (msg.what) {
                 case EVENT_RESTORE_DEFAULTAPN_START:
                     ContentResolver resolver = getContentResolver();
-                    resolver.delete(DEFAULTAPN_URI, null, null);                    
+                    resolver.delete(DEFAULTAPN_URI, null, null);
                     mRestoreApnUiHandler
                         .sendEmptyMessage(EVENT_RESTORE_DEFAULTAPN_COMPLETE);
                     break;
diff --git a/src/com/android/settings/AppWidgetLoader.java b/src/com/android/settings/AppWidgetLoader.java
new file mode 100644
index 0000000..985ef8b
--- /dev/null
+++ b/src/com/android/settings/AppWidgetLoader.java
@@ -0,0 +1,183 @@
+/*
+ * 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.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProviderInfo;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.util.Log;
+
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+public class AppWidgetLoader<Item extends AppWidgetLoader.LabelledItem> {
+    private static final String TAG = "AppWidgetAdapter";
+    private static final boolean LOGD = AppWidgetPickActivity.LOGD;
+
+    private Context mContext;
+    private AppWidgetManager mAppWidgetManager;
+    ItemConstructor<Item> mItemConstructor;
+
+    interface LabelledItem {
+        CharSequence getLabel();
+    }
+
+    public AppWidgetLoader(Context context, AppWidgetManager appWidgetManager,
+            ItemConstructor<Item> itemConstructor) {
+        mContext = context;
+        mAppWidgetManager = appWidgetManager;
+        mItemConstructor = itemConstructor;
+    }
+
+    /**
+     * Create list entries for any custom widgets requested through
+     * {@link AppWidgetManager#EXTRA_CUSTOM_INFO}.
+     */
+    void putCustomAppWidgets(List<Item> items, Intent intent) {
+        // get and validate the extras they gave us
+        ArrayList<AppWidgetProviderInfo> customInfo = null;
+        ArrayList<Bundle> customExtras = null;
+        try_custom_items: {
+            customInfo = intent.getParcelableArrayListExtra(AppWidgetManager.EXTRA_CUSTOM_INFO);
+            if (customInfo == null || customInfo.size() == 0) {
+                Log.i(TAG, "EXTRA_CUSTOM_INFO not present.");
+                break try_custom_items;
+            }
+
+            int customInfoSize = customInfo.size();
+            for (int i=0; i<customInfoSize; i++) {
+                Parcelable p = customInfo.get(i);
+                if (p == null || !(p instanceof AppWidgetProviderInfo)) {
+                    customInfo = null;
+                    Log.e(TAG, "error using EXTRA_CUSTOM_INFO index=" + i);
+                    break try_custom_items;
+                }
+            }
+
+            customExtras = intent.getParcelableArrayListExtra(AppWidgetManager.EXTRA_CUSTOM_EXTRAS);
+            if (customExtras == null) {
+                customInfo = null;
+                Log.e(TAG, "EXTRA_CUSTOM_INFO without EXTRA_CUSTOM_EXTRAS");
+                break try_custom_items;
+            }
+
+            int customExtrasSize = customExtras.size();
+            if (customInfoSize != customExtrasSize) {
+                customInfo = null;
+                customExtras = null;
+                Log.e(TAG, "list size mismatch: EXTRA_CUSTOM_INFO: " + customInfoSize
+                        + " EXTRA_CUSTOM_EXTRAS: " + customExtrasSize);
+                break try_custom_items;
+            }
+
+
+            for (int i=0; i<customExtrasSize; i++) {
+                Parcelable p = customExtras.get(i);
+                if (p == null || !(p instanceof Bundle)) {
+                    customInfo = null;
+                    customExtras = null;
+                    Log.e(TAG, "error using EXTRA_CUSTOM_EXTRAS index=" + i);
+                    break try_custom_items;
+                }
+            }
+        }
+
+        if (LOGD) Log.d(TAG, "Using " + customInfo.size() + " custom items");
+        putAppWidgetItems(customInfo, customExtras, items, 0, true);
+    }
+
+
+    /**
+     * Create list entries for the given {@link AppWidgetProviderInfo} widgets,
+     * inserting extras if provided.
+     */
+    void putAppWidgetItems(List<AppWidgetProviderInfo> appWidgets,
+            List<Bundle> customExtras, List<Item> items, int categoryFilter,
+            boolean ignoreFilter) {
+        if (appWidgets == null) return;
+        final int size = appWidgets.size();
+        for (int i = 0; i < size; i++) {
+            AppWidgetProviderInfo info = appWidgets.get(i);
+
+            // We remove any widgets whose category isn't included in the filter
+            if (!ignoreFilter && (info.widgetCategory & categoryFilter) == 0) {
+                continue;
+            }
+
+            Item item = mItemConstructor.createItem(mContext, info,
+                    customExtras != null ? customExtras.get(i) : null);
+
+            items.add(item);
+        }
+    }
+
+    public interface ItemConstructor<Item> {
+        Item createItem(Context context, AppWidgetProviderInfo info, Bundle extras);
+    }
+
+
+    /**
+     * Build and return list of items to be shown in dialog. This will mix both
+     * installed {@link AppWidgetProviderInfo} and those provided through
+     * {@link AppWidgetManager#EXTRA_CUSTOM_INFO}, sorting them alphabetically.
+     */
+    protected List<Item> getItems(Intent intent) {
+        boolean sortCustomAppWidgets =
+                intent.getBooleanExtra(AppWidgetManager.EXTRA_CUSTOM_SORT, true);
+
+        List<Item> items = new ArrayList<Item>();
+
+        // Default category is home screen
+        int categoryFilter = intent.getIntExtra(AppWidgetManager.EXTRA_CATEGORY_FILTER,
+                AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN);
+
+        putInstalledAppWidgets(items, categoryFilter);
+
+        // Sort all items together by label
+        if (sortCustomAppWidgets) {
+            putCustomAppWidgets(items, intent);
+        }
+        Collections.sort(items, new Comparator<Item>() {
+            Collator mCollator = Collator.getInstance();
+
+            public int compare(Item lhs, Item rhs) {
+                return mCollator.compare(lhs.getLabel(), rhs.getLabel());
+            }
+        });
+        if (!sortCustomAppWidgets) {
+            List<Item> customItems = new ArrayList<Item>();
+            putCustomAppWidgets(customItems, intent);
+            items.addAll(customItems);
+        }
+        return items;
+    }
+
+    /**
+     * Create list entries for installed {@link AppWidgetProviderInfo} widgets.
+     */
+    void putInstalledAppWidgets(List<Item> items, int categoryFilter) {
+        List<AppWidgetProviderInfo> installed =
+                mAppWidgetManager.getInstalledProviders(categoryFilter);
+        putAppWidgetItems(installed, null, items, categoryFilter, false);
+    }
+}
diff --git a/src/com/android/settings/AppWidgetPickActivity.java b/src/com/android/settings/AppWidgetPickActivity.java
index 176ac80..2bd62c0 100644
--- a/src/com/android/settings/AppWidgetPickActivity.java
+++ b/src/com/android/settings/AppWidgetPickActivity.java
@@ -18,19 +18,20 @@
 
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProviderInfo;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.os.Parcelable;
+import android.util.DisplayMetrics;
 import android.util.Log;
 
-import java.text.Collator;
+import com.android.settings.ActivityPicker.PickAdapter;
+
 import java.util.List;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 
 /**
  * Displays a list of {@link AppWidgetProviderInfo} widgets, along with any
@@ -42,23 +43,28 @@
  * will bind it to the given {@link AppWidgetManager#EXTRA_APPWIDGET_ID},
  * otherwise it will return the requested extras.
  */
-public class AppWidgetPickActivity extends ActivityPicker {
+public class AppWidgetPickActivity extends ActivityPicker
+    implements AppWidgetLoader.ItemConstructor<PickAdapter.Item>{
     private static final String TAG = "AppWidgetPickActivity";
-    private static final boolean LOGD = false;
+    static final boolean LOGD = false;
 
-    private PackageManager mPackageManager;
-    private AppWidgetManager mAppWidgetManager;
+    List<PickAdapter.Item> mItems;
     
     /**
      * The allocated {@link AppWidgetManager#EXTRA_APPWIDGET_ID} that this
      * activity is binding.
      */
     private int mAppWidgetId;
-    
+    private AppWidgetLoader<PickAdapter.Item> mAppWidgetLoader;
+    private AppWidgetManager mAppWidgetManager;
+    private PackageManager mPackageManager;
+
     @Override
     public void onCreate(Bundle icicle) {
         mPackageManager = getPackageManager();
         mAppWidgetManager = AppWidgetManager.getInstance(this);
+        mAppWidgetLoader = new AppWidgetLoader<PickAdapter.Item>
+            (this, mAppWidgetManager, this);
         
         super.onCreate(icicle);
         
@@ -74,79 +80,85 @@
             finish();
         }
     }
-    
+
     /**
-     * Create list entries for any custom widgets requested through
-     * {@link AppWidgetManager#EXTRA_CUSTOM_INFO}.
+     * Build and return list of items to be shown in dialog. This will mix both
+     * installed {@link AppWidgetProviderInfo} and those provided through
+     * {@link AppWidgetManager#EXTRA_CUSTOM_INFO}, sorting them alphabetically.
      */
-    void putCustomAppWidgets(List<PickAdapter.Item> items) {
-        final Bundle extras = getIntent().getExtras();
-        
-        // get and validate the extras they gave us
-        ArrayList<AppWidgetProviderInfo> customInfo = null;
-        ArrayList<Bundle> customExtras = null;
-        try_custom_items: {
-            customInfo = extras.getParcelableArrayList(AppWidgetManager.EXTRA_CUSTOM_INFO);
-            if (customInfo == null || customInfo.size() == 0) {
-                Log.i(TAG, "EXTRA_CUSTOM_INFO not present.");
-                break try_custom_items;
-            }
+    @Override
+    protected List<PickAdapter.Item> getItems() {
+        mItems = mAppWidgetLoader.getItems(getIntent());
+        return mItems;
+    }
 
-            int customInfoSize = customInfo.size();
-            for (int i=0; i<customInfoSize; i++) {
-                Parcelable p = customInfo.get(i);
-                if (p == null || !(p instanceof AppWidgetProviderInfo)) {
-                    customInfo = null;
-                    Log.e(TAG, "error using EXTRA_CUSTOM_INFO index=" + i);
-                    break try_custom_items;
+    @Override
+    public PickAdapter.Item createItem(Context context, AppWidgetProviderInfo info, Bundle extras) {
+        CharSequence label = info.label;
+        Drawable icon = null;
+
+        if (info.icon != 0) {
+            try {
+                final Resources res = context.getResources();
+                final int density = res.getDisplayMetrics().densityDpi;
+                int iconDensity;
+                switch (density) {
+                    case DisplayMetrics.DENSITY_MEDIUM:
+                        iconDensity = DisplayMetrics.DENSITY_LOW;
+                    case DisplayMetrics.DENSITY_TV:
+                        iconDensity = DisplayMetrics.DENSITY_MEDIUM;
+                    case DisplayMetrics.DENSITY_HIGH:
+                        iconDensity = DisplayMetrics.DENSITY_MEDIUM;
+                    case DisplayMetrics.DENSITY_XHIGH:
+                        iconDensity = DisplayMetrics.DENSITY_HIGH;
+                    case DisplayMetrics.DENSITY_XXHIGH:
+                        iconDensity = DisplayMetrics.DENSITY_XHIGH;
+                    default:
+                        // The density is some abnormal value.  Return some other
+                        // abnormal value that is a reasonable scaling of it.
+                        iconDensity = (int)((density*0.75f)+.5f);
                 }
+                Resources packageResources = mPackageManager.
+                        getResourcesForApplication(info.provider.getPackageName());
+                icon = packageResources.getDrawableForDensity(info.icon, iconDensity);
+            } catch (NameNotFoundException e) {
+                Log.w(TAG, "Can't load icon drawable 0x" + Integer.toHexString(info.icon)
+                        + " for provider: " + info.provider);
             }
-
-            customExtras = extras.getParcelableArrayList(AppWidgetManager.EXTRA_CUSTOM_EXTRAS);
-            if (customExtras == null) {
-                customInfo = null;
-                Log.e(TAG, "EXTRA_CUSTOM_INFO without EXTRA_CUSTOM_EXTRAS");
-                break try_custom_items;
-            }
-
-            int customExtrasSize = customExtras.size();
-            if (customInfoSize != customExtrasSize) {
-                Log.e(TAG, "list size mismatch: EXTRA_CUSTOM_INFO: " + customInfoSize
-                        + " EXTRA_CUSTOM_EXTRAS: " + customExtrasSize);
-                break try_custom_items;
-            }
-
-
-            for (int i=0; i<customExtrasSize; i++) {
-                Parcelable p = customExtras.get(i);
-                if (p == null || !(p instanceof Bundle)) {
-                    customInfo = null;
-                    customExtras = null;
-                    Log.e(TAG, "error using EXTRA_CUSTOM_EXTRAS index=" + i);
-                    break try_custom_items;
-                }
+            if (icon == null) {
+                Log.w(TAG, "Can't load icon drawable 0x" + Integer.toHexString(info.icon)
+                        + " for provider: " + info.provider);
             }
         }
 
-        if (LOGD) Log.d(TAG, "Using " + customInfo.size() + " custom items");
-        putAppWidgetItems(customInfo, customExtras, items);
+        PickAdapter.Item item = new PickAdapter.Item(context, label, icon);
+        item.packageName = info.provider.getPackageName();
+        item.className = info.provider.getClassName();
+        item.extras = extras;
+        return item;
     }
-    
+
     /**
      * {@inheritDoc}
      */
     @Override
     public void onClick(DialogInterface dialog, int which) {
         Intent intent = getIntentForPosition(which);
-        
+        PickAdapter.Item item = mItems.get(which);
+
         int result;
-        if (intent.getExtras() != null) {
-            // If there are any extras, it's because this entry is custom.
+        if (item.extras != null) {
+            // If these extras are present it's because this entry is custom.
             // Don't try to bind it, just pass it back to the app.
             setResultData(RESULT_OK, intent);
         } else {
             try {
-                mAppWidgetManager.bindAppWidgetId(mAppWidgetId, intent.getComponent());
+                Bundle options = null;
+                if (intent.getExtras() != null) {
+                    options = intent.getExtras().getBundle(
+                            AppWidgetManager.EXTRA_APPWIDGET_OPTIONS);
+                }
+                mAppWidgetManager.bindAppWidgetId(mAppWidgetId, intent.getComponent(), options);
                 result = RESULT_OK;
             } catch (IllegalArgumentException e) {
                 // This is thrown if they're already bound, or otherwise somehow
@@ -158,74 +170,10 @@
             }
             setResultData(result, null);
         }
+
         finish();
     }
 
-    /**
-     * Create list entries for the given {@link AppWidgetProviderInfo} widgets,
-     * inserting extras if provided.
-     */
-    void putAppWidgetItems(List<AppWidgetProviderInfo> appWidgets,
-            List<Bundle> customExtras, List<PickAdapter.Item> items) {
-        if (appWidgets == null) return;
-        final int size = appWidgets.size();
-        for (int i = 0; i < size; i++) {
-            AppWidgetProviderInfo info = appWidgets.get(i);
-            
-            CharSequence label = info.label;
-            Drawable icon = null;
-
-            if (info.icon != 0) {
-                icon = mPackageManager.getDrawable(info.provider.getPackageName(), info.icon, null);
-                if (icon == null) {
-                    Log.w(TAG, "Can't load icon drawable 0x" + Integer.toHexString(info.icon)
-                            + " for provider: " + info.provider);
-                }
-            }
-            
-            PickAdapter.Item item = new PickAdapter.Item(this, label, icon);
-            
-            item.packageName = info.provider.getPackageName();
-            item.className = info.provider.getClassName();
-            
-            if (customExtras != null) {
-                item.extras = customExtras.get(i);
-            }
-            
-            items.add(item);
-        }
-    }
-    
-    /**
-     * Build and return list of items to be shown in dialog. This will mix both
-     * installed {@link AppWidgetProviderInfo} and those provided through
-     * {@link AppWidgetManager#EXTRA_CUSTOM_INFO}, sorting them alphabetically.
-     */
-    @Override
-    protected List<PickAdapter.Item> getItems() {
-        List<PickAdapter.Item> items = new ArrayList<PickAdapter.Item>();
-        
-        putInstalledAppWidgets(items);
-        putCustomAppWidgets(items);
-        
-        // Sort all items together by label
-        Collections.sort(items, new Comparator<PickAdapter.Item>() {
-                Collator mCollator = Collator.getInstance();
-                public int compare(PickAdapter.Item lhs, PickAdapter.Item rhs) {
-                    return mCollator.compare(lhs.label, rhs.label);
-                }
-            });
-
-        return items;
-    }
-
-    /**
-     * Create list entries for installed {@link AppWidgetProviderInfo} widgets.
-     */
-    void putInstalledAppWidgets(List<PickAdapter.Item> items) {
-        List<AppWidgetProviderInfo> installed = mAppWidgetManager.getInstalledProviders();
-        putAppWidgetItems(installed, null, items);
-    }
 
     /**
      * Convenience method for setting the result code and intent. This method
diff --git a/src/com/android/settings/ApplicationSettings.java b/src/com/android/settings/ApplicationSettings.java
index 27fc3ec..6a17049 100644
--- a/src/com/android/settings/ApplicationSettings.java
+++ b/src/com/android/settings/ApplicationSettings.java
@@ -60,8 +60,8 @@
 
         mInstallLocation = (ListPreference) findPreference(KEY_APP_INSTALL_LOCATION);
         // Is app default install location set?
-        boolean userSetInstLocation = (Settings.System.getInt(getContentResolver(),
-                Settings.Secure.SET_INSTALL_LOCATION, 0) != 0);
+        boolean userSetInstLocation = (Settings.Global.getInt(getContentResolver(),
+                Settings.Global.SET_INSTALL_LOCATION, 0) != 0);
         if (!userSetInstLocation) {
             getPreferenceScreen().removePreference(mInstallLocation);
         } else {
@@ -78,18 +78,18 @@
 
     protected void handleUpdateAppInstallLocation(final String value) {
         if(APP_INSTALL_DEVICE_ID.equals(value)) {
-            Settings.System.putInt(getContentResolver(),
-                    Settings.Secure.DEFAULT_INSTALL_LOCATION, APP_INSTALL_DEVICE);
+            Settings.Global.putInt(getContentResolver(),
+                    Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_DEVICE);
         } else if (APP_INSTALL_SDCARD_ID.equals(value)) {
-            Settings.System.putInt(getContentResolver(),
-                    Settings.Secure.DEFAULT_INSTALL_LOCATION, APP_INSTALL_SDCARD);
+            Settings.Global.putInt(getContentResolver(),
+                    Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_SDCARD);
         } else if (APP_INSTALL_AUTO_ID.equals(value)) {
-            Settings.System.putInt(getContentResolver(),
-                    Settings.Secure.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO);
+            Settings.Global.putInt(getContentResolver(),
+                    Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO);
         } else {
             // Should not happen, default to prompt...
-            Settings.System.putInt(getContentResolver(),
-                    Settings.Secure.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO);
+            Settings.Global.putInt(getContentResolver(),
+                    Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO);
         }
         mInstallLocation.setValue(value);
     }
@@ -121,8 +121,8 @@
     }
 
     private String getAppInstallLocation() {
-        int selectedLocation = Settings.System.getInt(getContentResolver(),
-                Settings.Secure.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO);
+        int selectedLocation = Settings.Global.getInt(getContentResolver(),
+                Settings.Global.DEFAULT_INSTALL_LOCATION, APP_INSTALL_AUTO);
         if (selectedLocation == APP_INSTALL_DEVICE) {
             return APP_INSTALL_DEVICE_ID;
         } else if (selectedLocation == APP_INSTALL_SDCARD) {
diff --git a/src/com/android/settings/BatteryInfo.java b/src/com/android/settings/BatteryInfo.java
index d8046cf..d35771f 100644
--- a/src/com/android/settings/BatteryInfo.java
+++ b/src/com/android/settings/BatteryInfo.java
@@ -22,6 +22,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.BatteryManager;
+import android.os.BatteryStats;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IPowerManager;
@@ -63,11 +64,12 @@
 
     /**
      * Format a number of tenths-units as a decimal string without using a
-     * conversion to float.  E.g. 347 -> "34.7"
+     * conversion to float.  E.g. 347 -> "34.7", -99 -> "-9.9"
      */
     private final String tenthsToFixedString(int x) {
         int tens = x / 10;
-        return Integer.toString(tens) + "." + (x - 10 * tens);
+        // use Math.abs to avoid "-9.-9" about -99
+        return Integer.toString(tens) + "." + Math.abs(x - 10 * tens);
     }
 
    /**
@@ -102,6 +104,9 @@
                     case BatteryManager.BATTERY_PLUGGED_USB:
                         mPower.setText(getString(R.string.battery_info_power_usb));
                         break;
+                    case BatteryManager.BATTERY_PLUGGED_WIRELESS:
+                        mPower.setText(getString(R.string.battery_info_power_wireless));
+                        break;
                     case (BatteryManager.BATTERY_PLUGGED_AC|BatteryManager.BATTERY_PLUGGED_USB):
                         mPower.setText(getString(R.string.battery_info_power_ac_usb));
                         break;
@@ -159,7 +164,8 @@
         mUptime = (TextView) findViewById(R.id.uptime);
         
         // Get awake time plugged in and on battery
-        mBatteryStats = IBatteryStats.Stub.asInterface(ServiceManager.getService("batteryinfo"));
+        mBatteryStats = IBatteryStats.Stub.asInterface(ServiceManager.getService(
+                BatteryStats.SERVICE_NAME));
         mScreenStats = IPowerManager.Stub.asInterface(ServiceManager.getService(POWER_SERVICE));
         mHandler.sendEmptyMessageDelayed(EVENT_TICK, 1000);
         
diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java
index eff5c50..6d3b81b 100644
--- a/src/com/android/settings/BrightnessPreference.java
+++ b/src/com/android/settings/BrightnessPreference.java
@@ -16,323 +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.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 {
-
-    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;
-
-    // Backlight range is from 0 - 255. Need to make sure that user
-    // doesn't set the backlight to 0 and get stuck
-    private int mScreenBrightnessDim =
-	    getContext().getResources().getInteger(com.android.internal.R.integer.config_screenBrightnessDim);
-    private static final int MAXIMUM_BACKLIGHT = android.os.PowerManager.BRIGHTNESS_ON;
-
-    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);
-
-        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);
-        } else {
-            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);
-        setBrightness(mSeekBar.getProgress(), false);
-    }
-
-    private int getBrightness() {
-        int mode = getBrightnessMode(0);
-        float brightness = 0;
-        if (false && 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 - mScreenBrightnessDim)
-                    / (MAXIMUM_BACKLIGHT - mScreenBrightnessDim);
-        }
-        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);
-    }
-
-    @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 (false) {
-                float valf = (((float)brightness*2)/SEEK_BAR_RANGE) - 1.0f;
-                try {
-                    IPowerManager power = IPowerManager.Stub.asInterface(
-                            ServiceManager.getService("power"));
-                    if (power != null) {
-                        power.setAutoBrightnessAdjustment(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 = (MAXIMUM_BACKLIGHT - mScreenBrightnessDim);
-            brightness = (brightness*range)/SEEK_BAR_RANGE + mScreenBrightnessDim;
-            try {
-                IPowerManager power = IPowerManager.Stub.asInterface(
-                        ServiceManager.getService("power"));
-                if (power != null) {
-                    power.setBacklightBrightness(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/BugreportPreference.java b/src/com/android/settings/BugreportPreference.java
index e003d61..ba58ef4 100644
--- a/src/com/android/settings/BugreportPreference.java
+++ b/src/com/android/settings/BugreportPreference.java
@@ -33,8 +33,8 @@
     @Override
     protected void onPrepareDialogBuilder(Builder builder) {
         super.onPrepareDialogBuilder(builder);
-        builder.setPositiveButton(R.string.report, this);
-        builder.setMessage(R.string.bugreport_message);
+        builder.setPositiveButton(com.android.internal.R.string.report, this);
+        builder.setMessage(com.android.internal.R.string.bugreport_message);
     }
 
     @Override
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 0f9fcee..49de366 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -17,21 +17,30 @@
 package com.android.settings;
 
 import android.app.Activity;
+import android.app.Fragment;
 import android.app.PendingIntent;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.UserInfo;
 import android.os.Bundle;
+import android.os.Process;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.security.KeyStore;
+import android.util.EventLog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ListView;
 
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.ConfirmLockPattern.ConfirmLockPatternFragment;
+
+import java.util.List;
 
 import libcore.util.MutableBoolean;
 
@@ -45,6 +54,15 @@
         return modIntent;
     }
 
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (ChooseLockGenericFragment.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
+
+    public static class InternalActivity extends ChooseLockGeneric {
+    }
+
     public static class ChooseLockGenericFragment extends SettingsPreferenceFragment {
         private static final int MIN_PASSWORD_LENGTH = 4;
         private static final String KEY_UNLOCK_BACKUP_INFO = "unlock_backup_info";
@@ -59,6 +77,7 @@
         private static final String PASSWORD_CONFIRMED = "password_confirmed";
         private static final String CONFIRM_CREDENTIALS = "confirm_credentials";
         private static final String WAITING_FOR_CONFIRMATION = "waiting_for_confirmation";
+        private static final String FINISH_PENDING = "finish_pending";
         public static final String MINIMUM_QUALITY_KEY = "minimum_quality";
 
         private static final boolean ALWAY_SHOW_TUTORIAL = true;
@@ -68,6 +87,7 @@
         private KeyStore mKeyStore;
         private boolean mPasswordConfirmed = false;
         private boolean mWaitingForConfirmation = false;
+        private boolean mFinishPending = false;
 
         @Override
         public void onCreate(Bundle savedInstanceState) {
@@ -80,11 +100,14 @@
             // Defaults to needing to confirm credentials
             final boolean confirmCredentials = getActivity().getIntent()
                 .getBooleanExtra(CONFIRM_CREDENTIALS, true);
-            mPasswordConfirmed = !confirmCredentials;
+            if (getActivity() instanceof ChooseLockGeneric.InternalActivity) {
+                mPasswordConfirmed = !confirmCredentials;
+            }
 
             if (savedInstanceState != null) {
                 mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED);
                 mWaitingForConfirmation = savedInstanceState.getBoolean(WAITING_FOR_CONFIRMATION);
+                mFinishPending = savedInstanceState.getBoolean(FINISH_PENDING);
             }
 
             if (mPasswordConfirmed) {
@@ -101,13 +124,23 @@
             }
         }
 
-
+        @Override
+        public void onResume() {
+            super.onResume();
+            if (mFinishPending) {
+                mFinishPending = false;
+                finish();
+            }
+        }
 
         @Override
         public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
                 Preference preference) {
             final String key = preference.getKey();
             boolean handled = true;
+
+            EventLog.writeEvent(EventLogTags.LOCK_SCREEN_TYPE, key);
+
             if (KEY_UNLOCK_SET_OFF.equals(key)) {
                 updateUnlockMethodAndFinish(
                         DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, true);
@@ -170,6 +203,7 @@
             // Saved so we don't force user to re-enter their password if configuration changes
             outState.putBoolean(PASSWORD_CONFIRMED, mPasswordConfirmed);
             outState.putBoolean(WAITING_FOR_CONFIRMATION, mWaitingForConfirmation);
+            outState.putBoolean(FINISH_PENDING, mFinishPending);
         }
 
         private void updatePreferencesOrFinish() {
@@ -228,6 +262,8 @@
          * appropriately.)
          */
         private int upgradeQualityForEncryption(int quality) {
+            // Don't upgrade quality for secondary users. Encryption requirements don't apply.
+            if (!Process.myUserHandle().equals(UserHandle.OWNER)) return quality;
             int encryptionStatus = mDPM.getStorageEncryptionStatus();
             boolean encrypted = (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE)
                     || (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVATING);
@@ -259,6 +295,12 @@
                     .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
             final boolean weakBiometricAvailable =
                     mChooseLockSettingsHelper.utils().isBiometricWeakInstalled();
+
+            // if there are multiple users, disable "None" setting
+            UserManager mUm = (UserManager) getSystemService(Context.USER_SERVICE);
+            List<UserInfo> users = mUm.getUsers(true);
+            final boolean singleUser = users.size() == 1;
+
             for (int i = entries.getPreferenceCount() - 1; i >= 0; --i) {
                 Preference pref = entries.getPreference(i);
                 if (pref instanceof PreferenceScreen) {
@@ -267,6 +309,7 @@
                     boolean visible = true;
                     if (KEY_UNLOCK_SET_OFF.equals(key)) {
                         enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
+                        visible = singleUser; // don't show when there's more than 1 user
                     } else if (KEY_UNLOCK_SET_NONE.equals(key)) {
                         enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
                     } else if (KEY_UNLOCK_SET_BIOMETRIC_WEAK.equals(key)) {
@@ -303,7 +346,8 @@
         }
 
         private Intent getBiometricSensorIntent() {
-            Intent fallBackIntent = new Intent().setClass(getActivity(), ChooseLockGeneric.class);
+            Intent fallBackIntent = new Intent().setClass(getActivity(),
+                    ChooseLockGeneric.InternalActivity.class);
             fallBackIntent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, true);
             fallBackIntent.putExtra(CONFIRM_CREDENTIALS, false);
             fallBackIntent.putExtra(EXTRA_SHOW_FRAGMENT_TITLE,
@@ -352,39 +396,40 @@
                 intent.putExtra(CONFIRM_CREDENTIALS, false);
                 intent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK,
                         isFallback);
-                if(isFallback) {
+                if (isFallback) {
                     startActivityForResult(intent, FALLBACK_REQUEST);
                     return;
                 } else {
+                    mFinishPending = true;
                     intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
                     startActivity(intent);
                 }
             } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
-                boolean showTutorial = !mChooseLockSettingsHelper.utils().isPatternEverChosen();
-                Intent intent = new Intent();
-                intent.setClass(getActivity(), showTutorial
-                        ? ChooseLockPatternTutorial.class
-                        : ChooseLockPattern.class);
+                Intent intent = new Intent(getActivity(), ChooseLockPattern.class);
                 intent.putExtra("key_lock_method", "pattern");
                 intent.putExtra(CONFIRM_CREDENTIALS, false);
                 intent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK,
                         isFallback);
-                if(isFallback) {
+                if (isFallback) {
                     startActivityForResult(intent, FALLBACK_REQUEST);
                     return;
                 } else {
+                    mFinishPending = true;
                     intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
                     startActivity(intent);
                 }
             } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK) {
                 Intent intent = getBiometricSensorIntent();
+                mFinishPending = true;
                 startActivity(intent);
             } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
                 mChooseLockSettingsHelper.utils().clearLock(false);
                 mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled);
                 getActivity().setResult(Activity.RESULT_OK);
+                finish();
+            } else {
+                finish();
             }
-            finish();
         }
 
         @Override
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 2940442..f43738f 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -19,6 +19,7 @@
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.PasswordEntryKeyboardHelper;
 import com.android.internal.widget.PasswordEntryKeyboardView;
+import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
 
 import android.app.Activity;
 import android.app.Fragment;
@@ -40,6 +41,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.View.OnClickListener;
+import android.view.accessibility.AccessibilityEvent;
 import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.TextView;
@@ -64,6 +66,12 @@
     }
 
     @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (ChooseLockPasswordFragment.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         // TODO: Fix on phones
         // Disable IME on our window since we provide our own keyboard
@@ -153,6 +161,9 @@
             super.onCreate(savedInstanceState);
             mLockPatternUtils = new LockPatternUtils(getActivity());
             Intent intent = getActivity().getIntent();
+            if (!(getActivity() instanceof ChooseLockPassword)) {
+                throw new SecurityException("Fragment contained in wrong activity");
+            }
             mRequestedQuality = Math.max(intent.getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY,
                     mRequestedQuality), mLockPatternUtils.getRequestedPasswordQuality());
             mPasswordMinLength = Math.max(
@@ -272,8 +283,15 @@
         }
 
         protected void updateStage(Stage stage) {
+            final Stage previousStage = mUiStage;
             mUiStage = stage;
             updateUi();
+
+            // If the stage changed, announce the header for accessibility. This
+            // is a no-op when accessibility is disabled.
+            if (previousStage != stage) {
+                mHeaderText.announceForAccessibility(mHeaderText.getText());
+            }
         }
 
         /**
@@ -300,8 +318,8 @@
             int nonletter = 0;
             for (int i = 0; i < password.length(); i++) {
                 char c = password.charAt(i);
-                // allow non white space Latin-1 characters only
-                if (c <= 32 || c > 127) {
+                // allow non control Latin-1 characters only
+                if (c < 32 || c > 127) {
                     return getString(R.string.lockpassword_illegal_character);
                 }
                 if (c >= '0' && c <= '9') {
@@ -378,8 +396,8 @@
                 errorMsg = validatePassword(pin);
                 if (errorMsg == null) {
                     mFirstPin = pin;
-                    updateStage(Stage.NeedToConfirm);
                     mPasswordEntry.setText("");
+                    updateStage(Stage.NeedToConfirm);
                 }
             } else if (mUiStage == Stage.NeedToConfirm) {
                 if (mFirstPin.equals(pin)) {
@@ -387,13 +405,14 @@
                             LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
                     mLockPatternUtils.clearLock(isFallback);
                     mLockPatternUtils.saveLockPassword(pin, mRequestedQuality, isFallback);
+                    getActivity().setResult(RESULT_FINISHED);
                     getActivity().finish();
                 } else {
-                    updateStage(Stage.ConfirmWrong);
                     CharSequence tmp = mPasswordEntry.getText();
                     if (tmp != null) {
                         Selection.setSelection((Spannable) tmp, 0, tmp.length());
                     }
+                    updateStage(Stage.ConfirmWrong);
                 }
             }
             if (errorMsg != null) {
@@ -415,6 +434,7 @@
 
         private void showError(String msg, final Stage next) {
             mHeaderText.setText(msg);
+            mHeaderText.announceForAccessibility(mHeaderText.getText());
             Message mesg = mHandler.obtainMessage(MSG_SHOW_ERROR, next);
             mHandler.removeMessages(MSG_SHOW_ERROR);
             mHandler.sendMessageDelayed(mesg, ERROR_MESSAGE_TIMEOUT);
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 180eee1..328312c 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -22,6 +22,7 @@
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.LockPatternView;
 import com.android.internal.widget.LockPatternView.Cell;
+import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
 
 import static com.android.internal.widget.LockPatternView.DisplayMode;
 
@@ -69,6 +70,12 @@
     }
 
     @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (ChooseLockPatternFragment.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         // requestWindowFeature(Window.FEATURE_NO_TITLE);
         super.onCreate(savedInstanceState);
@@ -301,6 +308,9 @@
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
             mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());
+            if (!(getActivity() instanceof ChooseLockPattern)) {
+                throw new SecurityException("Fragment contained in wrong activity");
+            }
         }
 
         @Override
@@ -331,7 +341,7 @@
             topLayout.setDefaultTouchRecepient(mLockPatternView);
 
             final boolean confirmCredentials = getActivity().getIntent()
-                    .getBooleanExtra("confirm_credentials", false);
+                    .getBooleanExtra("confirm_credentials", true);
 
             if (savedInstanceState == null) {
                 if (confirmCredentials) {
@@ -429,6 +439,7 @@
          * @param stage
          */
         protected void updateStage(Stage stage) {
+            final Stage previousStage = mUiStage;
 
             mUiStage = stage;
 
@@ -493,6 +504,12 @@
                 case ChoiceConfirmed:
                     break;
             }
+
+            // If the stage changed, announce the header for accessibility. This
+            // is a no-op when accessibility is disabled.
+            if (previousStage != stage) {
+                mHeaderText.announceForAccessibility(mHeaderText.getText());
+            }
         }
 
 
@@ -514,7 +531,6 @@
 
             if (lockVirgin) {
                 utils.setVisiblePatternEnabled(true);
-                utils.setTactileFeedbackEnabled(false);
             }
 
             getActivity().setResult(RESULT_FINISHED);
diff --git a/src/com/android/settings/ChooseLockPatternTutorial.java b/src/com/android/settings/ChooseLockPatternTutorial.java
deleted file mode 100644
index 5dbd616..0000000
--- a/src/com/android/settings/ChooseLockPatternTutorial.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import java.util.ArrayList;
-
-import com.android.internal.widget.LockPatternUtils;
-import com.android.internal.widget.LockPatternView;
-
-import android.app.Fragment;
-import android.content.Intent;
-import android.os.Bundle;
-import android.preference.PreferenceActivity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-public class ChooseLockPatternTutorial extends PreferenceActivity {
-
-    // required constructor for fragments
-    public ChooseLockPatternTutorial() {
-
-    }
-
-    @Override
-    public Intent getIntent() {
-        Intent modIntent = new Intent(super.getIntent());
-        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, ChooseLockPatternTutorialFragment.class.getName());
-        modIntent.putExtra(EXTRA_NO_HEADERS, true);
-        return modIntent;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        CharSequence msg = getText(R.string.lockpassword_choose_your_pattern_header);
-        showBreadCrumbs(msg, msg);
-    }
-
-    public static class ChooseLockPatternTutorialFragment extends Fragment
-            implements View.OnClickListener {
-        private View mNextButton;
-        private View mSkipButton;
-        private LockPatternView mPatternView;
-
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            // Don't show the tutorial if the user has seen it before.
-            LockPatternUtils lockPatternUtils = new LockPatternUtils(getActivity());
-            if (savedInstanceState == null && lockPatternUtils.isPatternEverChosen()) {
-                Intent intent = new Intent(getActivity(), ChooseLockPattern.class);
-                intent.setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
-                intent.putExtra("confirm_credentials", false);
-                final boolean isFallback = getActivity().getIntent()
-                    .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
-                intent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK,
-                                isFallback);
-                startActivity(intent);
-                getActivity().finish();
-            }
-        }
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            View view = inflater.inflate(R.layout.choose_lock_pattern_tutorial, null);
-            mNextButton = view.findViewById(R.id.next_button);
-            mNextButton.setOnClickListener(this);
-            mSkipButton = view.findViewById(R.id.skip_button);
-            mSkipButton.setOnClickListener(this);
-
-            // Set up LockPatternView to be a non-interactive demo animation
-            mPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);
-            ArrayList<LockPatternView.Cell> demoPattern = new ArrayList<LockPatternView.Cell>();
-            demoPattern.add(LockPatternView.Cell.of(0,0));
-            demoPattern.add(LockPatternView.Cell.of(0,1));
-            demoPattern.add(LockPatternView.Cell.of(1,1));
-            demoPattern.add(LockPatternView.Cell.of(2,1));
-            mPatternView.setPattern(LockPatternView.DisplayMode.Animate, demoPattern);
-            mPatternView.disableInput();
-
-            return view;
-        }
-
-        public void onClick(View v) {
-            if (v == mSkipButton) {
-                // Canceling, so finish all
-                getActivity().setResult(ChooseLockPattern.RESULT_FINISHED);
-                getActivity().finish();
-            } else if (v == mNextButton) {
-                final boolean isFallback = getActivity().getIntent()
-                    .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
-                Intent intent = new Intent(getActivity(), ChooseLockPattern.class);
-                intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
-                intent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK,
-                                isFallback);
-                startActivity(intent);
-                getActivity().overridePendingTransition(0, 0); // no animation
-                getActivity().finish();
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index 1229046..d7402da 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -19,6 +19,7 @@
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.PasswordEntryKeyboardHelper;
 import com.android.internal.widget.PasswordEntryKeyboardView;
+import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
 
 import android.app.Activity;
 import android.app.Fragment;
@@ -35,6 +36,7 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityEvent;
 import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.TextView;
@@ -51,6 +53,12 @@
     }
 
     @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (ConfirmLockPasswordFragment.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         // Disable IME on our window since we provide our own keyboard
         //getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,
@@ -173,6 +181,7 @@
 
         private void showError(int msg) {
             mHeaderText.setText(msg);
+            mHeaderText.announceForAccessibility(mHeaderText.getText());
             mPasswordEntry.setText(null);
             mHandler.postDelayed(new Runnable() {
                 public void run() {
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index 2892930..3a1f06c 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -76,6 +76,12 @@
         return modIntent;
     }
 
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (ConfirmLockPatternFragment.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
+
     public static class ConfirmLockPatternFragment extends Fragment {
 
         // how long we wait to clear a wrong pattern
@@ -180,7 +186,6 @@
         }
 
         private void updateStage(Stage stage) {
-
             switch (stage) {
                 case NeedToUnlock:
                     if (mHeaderText != null) {
@@ -220,6 +225,10 @@
                     mLockPatternView.setEnabled(false); // appearance of being disabled
                     break;
             }
+
+            // Always announce the header for accessibility. This is a no-op
+            // when accessibility is disabled.
+            mHeaderTextView.announceForAccessibility(mHeaderTextView.getText());
         }
 
         private Runnable mClearPatternRunnable = new Runnable() {
diff --git a/src/com/android/settings/CreateShortcut.java b/src/com/android/settings/CreateShortcut.java
index 0312a4b..f71df1d 100644
--- a/src/com/android/settings/CreateShortcut.java
+++ b/src/com/android/settings/CreateShortcut.java
@@ -18,10 +18,15 @@
 
 import android.app.LauncherActivity;
 import android.content.Intent;
+import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ListView;
 
+import com.android.settings.Settings.TetherSettingsActivity;
+
+import java.util.List;
+
 public class CreateShortcut extends LauncherActivity {
 
     @Override
@@ -49,4 +54,22 @@
     protected boolean onEvaluateShowIcons() {
         return false;
     }
+
+    /**
+     * Perform query on package manager for list items.  The default
+     * implementation queries for activities.
+     */
+    protected List<ResolveInfo> onQueryPackageManager(Intent queryIntent) {
+        List<ResolveInfo> activities = super.onQueryPackageManager(queryIntent);
+        if (activities == null) return null;
+        for (int i = activities.size() - 1; i >= 0; i--) {
+            ResolveInfo info = activities.get(i);
+            if (info.activityInfo.name.endsWith(TetherSettingsActivity.class.getSimpleName())) {
+                if (!TetherSettings.showInShortcuts(this)) {
+                    activities.remove(i);
+                }
+            }
+        }
+        return activities;
+    }
 }
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 07b1776..fcf208a 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -25,6 +25,7 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.RemoteException;
+import android.os.Process;
 import android.security.Credentials;
 import android.security.KeyChain.KeyChainConnection;
 import android.security.KeyChain;
@@ -39,6 +40,14 @@
 import android.widget.Toast;
 import com.android.internal.widget.LockPatternUtils;
 
+import com.android.org.bouncycastle.asn1.ASN1InputStream;
+import com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+
+import org.apache.harmony.security.utils.AlgNameMapper;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
 /**
  * CredentialStorage handles KeyStore reset, unlock, and install.
  *
@@ -104,7 +113,8 @@
      */
     private int mRetriesRemaining = -1;
 
-    @Override protected void onResume() {
+    @Override
+    protected void onResume() {
         super.onResume();
 
         Intent intent = getIntent();
@@ -113,8 +123,8 @@
         if (ACTION_RESET.equals(action)) {
             new ResetDialog();
         } else {
-            if (ACTION_INSTALL.equals(action) &&
-                    "com.android.certinstaller".equals(getCallingPackage())) {
+            if (ACTION_INSTALL.equals(action)
+                    && "com.android.certinstaller".equals(getCallingPackage())) {
                 mInstallBundle = intent.getExtras();
             }
             // ACTION_UNLOCK also handled here in addition to ACTION_INSTALL
@@ -181,6 +191,20 @@
         return (quality >= MIN_PASSWORD_QUALITY);
     }
 
+    private boolean isHardwareBackedKey(byte[] keyData) {
+        try {
+            ASN1InputStream bIn = new ASN1InputStream(new ByteArrayInputStream(keyData));
+            PrivateKeyInfo pki = PrivateKeyInfo.getInstance(bIn.readObject());
+            String algId = pki.getAlgorithmId().getAlgorithm().getId();
+            String algName = AlgNameMapper.map2AlgName(algId);
+
+            return KeyChain.isBoundKeyAlgorithm(algName);
+        } catch (IOException e) {
+            Log.e(TAG, "Failed to parse key data");
+            return false;
+        }
+    }
+
     /**
      * Install credentials if available, otherwise do nothing.
      */
@@ -189,22 +213,34 @@
             Bundle bundle = mInstallBundle;
             mInstallBundle = null;
 
+            final int uid = bundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, -1);
+
             if (bundle.containsKey(Credentials.EXTRA_USER_PRIVATE_KEY_NAME)) {
                 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)) {
-                    Log.e(TAG, "Failed to install " + key);
+                int flags = KeyStore.FLAG_ENCRYPTED;
+                if (uid == Process.WIFI_UID && isHardwareBackedKey(value)) {
+                    // Hardware backed keystore is secure enough to allow for WIFI stack
+                    // to enable access to secure networks without user intervention
+                    Log.d(TAG, "Saving private key with FLAG_NONE for WIFI_UID");
+                    flags = KeyStore.FLAG_NONE;
+                }
+
+                if (!mKeyStore.importKey(key, value, uid, flags)) {
+                    Log.e(TAG, "Failed to install " + key + " as user " + uid);
                     return;
                 }
             }
 
+            int flags = (uid == Process.WIFI_UID) ? KeyStore.FLAG_NONE : KeyStore.FLAG_ENCRYPTED;
+
             if (bundle.containsKey(Credentials.EXTRA_USER_CERTIFICATE_NAME)) {
                 String certName = bundle.getString(Credentials.EXTRA_USER_CERTIFICATE_NAME);
                 byte[] certData = bundle.getByteArray(Credentials.EXTRA_USER_CERTIFICATE_DATA);
 
-                if (!mKeyStore.put(certName, certData)) {
-                    Log.e(TAG, "Failed to install " + certName);
+                if (!mKeyStore.put(certName, certData, uid, flags)) {
+                    Log.e(TAG, "Failed to install " + certName + " as user " + uid);
                     return;
                 }
             }
@@ -213,11 +249,10 @@
                 String caListName = bundle.getString(Credentials.EXTRA_CA_CERTIFICATES_NAME);
                 byte[] caListData = bundle.getByteArray(Credentials.EXTRA_CA_CERTIFICATES_DATA);
 
-                if (!mKeyStore.put(caListName, caListData)) {
-                    Log.e(TAG, "Failed to install " + caListName);
+                if (!mKeyStore.put(caListName, caListData, uid, flags)) {
+                    Log.e(TAG, "Failed to install " + caListName + " as user " + uid);
                     return;
                 }
-
             }
 
             setResult(RESULT_OK);
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 4cab767..7057f1a 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -32,6 +32,7 @@
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemProperties;
+import android.os.UserHandle;
 import android.os.storage.IMountService;
 import android.provider.Settings;
 import android.telephony.TelephonyManager;
@@ -54,6 +55,7 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.android.internal.statusbar.StatusBarIcon;
 import com.android.internal.telephony.ITelephony;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
@@ -228,6 +230,17 @@
     };
 
     private AudioManager mAudioManager;
+    /** The status bar where back/home/recent buttons are shown. */
+    private StatusBarManager mStatusBar;
+
+    /** All the widgets to disable in the status bar */
+    final private static int sWidgetsToDisable = StatusBarManager.DISABLE_EXPAND
+            | StatusBarManager.DISABLE_NOTIFICATION_ICONS
+            | StatusBarManager.DISABLE_NOTIFICATION_ALERTS
+            | StatusBarManager.DISABLE_SYSTEM_INFO
+            | StatusBarManager.DISABLE_HOME
+            | StatusBarManager.DISABLE_SEARCH
+            | StatusBarManager.DISABLE_RECENT;
 
     /** @return whether or not this Activity was started for debugging the UI only. */
     private boolean isDebugView() {
@@ -244,10 +257,8 @@
      */
     private void notifyUser() {
         if (mNotificationCountdown > 0) {
-            Log.d(TAG, "Counting down to notify user..." + mNotificationCountdown);
             --mNotificationCountdown;
         } else if (mAudioManager != null) {
-            Log.d(TAG, "Notifying user that we are waiting for input...");
             try {
                 // Play the standard keypress sound at full volume. This should be available on
                 // every device. We cannot play a ringtone here because media services aren't
@@ -270,6 +281,7 @@
      */
     @Override
     public void onBackPressed() {
+        // In the rare case that something pressed back even though we were disabled.
         if (mIgnoreBack)
             return;
         super.onBackPressed();
@@ -300,13 +312,8 @@
 
         // Disable the status bar, but do NOT disable back because the user needs a way to go
         // from keyboard settings and back to the password screen.
-        StatusBarManager sbm = (StatusBarManager) getSystemService(Context.STATUS_BAR_SERVICE);
-        sbm.disable(StatusBarManager.DISABLE_EXPAND
-                | StatusBarManager.DISABLE_NOTIFICATION_ICONS
-                | StatusBarManager.DISABLE_NOTIFICATION_ALERTS
-                | StatusBarManager.DISABLE_SYSTEM_INFO
-                | StatusBarManager.DISABLE_HOME
-                | StatusBarManager.DISABLE_RECENT);
+        mStatusBar = (StatusBarManager) getSystemService(Context.STATUS_BAR_SERVICE);
+        mStatusBar.disable(sWidgetsToDisable);
 
         setAirplaneModeIfNecessary();
         mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
@@ -404,7 +411,7 @@
 
         ((ProgressBar) findViewById(R.id.progress_bar)).setIndeterminate(true);
         // Ignore all back presses from now, both hard and soft keys.
-        mIgnoreBack = true;
+        setBackFunctionality(false);
         // Start the first run of progress manually. This method sets up messages to occur at
         // repeated intervals.
         updateProgress();
@@ -470,7 +477,7 @@
         if (mCooldown <= 0) {
             // Re-enable the password entry and back presses.
             mPasswordEntry.setEnabled(true);
-            mIgnoreBack = false;
+            setBackFunctionality(true);
             status.setText(R.string.enter_password);
         } else {
             CharSequence template = getText(R.string.crypt_keeper_cooldown);
@@ -482,6 +489,19 @@
         }
     }
 
+    /**
+     * Sets the back status: enabled or disabled according to the parameter.
+     * @param isEnabled true if back is enabled, false otherwise.
+     */
+    private final void setBackFunctionality(boolean isEnabled) {
+        mIgnoreBack = !isEnabled;
+        if (isEnabled) {
+            mStatusBar.disable(sWidgetsToDisable);
+        } else {
+            mStatusBar.disable(sWidgetsToDisable | StatusBarManager.DISABLE_BACK);
+        }
+    }
+
     private void passwordEntryInit() {
         mPasswordEntry = (EditText) findViewById(R.id.passwordEntry);
         mPasswordEntry.setOnEditorActionListener(this);
@@ -611,7 +631,7 @@
             // Disable the password entry and back keypress while checking the password. These
             // we either be re-enabled if the password was wrong or after the cooldown period.
             mPasswordEntry.setEnabled(false);
-            mIgnoreBack = true;
+            setBackFunctionality(false);
 
             Log.d(TAG, "Attempting to send command to decrypt");
             new DecryptTask().execute(password);
@@ -641,10 +661,10 @@
                 TelephonyManager.getDefault().getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE;
         if (!isLteDevice) {
             Log.d(TAG, "Going into airplane mode.");
-            Settings.System.putInt(getContentResolver(), Settings.System.AIRPLANE_MODE_ON, 1);
+            Settings.Global.putInt(getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
             final Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
             intent.putExtra("state", true);
-            sendBroadcast(intent);
+            sendBroadcastAsUser(intent, UserHandle.ALL);
         }
     }
 
@@ -723,7 +743,6 @@
      * Listen to key events so we can disable sounds when we get a keyinput in EditText.
      */
     private void delayAudioNotification() {
-        Log.d(TAG, "User entering password: delay audio notification");
         mNotificationCountdown = 20;
     }
 
diff --git a/src/com/android/settings/CryptKeeperConfirm.java b/src/com/android/settings/CryptKeeperConfirm.java
index 9a7c21b..4822a83 100644
--- a/src/com/android/settings/CryptKeeperConfirm.java
+++ b/src/com/android/settings/CryptKeeperConfirm.java
@@ -53,6 +53,7 @@
                     | StatusBarManager.DISABLE_NOTIFICATION_ALERTS
                     | StatusBarManager.DISABLE_SYSTEM_INFO
                     | StatusBarManager.DISABLE_HOME
+                    | StatusBarManager.DISABLE_SEARCH
                     | StatusBarManager.DISABLE_RECENT
                     | StatusBarManager.DISABLE_BACK);
 
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java
index d0043e6..58d97a8 100644
--- a/src/com/android/settings/CryptKeeperSettings.java
+++ b/src/com/android/settings/CryptKeeperSettings.java
@@ -61,14 +61,14 @@
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             if (action.equals(Intent.ACTION_BATTERY_CHANGED)) {
-                int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
-                int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0);
-                int invalidCharger = intent.getIntExtra(BatteryManager.EXTRA_INVALID_CHARGER, 0);
+                final int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
+                final int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0);
+                final int invalidCharger = intent.getIntExtra(
+                    BatteryManager.EXTRA_INVALID_CHARGER, 0);
 
-                boolean levelOk = level >= MIN_BATTERY_LEVEL;
-                boolean pluggedOk =
-                    (plugged == BatteryManager.BATTERY_PLUGGED_AC ||
-                     plugged == BatteryManager.BATTERY_PLUGGED_USB) &&
+                final boolean levelOk = level >= MIN_BATTERY_LEVEL;
+                final boolean pluggedOk =
+                    ((plugged & BatteryManager.BATTERY_PLUGGED_ANY) != 0) &&
                      invalidCharger == 0;
 
                 // Update UI elements based on power/battery status
@@ -204,4 +204,3 @@
         ((PreferenceActivity) getActivity()).onPreferenceStartFragment(null, preference);
     }
 }
-
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 5e20a6e..db1ae29 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -48,6 +48,7 @@
 import static com.android.settings.Utils.prepareCustomPreferencesList;
 
 import android.animation.LayoutTransition;
+import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -76,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;
@@ -85,7 +85,7 @@
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemProperties;
-import android.os.UserId;
+import android.os.UserHandle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.provider.Settings;
@@ -127,7 +127,6 @@
 import android.widget.TabWidget;
 import android.widget.TextView;
 
-import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.settings.drawable.InsetBoundsDrawable;
 import com.android.settings.net.ChartData;
@@ -142,13 +141,13 @@
 import com.android.settings.widget.PieChartView;
 import com.google.android.collect.Lists;
 
+import libcore.util.Objects;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
-import libcore.util.Objects;
-
 /**
  * Panel showing data usage history across various networks, including options
  * to inspect based on usage cycle and control through {@link NetworkPolicy}.
@@ -277,13 +276,29 @@
         mPolicyEditor = new NetworkPolicyEditor(mPolicyManager);
         mPolicyEditor.read();
 
+        try {
+            if (!mNetworkService.isBandwidthControlEnabled()) {
+                Log.w(TAG, "No bandwidth control; leaving");
+                getActivity().finish();
+            }
+        } catch (RemoteException e) {
+            Log.w(TAG, "No bandwidth control; leaving");
+            getActivity().finish();
+        }
+
+        try {
+            mStatsSession = mStatsService.openSession();
+        } catch (RemoteException e) {
+            throw new RuntimeException(e);
+        }
+
         mShowWifi = mPrefs.getBoolean(PREF_SHOW_WIFI, false);
         mShowEthernet = mPrefs.getBoolean(PREF_SHOW_ETHERNET, false);
 
         // override preferences when no mobile radio
         if (!hasReadyMobileRadio(context)) {
-            mShowWifi = hasWifiRadio(context);
-            mShowEthernet = hasEthernet(context);
+            mShowWifi = true;
+            mShowEthernet = true;
         }
 
         setHasOptionsMenu(true);
@@ -298,12 +313,6 @@
 
         mUidDetailProvider = new UidDetailProvider(context);
 
-        try {
-            mStatsSession = mStatsService.openSession();
-        } catch (RemoteException e) {
-            throw new RuntimeException(e);
-        }
-
         mTabHost = (TabHost) view.findViewById(android.R.id.tabhost);
         mTabsContainer = (ViewGroup) view.findViewById(R.id.tabs_container);
         mTabWidget = (TabWidget) view.findViewById(android.R.id.tabs);
@@ -313,15 +322,10 @@
         // on parent container for inset.
         final boolean shouldInset = mListView.getScrollBarStyle()
                 == View.SCROLLBARS_OUTSIDE_OVERLAY;
-        if (shouldInset) {
-            mInsetSide = view.getResources().getDimensionPixelOffset(
-                    com.android.internal.R.dimen.preference_fragment_padding_side);
-        } else {
-            mInsetSide = 0;
-        }
+        mInsetSide = 0;
 
         // adjust padding around tabwidget as needed
-        prepareCustomPreferencesList(container, view, mListView, true);
+        prepareCustomPreferencesList(container, view, mListView, false);
 
         mTabHost.setup();
         mTabHost.setOnTabChangedListener(mTabListener);
@@ -329,13 +333,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);
         }
 
         {
@@ -447,20 +452,23 @@
     public void onPrepareOptionsMenu(Menu menu) {
         final Context context = getActivity();
         final boolean appDetailMode = isAppDetailMode();
+        final boolean isOwner = ActivityManager.getCurrentUser() == UserHandle.USER_OWNER;
 
         mMenuDataRoaming = menu.findItem(R.id.data_usage_menu_roaming);
         mMenuDataRoaming.setVisible(hasReadyMobileRadio(context) && !appDetailMode);
         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());
 
         mMenuAutoSync = menu.findItem(R.id.data_usage_menu_auto_sync);
         mMenuAutoSync.setChecked(ContentResolver.getMasterSyncAutomatically());
+        mMenuAutoSync.setVisible(!appDetailMode);
 
         final MenuItem split4g = menu.findItem(R.id.data_usage_menu_split_4g);
-        split4g.setVisible(hasReadyMobile4gRadio(context) && !appDetailMode);
+        split4g.setVisible(hasReadyMobile4gRadio(context) && isOwner && !appDetailMode);
         split4g.setChecked(isMobilePolicySplit());
 
         final MenuItem showWifi = menu.findItem(R.id.data_usage_menu_show_wifi);
@@ -489,11 +497,7 @@
         final MenuItem help = menu.findItem(R.id.data_usage_menu_help);
         String helpUrl;
         if (!TextUtils.isEmpty(helpUrl = getResources().getString(R.string.help_url_data_usage))) {
-            Intent helpIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(helpUrl));
-            helpIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
-            help.setIntent(helpIntent);
-            help.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+            HelpUtils.prepareHelpMenuItem(context, help, helpUrl);
         } else {
             help.setVisible(false);
         }
@@ -550,7 +554,11 @@
                 return true;
             }
             case R.id.data_usage_menu_auto_sync: {
-                ConfirmAutoSyncChangeFragment.show(this, !item.isChecked());
+                if (ActivityManager.isUserAMonkey()) {
+                    Log.d("SyncState", "ignoring monkey's attempt to flip global sync state");
+                } else {
+                    ConfirmAutoSyncChangeFragment.show(this, !item.isChecked());
+                }
                 return true;
             }
         }
@@ -681,6 +689,7 @@
 
         final Context context = getActivity();
         final String currentTab = mTabHost.getCurrentTabTag();
+        final boolean isOwner = ActivityManager.getCurrentUser() == UserHandle.USER_OWNER;
 
         if (currentTab == null) {
             Log.w(TAG, "no tab selected; hiding body");
@@ -695,7 +704,7 @@
 
         if (LOGD) Log.d(TAG, "updateBody() with currentTab=" + currentTab);
 
-        mDataEnabledView.setVisibility(View.VISIBLE);
+        mDataEnabledView.setVisibility(isOwner ? View.VISIBLE : View.GONE);
 
         // TODO: remove mobile tabs when SIM isn't ready
         final TelephonyManager tele = TelephonyManager.from(context);
@@ -774,8 +783,8 @@
         mChart.bindNetworkPolicy(null);
 
         // show icon and all labels appearing under this app
-        final int appId = mCurrentApp.appId;
-        final UidDetail detail = mUidDetailProvider.getUidDetail(appId, true);
+        final int uid = mCurrentApp.key;
+        final UidDetail detail = mUidDetailProvider.getUidDetail(uid, true);
         mAppIcon.setImageDrawable(detail.icon);
 
         mAppTitles.removeAllViews();
@@ -788,14 +797,21 @@
         }
 
         // enable settings button when package provides it
-        // TODO: target torwards entire UID instead of just first package
-        final String[] packageNames = pm.getPackagesForUid(appId);
+        final String[] packageNames = pm.getPackagesForUid(uid);
         if (packageNames != null && packageNames.length > 0) {
             mAppSettingsIntent = new Intent(Intent.ACTION_MANAGE_NETWORK_USAGE);
-            mAppSettingsIntent.setPackage(packageNames[0]);
             mAppSettingsIntent.addCategory(Intent.CATEGORY_DEFAULT);
 
-            final boolean matchFound = pm.resolveActivity(mAppSettingsIntent, 0) != null;
+            // Search for match across all packages
+            boolean matchFound = false;
+            for (String packageName : packageNames) {
+                mAppSettingsIntent.setPackage(packageName);
+                if (pm.resolveActivity(mAppSettingsIntent, 0) != null) {
+                    matchFound = true;
+                    break;
+                }
+            }
+
             mAppSettings.setEnabled(matchFound);
             mAppSettings.setVisibility(View.VISIBLE);
 
@@ -806,7 +822,7 @@
 
         updateDetailData();
 
-        if (UserId.isApp(appId) && !mPolicyManager.getRestrictBackground()
+        if (UserHandle.isApp(uid) && !mPolicyManager.getRestrictBackground()
                 && isBandwidthControlEnabled() && hasReadyMobileRadio(context)) {
             setPreferenceTitle(mAppRestrictView, R.string.data_usage_app_restrict_background);
             setPreferenceSummary(mAppRestrictView,
@@ -855,7 +871,8 @@
     }
 
     private boolean isNetworkPolicyModifiable(NetworkPolicy policy) {
-        return policy != null && isBandwidthControlEnabled() && mDataEnabled.isChecked();
+        return policy != null && isBandwidthControlEnabled() && mDataEnabled.isChecked()
+                && ActivityManager.getCurrentUser() == UserHandle.USER_OWNER;
     }
 
     private boolean isBandwidthControlEnabled() {
@@ -869,14 +886,14 @@
 
     private boolean getDataRoaming() {
         final ContentResolver resolver = getActivity().getContentResolver();
-        return Settings.Secure.getInt(resolver, Settings.Secure.DATA_ROAMING, 0) != 0;
+        return Settings.Global.getInt(resolver, Settings.Global.DATA_ROAMING, 0) != 0;
     }
 
     private void setDataRoaming(boolean enabled) {
         // TODO: teach telephony DataConnectionTracker to watch and apply
         // updates when changed.
         final ContentResolver resolver = getActivity().getContentResolver();
-        Settings.Secure.putInt(resolver, Settings.Secure.DATA_ROAMING, enabled ? 1 : 0);
+        Settings.Global.putInt(resolver, Settings.Global.DATA_ROAMING, enabled ? 1 : 0);
         mMenuDataRoaming.setChecked(enabled);
     }
 
@@ -886,16 +903,16 @@
     }
 
     private boolean getAppRestrictBackground() {
-        final int appId = mCurrentApp.appId;
-        final int uidPolicy = mPolicyManager.getAppPolicy(appId);
+        final int uid = mCurrentApp.key;
+        final int uidPolicy = mPolicyManager.getUidPolicy(uid);
         return (uidPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0;
     }
 
     private void setAppRestrictBackground(boolean restrictBackground) {
         if (LOGD) Log.d(TAG, "setAppRestrictBackground()");
-        final int appId = mCurrentApp.appId;
-        mPolicyManager.setAppPolicy(appId,
-                restrictBackground ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE);
+        final int uid = mCurrentApp.key;
+        mPolicyManager.setUidPolicy(
+                uid, restrictBackground ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE);
         mAppRestrict.setChecked(restrictBackground);
     }
 
@@ -1080,7 +1097,7 @@
             // TODO: sigh, remove this hack once we understand 6450986
             if (mUidDetailProvider == null || app == null) return;
 
-            final UidDetail detail = mUidDetailProvider.getUidDetail(app.appId, true);
+            final UidDetail detail = mUidDetailProvider.getUidDetail(app.key, true);
             AppDetailsFragment.show(DataUsageSummary.this, app, detail.label);
         }
     };
@@ -1171,8 +1188,8 @@
         final String rangePhrase = formatDateRange(context, start, end);
 
         final int summaryRes;
-        if (TAB_MOBILE.equals(mCurrentTab) || TAB_3G.equals(mCurrentApp)
-                || TAB_4G.equals(mCurrentApp)) {
+        if (TAB_MOBILE.equals(mCurrentTab) || TAB_3G.equals(mCurrentTab)
+                || TAB_4G.equals(mCurrentTab)) {
             summaryRes = R.string.data_usage_total_during_range_mobile;
         } else {
             summaryRes = R.string.data_usage_total_during_range;
@@ -1224,9 +1241,9 @@
 
         @Override
         public void onLoadFinished(Loader<NetworkStats> loader, NetworkStats data) {
-            final int[] restrictedAppIds = mPolicyManager.getAppsWithPolicy(
+            final int[] restrictedUids = mPolicyManager.getUidsWithPolicy(
                     POLICY_REJECT_METERED_BACKGROUND);
-            mAdapter.bindStats(data, restrictedAppIds);
+            mAdapter.bindStats(data, restrictedUids);
             updateEmptyVisible();
         }
 
@@ -1408,17 +1425,17 @@
     }
 
     public static class AppItem implements Comparable<AppItem>, Parcelable {
-        public final int appId;
+        public final int key;
         public boolean restricted;
         public SparseBooleanArray uids = new SparseBooleanArray();
         public long total;
 
-        public AppItem(int appId) {
-            this.appId = appId;
+        public AppItem(int key) {
+            this.key = key;
         }
 
         public AppItem(Parcel parcel) {
-            appId = parcel.readInt();
+            key = parcel.readInt();
             uids = parcel.readSparseBooleanArray();
             total = parcel.readLong();
         }
@@ -1429,7 +1446,7 @@
 
         @Override
         public void writeToParcel(Parcel dest, int flags) {
-            dest.writeInt(appId);
+            dest.writeInt(key);
             dest.writeSparseBooleanArray(uids);
             dest.writeLong(total);
         }
@@ -1475,49 +1492,56 @@
         /**
          * Bind the given {@link NetworkStats}, or {@code null} to clear list.
          */
-        public void bindStats(NetworkStats stats, int[] restrictedAppIds) {
+        public void bindStats(NetworkStats stats, int[] restrictedUids) {
             mItems.clear();
 
-            final AppItem systemItem = new AppItem(android.os.Process.SYSTEM_UID);
-            final SparseArray<AppItem> knownUids = new SparseArray<AppItem>();
+            final int currentUserId = ActivityManager.getCurrentUser();
+            final SparseArray<AppItem> knownItems = new SparseArray<AppItem>();
 
             NetworkStats.Entry entry = null;
             final int size = stats != null ? stats.size() : 0;
             for (int i = 0; i < size; i++) {
                 entry = stats.getValues(i, entry);
 
-                final boolean isApp = UserId.isApp(entry.uid);
-                final int appId = isApp ? UserId.getAppId(entry.uid) : entry.uid;
-                if (isApp || appId == UID_REMOVED || appId == UID_TETHERING) {
-                    AppItem item = knownUids.get(appId);
-                    if (item == null) {
-                        item = new AppItem(appId);
-                        knownUids.put(appId, item);
-                        mItems.add(item);
+                // Decide how to collapse items together
+                final int uid = entry.uid;
+                final int collapseKey;
+                if (UserHandle.isApp(uid)) {
+                    if (UserHandle.getUserId(uid) == currentUserId) {
+                        collapseKey = uid;
+                    } else {
+                        collapseKey = UidDetailProvider.buildKeyForUser(UserHandle.getUserId(uid));
                     }
-
-                    item.total += entry.rxBytes + entry.txBytes;
-                    item.addUid(entry.uid);
+                } else if (uid == UID_REMOVED || uid == UID_TETHERING) {
+                    collapseKey = uid;
                 } else {
-                    systemItem.total += entry.rxBytes + entry.txBytes;
-                    systemItem.addUid(entry.uid);
+                    collapseKey = android.os.Process.SYSTEM_UID;
                 }
+
+                AppItem item = knownItems.get(collapseKey);
+                if (item == null) {
+                    item = new AppItem(collapseKey);
+                    mItems.add(item);
+                    knownItems.put(item.key, item);
+                }
+                item.addUid(uid);
+                item.total += entry.rxBytes + entry.txBytes;
             }
 
-            for (int appId : restrictedAppIds) {
-                AppItem item = knownUids.get(appId);
+            for (int uid : restrictedUids) {
+                // Only splice in restricted state for current user
+                if (UserHandle.getUserId(uid) != currentUserId) continue;
+
+                AppItem item = knownItems.get(uid);
                 if (item == null) {
-                    item = new AppItem(appId);
+                    item = new AppItem(uid);
                     item.total = -1;
                     mItems.add(item);
+                    knownItems.put(item.key, item);
                 }
                 item.restricted = true;
             }
 
-            if (systemItem.total > 0) {
-                mItems.add(systemItem);
-            }
-
             Collections.sort(mItems);
             mLargest = (mItems.size() > 0) ? mItems.get(0).total : 0;
             notifyDataSetChanged();
@@ -1535,7 +1559,7 @@
 
         @Override
         public long getItemId(int position) {
-            return mItems.get(position).appId;
+            return mItems.get(position).key;
         }
 
         @Override
@@ -1545,7 +1569,7 @@
                         R.layout.data_usage_item, parent, false);
 
                 if (mInsetSide > 0) {
-                    convertView.setPadding(mInsetSide, 0, mInsetSide, 0);
+                    convertView.setPaddingRelative(mInsetSide, 0, mInsetSide, 0);
                 }
             }
 
@@ -1726,6 +1750,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);
@@ -1899,7 +1926,7 @@
 
     /**
      * Dialog to request user confirmation before setting
-     * {@link android.provider.Settings.Secure#DATA_ROAMING}.
+     * {@link android.provider.Settings.Global#DATA_ROAMING}.
      */
     public static class ConfirmDataRoamingFragment extends DialogFragment {
         public static void show(DataUsageSummary parent) {
@@ -1916,7 +1943,11 @@
 
             final AlertDialog.Builder builder = new AlertDialog.Builder(context);
             builder.setTitle(R.string.roaming_reenable_title);
-            builder.setMessage(R.string.roaming_warning);
+            if (Utils.hasMultipleUsers(context)) {
+                builder.setMessage(R.string.roaming_warning_multiuser);
+            } else {
+                builder.setMessage(R.string.roaming_warning);
+            }
 
             builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                 @Override
@@ -1952,7 +1983,11 @@
 
             final AlertDialog.Builder builder = new AlertDialog.Builder(context);
             builder.setTitle(R.string.data_usage_restrict_background_title);
-            builder.setMessage(getString(R.string.data_usage_restrict_background));
+            if (Utils.hasMultipleUsers(context)) {
+                builder.setMessage(R.string.data_usage_restrict_background_multiuser);
+            } else {
+                builder.setMessage(R.string.data_usage_restrict_background);
+            }
 
             builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                 @Override
@@ -2126,7 +2161,7 @@
                 existing.cancel(false);
             }
 
-            final UidDetail cachedDetail = provider.getUidDetail(item.appId, false);
+            final UidDetail cachedDetail = provider.getUidDetail(item.key, false);
             if (cachedDetail != null) {
                 bindView(cachedDetail, target);
             } else {
@@ -2155,7 +2190,7 @@
 
         @Override
         protected UidDetail doInBackground(Void... params) {
-            return mProvider.getUidDetail(mItem.appId, true);
+            return mProvider.getUidDetail(mItem.key, true);
         }
 
         @Override
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index 96c1086..f02f838 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -17,6 +17,7 @@
 package com.android.settings;
 
 import android.app.Activity;
+import android.app.AlarmManager;
 import android.app.DatePickerDialog;
 import android.app.Dialog;
 import android.app.TimePickerDialog;
@@ -34,12 +35,18 @@
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
+import android.text.TextUtils;
 import android.text.format.DateFormat;
+import android.view.View;
 import android.widget.DatePicker;
 import android.widget.TimePicker;
 
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Locale;
 import java.util.TimeZone;
 
 public class DateTimeSettings extends SettingsPreferenceFragment
@@ -81,8 +88,8 @@
     }
 
     private void initUI() {
-        boolean autoTimeEnabled = getAutoState(Settings.System.AUTO_TIME);
-        boolean autoTimeZoneEnabled = getAutoState(Settings.System.AUTO_TIME_ZONE);
+        boolean autoTimeEnabled = getAutoState(Settings.Global.AUTO_TIME);
+        boolean autoTimeZoneEnabled = getAutoState(Settings.Global.AUTO_TIME_ZONE);
 
         Intent intent = getActivity().getIntent();
         boolean isFirstRun = intent.getBooleanExtra(EXTRA_IS_FIRST_RUN, false);
@@ -180,7 +187,7 @@
         mDummyDate.set(now.get(Calendar.YEAR), 11, 31, 13, 0, 0);
         Date dummyDate = mDummyDate.getTime();
         mTimePref.setSummary(DateFormat.getTimeFormat(getActivity()).format(now.getTime()));
-        mTimeZone.setSummary(getTimeZoneText(now.getTimeZone()));
+        mTimeZone.setSummary(getTimeZoneText(now.getTimeZone(), true));
         mDatePref.setSummary(shortDateFormat.format(now.getTime()));
         mDateFormat.setSummary(shortDateFormat.format(dummyDate));
         mTime24Pref.setSummary(DateFormat.getTimeFormat(getActivity()).format(dummyDate));
@@ -188,18 +195,18 @@
 
     @Override
     public void onDateSet(DatePicker view, int year, int month, int day) {
-        setDate(year, month, day);
         final Activity activity = getActivity();
         if (activity != null) {
+            setDate(activity, year, month, day);
             updateTimeAndDateDisplay(activity);
         }
     }
 
     @Override
     public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
-        setTime(hourOfDay, minute);
         final Activity activity = getActivity();
         if (activity != null) {
+            setTime(activity, hourOfDay, minute);
             updateTimeAndDateDisplay(activity);
         }
 
@@ -218,49 +225,52 @@
             updateTimeAndDateDisplay(getActivity());
         } else if (key.equals(KEY_AUTO_TIME)) {
             boolean autoEnabled = preferences.getBoolean(key, true);
-            Settings.System.putInt(getContentResolver(), Settings.System.AUTO_TIME,
+            Settings.Global.putInt(getContentResolver(), Settings.Global.AUTO_TIME,
                     autoEnabled ? 1 : 0);
             mTimePref.setEnabled(!autoEnabled);
             mDatePref.setEnabled(!autoEnabled);
         } else if (key.equals(KEY_AUTO_TIME_ZONE)) {
             boolean autoZoneEnabled = preferences.getBoolean(key, true);
-            Settings.System.putInt(
-                    getContentResolver(), Settings.System.AUTO_TIME_ZONE, autoZoneEnabled ? 1 : 0);
+            Settings.Global.putInt(
+                    getContentResolver(), Settings.Global.AUTO_TIME_ZONE, autoZoneEnabled ? 1 : 0);
             mTimeZone.setEnabled(!autoZoneEnabled);
         }
     }
 
     @Override
     public Dialog onCreateDialog(int id) {
-        Dialog d;
-
+        final Calendar calendar = Calendar.getInstance();
         switch (id) {
-        case DIALOG_DATEPICKER: {
-            final Calendar calendar = Calendar.getInstance();
-            d = new DatePickerDialog(
-                getActivity(),
-                this,
-                calendar.get(Calendar.YEAR),
-                calendar.get(Calendar.MONTH),
-                calendar.get(Calendar.DAY_OF_MONTH));
-            break;
-        }
-        case DIALOG_TIMEPICKER: {
-            final Calendar calendar = Calendar.getInstance();
-            d = new TimePickerDialog(
+        case DIALOG_DATEPICKER:
+            DatePickerDialog d = new DatePickerDialog(
+                    getActivity(),
+                    this,
+                    calendar.get(Calendar.YEAR),
+                    calendar.get(Calendar.MONTH),
+                    calendar.get(Calendar.DAY_OF_MONTH));
+            configureDatePicker(d.getDatePicker());
+            return d;
+        case DIALOG_TIMEPICKER:
+            return new TimePickerDialog(
                     getActivity(),
                     this,
                     calendar.get(Calendar.HOUR_OF_DAY),
                     calendar.get(Calendar.MINUTE),
                     DateFormat.is24HourFormat(getActivity()));
-            break;
-        }
         default:
-            d = null;
-            break;
+            throw new IllegalArgumentException();
         }
+    }
 
-        return d;
+    static void configureDatePicker(DatePicker datePicker) {
+        // The system clock can't represent dates outside this range.
+        Calendar t = Calendar.getInstance();
+        t.clear();
+        t.set(1970, Calendar.JANUARY, 1);
+        datePicker.setMinDate(t.getTimeInMillis());
+        t.clear();
+        t.set(2037, Calendar.DECEMBER, 31);
+        datePicker.setMaxDate(t.getTimeInMillis());
     }
 
     /*
@@ -335,13 +345,13 @@
 
     private boolean getAutoState(String name) {
         try {
-            return Settings.System.getInt(getContentResolver(), name) > 0;
+            return Settings.Global.getInt(getContentResolver(), name) > 0;
         } catch (SettingNotFoundException snfe) {
             return false;
         }
     }
 
-    /* package */ static void setDate(int year, int month, int day) {
+    /* package */ static void setDate(Context context, int year, int month, int day) {
         Calendar c = Calendar.getInstance();
 
         c.set(Calendar.YEAR, year);
@@ -350,11 +360,11 @@
         long when = c.getTimeInMillis();
 
         if (when / 1000 < Integer.MAX_VALUE) {
-            SystemClock.setCurrentTimeMillis(when);
+            ((AlarmManager) context.getSystemService(Context.ALARM_SERVICE)).setTime(when);
         }
     }
 
-    /* package */ static void setTime(int hourOfDay, int minute) {
+    /* package */ static void setTime(Context context, int hourOfDay, int minute) {
         Calendar c = Calendar.getInstance();
 
         c.set(Calendar.HOUR_OF_DAY, hourOfDay);
@@ -364,44 +374,36 @@
         long when = c.getTimeInMillis();
 
         if (when / 1000 < Integer.MAX_VALUE) {
-            SystemClock.setCurrentTimeMillis(when);
+            ((AlarmManager) context.getSystemService(Context.ALARM_SERVICE)).setTime(when);
         }
     }
 
-    /*  Helper routines to format timezone */
-
-    /* package */ static String getTimeZoneText(TimeZone tz) {
-        // Similar to new SimpleDateFormat("'GMT'Z, zzzz").format(new Date()), but
-        // we want "GMT-03:00" rather than "GMT-0300".
+    public static String getTimeZoneText(TimeZone tz, boolean includeName) {
         Date now = new Date();
-        return formatOffset(new StringBuilder(), tz, now).
-            append(", ").
-            append(tz.getDisplayName(tz.inDaylightTime(now), TimeZone.LONG)).toString();
-    }
 
-    private static StringBuilder formatOffset(StringBuilder sb, TimeZone tz, Date d) {
-        int off = tz.getOffset(d.getTime()) / 1000 / 60;
+        // Use SimpleDateFormat to format the GMT+00:00 string.
+        SimpleDateFormat gmtFormatter = new SimpleDateFormat("ZZZZ");
+        gmtFormatter.setTimeZone(tz);
+        String gmtString = gmtFormatter.format(now);
 
-        sb.append("GMT");
-        if (off < 0) {
-            sb.append('-');
-            off = -off;
-        } else {
-            sb.append('+');
+        // Ensure that the "GMT+" stays with the "00:00" even if the digits are RTL.
+        BidiFormatter bidiFormatter = BidiFormatter.getInstance();
+        Locale l = Locale.getDefault();
+        boolean isRtl = TextUtils.getLayoutDirectionFromLocale(l) == View.LAYOUT_DIRECTION_RTL;
+        gmtString = bidiFormatter.unicodeWrap(gmtString,
+                isRtl ? TextDirectionHeuristics.RTL : TextDirectionHeuristics.LTR);
+
+        if (!includeName) {
+            return gmtString;
         }
 
-        int hours = off / 60;
-        int minutes = off % 60;
+        // Optionally append the time zone name.
+        SimpleDateFormat zoneNameFormatter = new SimpleDateFormat("zzzz");
+        zoneNameFormatter.setTimeZone(tz);
+        String zoneNameString = zoneNameFormatter.format(now);
 
-        sb.append((char) ('0' + hours / 10));
-        sb.append((char) ('0' + hours % 10));
-
-        sb.append(':');
-
-        sb.append((char) ('0' + minutes / 10));
-        sb.append((char) ('0' + minutes % 10));
-
-        return sb;
+        // We don't use punctuation here to avoid having to worry about localizing that too!
+        return gmtString + " " + zoneNameString;
     }
 
     private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
diff --git a/src/com/android/settings/DateTimeSettingsSetupWizard.java b/src/com/android/settings/DateTimeSettingsSetupWizard.java
index 977d6c6..bb2c6da 100644
--- a/src/com/android/settings/DateTimeSettingsSetupWizard.java
+++ b/src/com/android/settings/DateTimeSettingsSetupWizard.java
@@ -121,7 +121,6 @@
         mSelectedTimeZone = tz;
         mTimeZoneButton = (Button)findViewById(R.id.time_zone_button);
         mTimeZoneButton.setText(tz.getDisplayName());
-        // mTimeZoneButton.setText(DateTimeSettings.getTimeZoneText(tz));
         mTimeZoneButton.setOnClickListener(this);
 
         final boolean autoDateTimeEnabled;
@@ -141,6 +140,7 @@
         mDatePicker = (DatePicker)findViewById(R.id.date_picker);
         mDatePicker.setEnabled(!autoDateTimeEnabled);
         mDatePicker.setCalendarViewShown(false);
+        DateTimeSettings.configureDatePicker(mDatePicker);
 
         mInputMethodManager = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
 
@@ -185,12 +185,12 @@
                 }
             }
             if (mAutoDateTimeButton != null) {
-                Settings.System.putInt(getContentResolver(), Settings.System.AUTO_TIME,
+                Settings.Global.putInt(getContentResolver(), Settings.Global.AUTO_TIME,
                       mAutoDateTimeButton.isChecked() ? 1 : 0);
                 if (!mAutoDateTimeButton.isChecked()) {
-                    DateTimeSettings.setDate(mDatePicker.getYear(), mDatePicker.getMonth(),
+                    DateTimeSettings.setDate(this, mDatePicker.getYear(), mDatePicker.getMonth(),
                             mDatePicker.getDayOfMonth());
-                    DateTimeSettings.setTime(
+                    DateTimeSettings.setTime(this,
                             mTimePicker.getCurrentHour(), mTimePicker.getCurrentMinute());
                 }
             }
@@ -209,8 +209,8 @@
         /*if (buttonView == mAutoTimeZoneButton) {
             // In XL screen, we save all the state only when the next button is pressed.
             if (!mUsingXLargeLayout) {
-                Settings.System.putInt(getContentResolver(),
-                        Settings.System.AUTO_TIME_ZONE,
+                Settings.Global.putInt(getContentResolver(),
+                        Settings.Global.AUTO_TIME_ZONE,
                         isChecked ? 1 : 0);
             }
             mTimeZone.setEnabled(!autoEnabled);
@@ -220,8 +220,8 @@
             }
         } else */
         if (buttonView == mAutoDateTimeButton) {
-            Settings.System.putInt(getContentResolver(),
-                    Settings.System.AUTO_TIME,
+            Settings.Global.putInt(getContentResolver(),
+                    Settings.Global.AUTO_TIME,
                     isChecked ? 1 : 0);
             mTimePicker.setEnabled(!autoEnabled);
             mDatePicker.setEnabled(!autoEnabled);
@@ -244,7 +244,6 @@
             if (mTimeZoneButton != null) {
                 mTimeZoneButton.setText(tz.getDisplayName());
             }
-            // mTimeZoneButton.setText(DateTimeSettings.getTimeZoneText(tz));
             mDatePicker.updateDate(now.get(Calendar.YEAR), now.get(Calendar.MONTH),
                     now.get(Calendar.DAY_OF_MONTH));
             mTimePicker.setCurrentHour(now.get(Calendar.HOUR_OF_DAY));
@@ -296,7 +295,7 @@
 
     private boolean isAutoDateTimeEnabled() {
         try {
-            return Settings.System.getInt(getContentResolver(), Settings.System.AUTO_TIME) > 0;
+            return Settings.Global.getInt(getContentResolver(), Settings.Global.AUTO_TIME) > 0;
         } catch (SettingNotFoundException e) {
             return true;
         }
@@ -305,8 +304,8 @@
     /*
     private boolean isAutoTimeZoneEnabled() {
         try {
-            return Settings.System.getInt(getContentResolver(),
-                    Settings.System.AUTO_TIME_ZONE) > 0;
+            return Settings.Global.getInt(getContentResolver(),
+                    Settings.Global.AUTO_TIME_ZONE) > 0;
         } catch (SettingNotFoundException e) {
             return true;
         }
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 46ffe83..f3a22ca 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -16,17 +16,14 @@
 
 package com.android.settings;
 
-import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
-
 import android.app.ActionBar;
 import android.app.Activity;
 import android.app.ActivityManagerNative;
-import android.app.ActivityThread;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.app.admin.DevicePolicyManager;
 import android.app.backup.IBackupManager;
+import android.bluetooth.BluetoothAdapter;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -34,54 +31,83 @@
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
+import android.hardware.usb.IUsbManager;
 import android.os.AsyncTask;
 import android.os.BatteryManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Parcel;
+import android.os.PowerManager;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.StrictMode;
 import android.os.SystemProperties;
-import android.os.Trace;
+import android.os.UserHandle;
 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;
+import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.util.Log;
 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 dalvik.system.VMRuntime;
+
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 
 /*
  * Displays preferences for application developers.
  */
-public class DevelopmentSettings extends PreferenceFragment
+public class DevelopmentSettings extends RestrictedSettingsFragment
         implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener,
                 OnPreferenceChangeListener, CompoundButton.OnCheckedChangeListener {
+    private static final String TAG = "DevelopmentSettings";
+
+    /**
+     * Preference file were development settings prefs are stored.
+     */
+    public static final String PREF_FILE = "development";
+
+    /**
+     * Whether to show the development settings to the user.  Default is false.
+     */
+    public static final String PREF_SHOW = "show";
 
     private static final String ENABLE_ADB = "enable_adb";
+    private static final String CLEAR_ADB_KEYS = "clear_adb_keys";
+    private static final String ENABLE_TERMINAL = "enable_terminal";
     private static final String KEEP_SCREEN_ON = "keep_screen_on";
+    private static final String BT_HCI_SNOOP_LOG = "bt_hci_snoop_log";
+    private static final String SELECT_RUNTIME_KEY = "select_runtime";
+    private static final String SELECT_RUNTIME_PROPERTY = "persist.sys.dalvik.vm.lib";
     private static final String ALLOW_MOCK_LOCATION = "allow_mock_location";
     private static final String HDCP_CHECKING_KEY = "hdcp_checking";
     private static final String HDCP_CHECKING_PROPERTY = "persist.sys.hdcp_checking";
-    private static final String ENFORCE_READ_EXTERNAL = "enforce_read_external";
     private static final String LOCAL_BACKUP_PASSWORD = "local_backup_password";
     private static final String HARDWARE_UI_PROPERTY = "persist.sys.ui.hw";
+    private static final String MSAA_PROPERTY = "debug.egl.force_msaa";
+    private static final String BUGREPORT = "bugreport";
+    private static final String BUGREPORT_IN_POWER_KEY = "bugreport_in_power";
+    private static final String OPENGL_TRACES_PROPERTY = "debug.egl.trace";
 
     private static final String DEBUG_APP_KEY = "debug_app";
     private static final String WAIT_FOR_DEBUGGER_KEY = "wait_for_debugger";
+    private static final String VERIFY_APPS_OVER_USB_KEY = "verify_apps_over_usb";
     private static final String STRICT_MODE_KEY = "strict_mode";
     private static final String POINTER_LOCATION_KEY = "pointer_location";
     private static final String SHOW_TOUCHES_KEY = "show_touches";
@@ -89,14 +115,23 @@
     private static final String DISABLE_OVERLAYS_KEY = "disable_overlays";
     private static final String SHOW_CPU_USAGE_KEY = "show_cpu_usage";
     private static final String FORCE_HARDWARE_UI_KEY = "force_hw_ui";
+    private static final String FORCE_MSAA_KEY = "force_msaa";
     private static final String TRACK_FRAME_TIME_KEY = "track_frame_time";
+    private static final String SHOW_NON_RECTANGULAR_CLIP_KEY = "show_non_rect_clip";
     private static final String SHOW_HW_SCREEN_UPDATES_KEY = "show_hw_screen_udpates";
+    private static final String SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_udpates";
+    private static final String DEBUG_HW_OVERDRAW_KEY = "debug_hw_overdraw";
     private static final String DEBUG_LAYOUT_KEY = "debug_layout";
+    private static final String FORCE_RTL_LAYOUT_KEY = "force_rtl_layout_all_locales";
     private static final String WINDOW_ANIMATION_SCALE_KEY = "window_animation_scale";
     private static final String TRANSITION_ANIMATION_SCALE_KEY = "transition_animation_scale";
     private static final String ANIMATOR_DURATION_SCALE_KEY = "animator_duration_scale";
+    private static final String OVERLAY_DISPLAY_DEVICES_KEY = "overlay_display_devices";
+    private static final String DEBUG_DEBUGGING_CATEGORY_KEY = "debug_debugging_category";
+    private static final String DEBUG_APPLICATIONS_CATEGORY_KEY = "debug_applications_category";
+    private static final String WIFI_DISPLAY_CERTIFICATION_KEY = "wifi_display_certification";
 
-    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";
@@ -106,6 +141,10 @@
 
     private static final String TAG_CONFIRM_ENFORCE = "confirm_enforce";
 
+    private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
+
+    private static final String TERMINAL_APP_PACKAGE = "com.android.terminal";
+
     private static final int RESULT_DEBUG_APP = 1000;
 
     private IWindowManager mWindowManager;
@@ -118,14 +157,20 @@
     private boolean mDontPokeProperties;
 
     private CheckBoxPreference mEnableAdb;
+    private Preference mClearAdbKeys;
+    private CheckBoxPreference mEnableTerminal;
+    private Preference mBugreport;
+    private CheckBoxPreference mBugreportInPower;
     private CheckBoxPreference mKeepScreenOn;
-    private CheckBoxPreference mEnforceReadExternal;
+    private CheckBoxPreference mBtHciSnoopLog;
     private CheckBoxPreference mAllowMockLocation;
     private PreferenceScreen mPassword;
 
     private String mDebugApp;
     private Preference mDebugAppPref;
     private CheckBoxPreference mWaitForDebugger;
+    private CheckBoxPreference mVerifyAppsOverUsb;
+    private CheckBoxPreference mWifiDisplayCertification;
 
     private CheckBoxPreference mStrictMode;
     private CheckBoxPreference mPointerLocation;
@@ -134,13 +179,19 @@
     private CheckBoxPreference mDisableOverlays;
     private CheckBoxPreference mShowCpuUsage;
     private CheckBoxPreference mForceHardwareUi;
-    private CheckBoxPreference mTrackFrameTime;
+    private CheckBoxPreference mForceMsaa;
     private CheckBoxPreference mShowHwScreenUpdates;
+    private CheckBoxPreference mShowHwLayersUpdates;
     private CheckBoxPreference mDebugLayout;
+    private CheckBoxPreference mForceRtlLayout;
+    private ListPreference mDebugHwOverdraw;
+    private ListPreference mTrackFrameTime;
+    private ListPreference mShowNonRectClip;
     private ListPreference mWindowAnimationScale;
     private ListPreference mTransitionAnimationScale;
     private ListPreference mAnimatorDurationScale;
-    private MultiCheckPreference mEnableTracesPref;
+    private ListPreference mOverlayDisplayDevices;
+    private ListPreference mOpenGLTraces;
 
     private CheckBoxPreference mImmediatelyDestroyActivities;
     private ListPreference mAppProcessLimit;
@@ -157,6 +208,13 @@
     private boolean mDialogClicked;
     private Dialog mEnableDialog;
     private Dialog mAdbDialog;
+    private Dialog mAdbKeysDialog;
+
+    private boolean mUnavailable;
+
+    public DevelopmentSettings() {
+        super(RESTRICTIONS_PIN_SET);
+    }
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -167,18 +225,56 @@
                 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);
 
+        final PreferenceGroup debugDebuggingCategory = (PreferenceGroup)
+                findPreference(DEBUG_DEBUGGING_CATEGORY_KEY);
+
         mEnableAdb = findAndInitCheckboxPref(ENABLE_ADB);
+        mClearAdbKeys = findPreference(CLEAR_ADB_KEYS);
+        if (!SystemProperties.getBoolean("ro.adb.secure", false)) {
+            if (debugDebuggingCategory != null) {
+                debugDebuggingCategory.removePreference(mClearAdbKeys);
+            }
+        }
+        mEnableTerminal = findAndInitCheckboxPref(ENABLE_TERMINAL);
+        if (!isPackageInstalled(getActivity(), TERMINAL_APP_PACKAGE)) {
+            debugDebuggingCategory.removePreference(mEnableTerminal);
+            mEnableTerminal = null;
+        }
+
+        mBugreport = findPreference(BUGREPORT);
+        mBugreportInPower = findAndInitCheckboxPref(BUGREPORT_IN_POWER_KEY);
         mKeepScreenOn = findAndInitCheckboxPref(KEEP_SCREEN_ON);
-        mEnforceReadExternal = findAndInitCheckboxPref(ENFORCE_READ_EXTERNAL);
+        mBtHciSnoopLog = findAndInitCheckboxPref(BT_HCI_SNOOP_LOG);
         mAllowMockLocation = findAndInitCheckboxPref(ALLOW_MOCK_LOCATION);
         mPassword = (PreferenceScreen) findPreference(LOCAL_BACKUP_PASSWORD);
         mAllPrefs.add(mPassword);
 
+        if (!android.os.Process.myUserHandle().equals(UserHandle.OWNER)) {
+            disableForUser(mEnableAdb);
+            disableForUser(mClearAdbKeys);
+            disableForUser(mEnableTerminal);
+            disableForUser(mPassword);
+        }
+
         mDebugAppPref = findPreference(DEBUG_APP_KEY);
         mAllPrefs.add(mDebugAppPref);
         mWaitForDebugger = findAndInitCheckboxPref(WAIT_FOR_DEBUGGER_KEY);
+        mVerifyAppsOverUsb = findAndInitCheckboxPref(VERIFY_APPS_OVER_USB_KEY);
+        if (!showVerifierSetting()) {
+            if (debugDebuggingCategory != null) {
+                debugDebuggingCategory.removePreference(mVerifyAppsOverUsb);
+            } else {
+                mVerifyAppsOverUsb.setEnabled(false);
+            }
+        }
         mStrictMode = findAndInitCheckboxPref(STRICT_MODE_KEY);
         mPointerLocation = findAndInitCheckboxPref(POINTER_LOCATION_KEY);
         mShowTouches = findAndInitCheckboxPref(SHOW_TOUCHES_KEY);
@@ -186,46 +282,57 @@
         mDisableOverlays = findAndInitCheckboxPref(DISABLE_OVERLAYS_KEY);
         mShowCpuUsage = findAndInitCheckboxPref(SHOW_CPU_USAGE_KEY);
         mForceHardwareUi = findAndInitCheckboxPref(FORCE_HARDWARE_UI_KEY);
-        mTrackFrameTime = findAndInitCheckboxPref(TRACK_FRAME_TIME_KEY);
+        mForceMsaa = findAndInitCheckboxPref(FORCE_MSAA_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);
         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);
-        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);
+        mForceRtlLayout = findAndInitCheckboxPref(FORCE_RTL_LAYOUT_KEY);
+        mDebugHwOverdraw = addListPreference(DEBUG_HW_OVERDRAW_KEY);
+        mWifiDisplayCertification = findAndInitCheckboxPref(WIFI_DISPLAY_CERTIFICATION_KEY);
+        mWindowAnimationScale = addListPreference(WINDOW_ANIMATION_SCALE_KEY);
+        mTransitionAnimationScale = addListPreference(TRANSITION_ANIMATION_SCALE_KEY);
+        mAnimatorDurationScale = addListPreference(ANIMATOR_DURATION_SCALE_KEY);
+        mOverlayDisplayDevices = addListPreference(OVERLAY_DISPLAY_DEVICES_KEY);
+        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);
 
+        Preference selectRuntime = findPreference(SELECT_RUNTIME_KEY);
+        if (selectRuntime != null) {
+            mAllPrefs.add(selectRuntime);
+            filterRuntimeOptions(selectRuntime);
+        }
+
         Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
         if (hdcpChecking != null) {
             mAllPrefs.add(hdcpChecking);
+            removePreferenceForProduction(hdcpChecking);
         }
-        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);
+            mDisabledPrefs.add(pref);
+        }
     }
 
     private CheckBoxPreference findAndInitCheckboxPref(String key) {
@@ -247,7 +354,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);
     }
 
@@ -260,7 +371,7 @@
         activity.getActionBar().setCustomView(mEnabledSwitch, new ActionBar.LayoutParams(
                 ActionBar.LayoutParams.WRAP_CONTENT,
                 ActionBar.LayoutParams.WRAP_CONTENT,
-                Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+                Gravity.CENTER_VERTICAL | Gravity.END));
     }
 
     @Override
@@ -271,15 +382,17 @@
         activity.getActionBar().setCustomView(null);
     }
 
-    private void removeHdcpOptionsForProduction() {
+    private boolean removePreferenceForProduction(Preference preference) {
         if ("user".equals(Build.TYPE)) {
-            Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
-            if (hdcpChecking != null) {
-                // Remove the preference
-                getPreferenceScreen().removePreference(hdcpChecking);
-                mAllPrefs.remove(hdcpChecking);
-            }
+            removePreference(preference);
+            return true;
         }
+        return false;
+    }
+
+    private void removePreference(Preference preference) {
+        getPreferenceScreen().removePreference(preference);
+        mAllPrefs.remove(preference);
     }
 
     private void setPrefsEnabledState(boolean enabled) {
@@ -294,6 +407,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
@@ -305,8 +428,8 @@
         }
 
         final ContentResolver cr = getActivity().getContentResolver();
-        mLastEnabledState = Settings.Secure.getInt(cr,
-                Settings.Secure.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
+        mLastEnabledState = Settings.Global.getInt(cr,
+                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
         mEnabledSwitch.setChecked(mLastEnabledState);
         setPrefsEnabledState(mLastEnabledState);
 
@@ -315,9 +438,10 @@
             // settings that are enabled.  This is an invalid state.  Switch
             // to debug settings being enabled, so the user knows there is
             // stuff enabled and can turn it all off if they want.
-            Settings.Secure.putInt(getActivity().getContentResolver(),
-                    Settings.Secure.DEVELOPMENT_SETTINGS_ENABLED, 1);
+            Settings.Global.putInt(getActivity().getContentResolver(),
+                    Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
             mLastEnabledState = true;
+            mEnabledSwitch.setChecked(mLastEnabledState);
             setPrefsEnabledState(mLastEnabledState);
         }
     }
@@ -331,13 +455,22 @@
         final Context context = getActivity();
         final ContentResolver cr = context.getContentResolver();
         mHaveDebugSettings = false;
-        updateCheckBox(mEnableAdb, Settings.Secure.getInt(cr,
-                Settings.Secure.ADB_ENABLED, 0) != 0);
-        updateCheckBox(mKeepScreenOn, Settings.System.getInt(cr,
-                Settings.System.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
-        updateCheckBox(mEnforceReadExternal, isPermissionEnforced(context, READ_EXTERNAL_STORAGE));
+        updateCheckBox(mEnableAdb, Settings.Global.getInt(cr,
+                Settings.Global.ADB_ENABLED, 0) != 0);
+        if (mEnableTerminal != null) {
+            updateCheckBox(mEnableTerminal,
+                    context.getPackageManager().getApplicationEnabledSetting(TERMINAL_APP_PACKAGE)
+                    == PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
+        }
+        updateCheckBox(mBugreportInPower, Settings.Secure.getInt(cr,
+                Settings.Secure.BUGREPORT_IN_POWER_MENU, 0) != 0);
+        updateCheckBox(mKeepScreenOn, Settings.Global.getInt(cr,
+                Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
+        updateCheckBox(mBtHciSnoopLog, Settings.Secure.getInt(cr,
+                Settings.Secure.BLUETOOTH_HCI_LOG, 0) != 0);
         updateCheckBox(mAllowMockLocation, Settings.Secure.getInt(cr,
                 Settings.Secure.ALLOW_MOCK_LOCATION, 0) != 0);
+        updateRuntimeValue();
         updateHdcpValues();
         updatePasswordSummary();
         updateDebuggerOptions();
@@ -347,14 +480,23 @@
         updateFlingerOptions();
         updateCpuUsageOptions();
         updateHardwareUiOptions();
+        updateMsaaOptions();
         updateTrackFrameTimeOptions();
+        updateShowNonRectClipOptions();
         updateShowHwScreenUpdatesOptions();
+        updateShowHwLayersUpdatesOptions();
+        updateDebugHwOverdrawOptions();
         updateDebugLayoutOptions();
         updateAnimationScaleOptions();
-        updateEnableTracesOptions();
+        updateOverlayDisplayDevicesOptions();
+        updateOpenGLTracesOptions();
         updateImmediatelyDestroyActivitiesOptions();
         updateAppProcessLimitOptions();
         updateShowAllANRsOptions();
+        updateVerifyAppsOverUsbOptions();
+        updateBugreportOptions();
+        updateForceRtlOptions();
+        updateWifiDisplayCertificationOptions();
     }
 
     private void resetDangerousOptions() {
@@ -370,7 +512,7 @@
         writeAnimationScaleOption(0, mWindowAnimationScale, null);
         writeAnimationScaleOption(1, mTransitionAnimationScale, null);
         writeAnimationScaleOption(2, mAnimatorDurationScale, null);
-        writeEnableTracesOptions(0);
+        writeOverlayDisplayDevicesOptions(null);
         writeAppProcessLimitOptions(null);
         mHaveDebugSettings = false;
         updateAllOptions();
@@ -378,13 +520,60 @@
         pokeSystemProperties();
     }
 
+    void filterRuntimeOptions(Preference selectRuntime) {
+        ListPreference pref = (ListPreference) selectRuntime;
+        ArrayList<String> validValues = new ArrayList<String>();
+        ArrayList<String> validSummaries = new ArrayList<String>();
+        String[] values = getResources().getStringArray(R.array.select_runtime_values);
+        String[] summaries = getResources().getStringArray(R.array.select_runtime_summaries);
+        for (int i = 0; i < values.length; i++) {
+            String value = values[i];
+            String summary = summaries[i];
+            if (new File("/system/lib/" + value).exists()) {
+                validValues.add(value);
+                validSummaries.add(summary);
+            }
+        }
+        int count = validValues.size();
+        if (count <= 1) {
+            // no choices, so remove preference
+            removePreference(selectRuntime);
+        } else {
+            pref.setEntryValues(validValues.toArray(new String[count]));
+            pref.setEntries(validSummaries.toArray(new String[count]));
+        }
+    }
+
+    private String currentRuntimeValue() {
+        return SystemProperties.get(SELECT_RUNTIME_PROPERTY, VMRuntime.getRuntime().vmLibrary());
+    }
+
+    private void updateRuntimeValue() {
+        ListPreference selectRuntime = (ListPreference) findPreference(SELECT_RUNTIME_KEY);
+        if (selectRuntime != null) {
+            String currentValue = currentRuntimeValue();
+            String[] values = getResources().getStringArray(R.array.select_runtime_values);
+            String[] summaries = getResources().getStringArray(R.array.select_runtime_summaries);
+            int index = 0;
+            for (int i = 0; i < values.length; i++) {
+                if (currentValue.equals(values[i])) {
+                    index = i;
+                    break;
+                }
+            }
+            selectRuntime.setValue(values[index]);
+            selectRuntime.setSummary(summaries[index]);
+            selectRuntime.setOnPreferenceChangeListener(this);
+        }
+    }
+
     private void updateHdcpValues() {
-        int index = 1; // Defaults to drm-only. Needs to match with R.array.hdcp_checking_values
         ListPreference hdcpChecking = (ListPreference) findPreference(HDCP_CHECKING_KEY);
         if (hdcpChecking != null) {
             String currentValue = SystemProperties.get(HDCP_CHECKING_PROPERTY);
             String[] values = getResources().getStringArray(R.array.hdcp_checking_values);
             String[] summaries = getResources().getStringArray(R.array.hdcp_checking_summaries);
+            int index = 1; // Defaults to drm-only. Needs to match with R.array.hdcp_checking_values
             for (int i = 0; i < values.length; i++) {
                 if (currentValue.equals(values[i])) {
                     index = i;
@@ -409,6 +598,14 @@
         }
     }
 
+    private void writeBtHciSnoopLogOptions() {
+        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        adapter.configHciSnoopLog(mBtHciSnoopLog.isChecked());
+        Settings.Secure.putInt(getActivity().getContentResolver(),
+                Settings.Secure.BLUETOOTH_HCI_LOG,
+                mBtHciSnoopLog.isChecked() ? 1 : 0);
+    }
+
     private void writeDebuggerOptions() {
         try {
             ActivityManagerNative.getDefault().setDebugApp(
@@ -426,10 +623,10 @@
     }
 
     private void updateDebuggerOptions() {
-        mDebugApp = Settings.System.getString(
-                getActivity().getContentResolver(), Settings.System.DEBUG_APP);
-        updateCheckBox(mWaitForDebugger, Settings.System.getInt(
-                getActivity().getContentResolver(), Settings.System.WAIT_FOR_DEBUGGER, 0) != 0);
+        mDebugApp = Settings.Global.getString(
+                getActivity().getContentResolver(), Settings.Global.DEBUG_APP);
+        updateCheckBox(mWaitForDebugger, Settings.Global.getInt(
+                getActivity().getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER, 0) != 0);
         if (mDebugApp != null && mDebugApp.length() > 0) {
             String label;
             try {
@@ -449,6 +646,61 @@
         }
     }
 
+    private void updateVerifyAppsOverUsbOptions() {
+        updateCheckBox(mVerifyAppsOverUsb, Settings.Global.getInt(getActivity().getContentResolver(),
+                Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1) != 0);
+        mVerifyAppsOverUsb.setEnabled(enableVerifierSetting());
+    }
+
+    private void writeVerifyAppsOverUsbOptions() {
+        Settings.Global.putInt(getActivity().getContentResolver(),
+              Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, mVerifyAppsOverUsb.isChecked() ? 1 : 0);
+    }
+
+    private boolean enableVerifierSetting() {
+        final ContentResolver cr = getActivity().getContentResolver();
+        if (Settings.Global.getInt(cr, Settings.Global.ADB_ENABLED, 0) == 0) {
+            return false;
+        }
+        if (Settings.Global.getInt(cr, Settings.Global.PACKAGE_VERIFIER_ENABLE, 1) == 0) {
+            return false;
+        } else {
+            final PackageManager pm = getActivity().getPackageManager();
+            final Intent verification = new Intent(Intent.ACTION_PACKAGE_NEEDS_VERIFICATION);
+            verification.setType(PACKAGE_MIME_TYPE);
+            verification.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            final List<ResolveInfo> receivers = pm.queryBroadcastReceivers(verification, 0);
+            if (receivers.size() == 0) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private boolean showVerifierSetting() {
+        return Settings.Global.getInt(getActivity().getContentResolver(),
+                Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 1) > 0;
+    }
+
+    private void updateBugreportOptions() {
+        if ("user".equals(Build.TYPE)) {
+            final ContentResolver resolver = getActivity().getContentResolver();
+            final boolean adbEnabled = Settings.Global.getInt(
+                    resolver, Settings.Global.ADB_ENABLED, 0) != 0;
+            if (adbEnabled) {
+                mBugreport.setEnabled(true);
+                mBugreportInPower.setEnabled(true);
+            } else {
+                mBugreport.setEnabled(false);
+                mBugreportInPower.setEnabled(false);
+                mBugreportInPower.setChecked(false);
+                Settings.Secure.putInt(resolver, Settings.Secure.BUGREPORT_IN_POWER_MENU, 0);
+            }
+        } else {
+            mBugreportInPower.setEnabled(true);
+        }
+    }
+
     // Returns the current state of the system property that controls
     // strictmode flashes.  One of:
     //    0: not explicitly set one way or another
@@ -526,7 +778,7 @@
             if (flinger != null) {
                 Parcel data = Parcel.obtain();
                 data.writeInterfaceToken("android.ui.ISurfaceComposer");
-                final int showUpdates = mShowScreenUpdates.isChecked() ? 1 : 0; 
+                final int showUpdates = mShowScreenUpdates.isChecked() ? 1 : 0;
                 data.writeInt(showUpdates);
                 flinger.transact(1002, data, null, 0);
                 data.recycle();
@@ -543,7 +795,7 @@
             if (flinger != null) {
                 Parcel data = Parcel.obtain();
                 data.writeInterfaceToken("android.ui.ISurfaceComposer");
-                final int disableOverlays = mDisableOverlays.isChecked() ? 1 : 0; 
+                final int disableOverlays = mDisableOverlays.isChecked() ? 1 : 0;
                 data.writeInt(disableOverlays);
                 flinger.transact(1008, data, null, 0);
                 data.recycle();
@@ -557,23 +809,72 @@
     private void updateHardwareUiOptions() {
         updateCheckBox(mForceHardwareUi, SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false));
     }
-    
+
     private void writeHardwareUiOptions() {
         SystemProperties.set(HARDWARE_UI_PROPERTY, mForceHardwareUi.isChecked() ? "true" : "false");
         pokeSystemProperties();
     }
 
-    private void updateTrackFrameTimeOptions() {
-        updateCheckBox(mTrackFrameTime,
-                SystemProperties.getBoolean(HardwareRenderer.PROFILE_PROPERTY, false));
+    private void updateMsaaOptions() {
+        updateCheckBox(mForceMsaa, SystemProperties.getBoolean(MSAA_PROPERTY, false));
     }
 
-    private void writeTrackFrameTimeOptions() {
-        SystemProperties.set(HardwareRenderer.PROFILE_PROPERTY,
-                mTrackFrameTime.isChecked() ? "true" : "false");
+    private void writeMsaaOptions() {
+        SystemProperties.set(MSAA_PROPERTY, mForceMsaa.isChecked() ? "true" : "false");
         pokeSystemProperties();
     }
 
+    private void updateTrackFrameTimeOptions() {
+        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(Object newValue) {
+        SystemProperties.set(HardwareRenderer.PROFILE_PROPERTY,
+                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() {
         updateCheckBox(mShowHwScreenUpdates,
                 SystemProperties.getBoolean(HardwareRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false));
@@ -581,10 +882,46 @@
 
     private void writeShowHwScreenUpdatesOptions() {
         SystemProperties.set(HardwareRenderer.DEBUG_DIRTY_REGIONS_PROPERTY,
-                mShowHwScreenUpdates.isChecked() ? "true" : "false");
+                mShowHwScreenUpdates.isChecked() ? "true" : null);
         pokeSystemProperties();
     }
 
+    private void updateShowHwLayersUpdatesOptions() {
+        updateCheckBox(mShowHwLayersUpdates, SystemProperties.getBoolean(
+                HardwareRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false));
+    }
+
+    private void writeShowHwLayersUpdatesOptions() {
+        SystemProperties.set(HardwareRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY,
+                mShowHwLayersUpdates.isChecked() ? "true" : null);
+        pokeSystemProperties();
+    }
+
+    private void updateDebugHwOverdrawOptions() {
+        String value = SystemProperties.get(HardwareRenderer.DEBUG_OVERDRAW_PROPERTY);
+        if (value == null) {
+            value = "";
+        }
+
+        CharSequence[] values = mDebugHwOverdraw.getEntryValues();
+        for (int i = 0; i < values.length; i++) {
+            if (value.contentEquals(values[i])) {
+                mDebugHwOverdraw.setValueIndex(i);
+                mDebugHwOverdraw.setSummary(mDebugHwOverdraw.getEntries()[i]);
+                return;
+            }
+        }
+        mDebugHwOverdraw.setValueIndex(0);
+        mDebugHwOverdraw.setSummary(mDebugHwOverdraw.getEntries()[0]);
+    }
+
+    private void writeDebugHwOverdrawOptions(Object newValue) {
+        SystemProperties.set(HardwareRenderer.DEBUG_OVERDRAW_PROPERTY,
+                newValue == null ? "" : newValue.toString());
+        pokeSystemProperties();
+        updateDebugHwOverdrawOptions();
+    }
+
     private void updateDebugLayoutOptions() {
         updateCheckBox(mDebugLayout,
                 SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false));
@@ -596,15 +933,40 @@
         pokeSystemProperties();
     }
 
-    private void updateCpuUsageOptions() {
-        updateCheckBox(mShowCpuUsage, Settings.System.getInt(getActivity().getContentResolver(),
-                Settings.System.SHOW_PROCESSES, 0) != 0);
+    private void updateForceRtlOptions() {
+        updateCheckBox(mForceRtlLayout, Settings.Global.getInt(getActivity().getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RTL, 0) != 0);
     }
-    
+
+    private void writeForceRtlOptions() {
+        boolean value = mForceRtlLayout.isChecked();
+        Settings.Global.putInt(getActivity().getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RTL, value ? 1 : 0);
+        SystemProperties.set(Settings.Global.DEVELOPMENT_FORCE_RTL, value ? "1" : "0");
+        LocalePicker.updateLocale(getActivity().getResources().getConfiguration().locale);
+    }
+
+    private void updateWifiDisplayCertificationOptions() {
+        updateCheckBox(mWifiDisplayCertification, Settings.Global.getInt(
+                getActivity().getContentResolver(),
+                Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, 0) != 0);
+    }
+
+    private void writeWifiDisplayCertificationOptions() {
+        Settings.Global.putInt(getActivity().getContentResolver(),
+                Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON,
+                mWifiDisplayCertification.isChecked() ? 1 : 0);
+    }
+
+    private void updateCpuUsageOptions() {
+        updateCheckBox(mShowCpuUsage, Settings.Global.getInt(getActivity().getContentResolver(),
+                Settings.Global.SHOW_PROCESSES, 0) != 0);
+    }
+
     private void writeCpuUsageOptions() {
         boolean value = mShowCpuUsage.isChecked();
-        Settings.System.putInt(getActivity().getContentResolver(),
-                Settings.System.SHOW_PROCESSES, value ? 1 : 0);
+        Settings.Global.putInt(getActivity().getContentResolver(),
+                Settings.Global.SHOW_PROCESSES, value ? 1 : 0);
         Intent service = (new Intent())
                 .setClassName("com.android.systemui", "com.android.systemui.LoadAverageService");
         if (value) {
@@ -623,8 +985,8 @@
     }
 
     private void updateImmediatelyDestroyActivitiesOptions() {
-        updateCheckBox(mImmediatelyDestroyActivities, Settings.System.getInt(
-            getActivity().getContentResolver(), Settings.System.ALWAYS_FINISH_ACTIVITIES, 0) != 0);
+        updateCheckBox(mImmediatelyDestroyActivities, Settings.Global.getInt(
+            getActivity().getContentResolver(), Settings.Global.ALWAYS_FINISH_ACTIVITIES, 0) != 0);
     }
 
     private void updateAnimationScaleValue(int which, ListPreference pref) {
@@ -663,6 +1025,55 @@
         }
     }
 
+    private void updateOverlayDisplayDevicesOptions() {
+        String value = Settings.Global.getString(getActivity().getContentResolver(),
+                Settings.Global.OVERLAY_DISPLAY_DEVICES);
+        if (value == null) {
+            value = "";
+        }
+
+        CharSequence[] values = mOverlayDisplayDevices.getEntryValues();
+        for (int i = 0; i < values.length; i++) {
+            if (value.contentEquals(values[i])) {
+                mOverlayDisplayDevices.setValueIndex(i);
+                mOverlayDisplayDevices.setSummary(mOverlayDisplayDevices.getEntries()[i]);
+                return;
+            }
+        }
+        mOverlayDisplayDevices.setValueIndex(0);
+        mOverlayDisplayDevices.setSummary(mOverlayDisplayDevices.getEntries()[0]);
+    }
+
+    private void writeOverlayDisplayDevicesOptions(Object newValue) {
+        Settings.Global.putString(getActivity().getContentResolver(),
+                Settings.Global.OVERLAY_DISPLAY_DEVICES, (String)newValue);
+        updateOverlayDisplayDevicesOptions();
+    }
+
+    private void updateOpenGLTracesOptions() {
+        String value = SystemProperties.get(OPENGL_TRACES_PROPERTY);
+        if (value == null) {
+            value = "";
+        }
+
+        CharSequence[] values = mOpenGLTraces.getEntryValues();
+        for (int i = 0; i < values.length; i++) {
+            if (value.contentEquals(values[i])) {
+                mOpenGLTraces.setValueIndex(i);
+                mOpenGLTraces.setSummary(mOpenGLTraces.getEntries()[i]);
+                return;
+            }
+        }
+        mOpenGLTraces.setValueIndex(0);
+        mOpenGLTraces.setSummary(mOpenGLTraces.getEntries()[0]);
+    }
+
+    private void writeOpenGLTracesOptions(Object newValue) {
+        SystemProperties.set(OPENGL_TRACES_PROPERTY, newValue == null ? "" : newValue.toString());
+        pokeSystemProperties();
+        updateOpenGLTracesOptions();
+    }
+
     private void updateAppProcessLimitOptions() {
         try {
             int limit = ActivityManagerNative.getDefault().getProcessLimit();
@@ -704,48 +1115,6 @@
             getActivity().getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0);
     }
 
-    private void updateEnableTracesOptions() {
-        String strValue = SystemProperties.get(Trace.PROPERTY_TRACE_TAG_ENABLEFLAGS);
-        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 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;
-            }
-        }
-        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
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         if (buttonView == mEnabledSwitch) {
@@ -764,8 +1133,8 @@
                     mEnableDialog.setOnDismissListener(this);
                 } else {
                     resetDangerousOptions();
-                    Settings.Secure.putInt(getActivity().getContentResolver(),
-                            Settings.Secure.DEVELOPMENT_SETTINGS_ENABLED, 0);
+                    Settings.Global.putInt(getActivity().getContentResolver(),
+                            Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
                     mLastEnabledState = isChecked;
                     setPrefsEnabledState(mLastEnabledState);
                 }
@@ -788,7 +1157,6 @@
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-
         if (Utils.isMonkeyRunning()) {
             return false;
         }
@@ -806,20 +1174,35 @@
                         .show();
                 mAdbDialog.setOnDismissListener(this);
             } else {
-                Settings.Secure.putInt(getActivity().getContentResolver(),
-                        Settings.Secure.ADB_ENABLED, 0);
+                Settings.Global.putInt(getActivity().getContentResolver(),
+                        Settings.Global.ADB_ENABLED, 0);
+                mVerifyAppsOverUsb.setEnabled(false);
+                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 == mEnableTerminal) {
+            final PackageManager pm = getActivity().getPackageManager();
+            pm.setApplicationEnabledSetting(TERMINAL_APP_PACKAGE,
+                    mEnableTerminal.isChecked() ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                            : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0);
+        } else if (preference == mBugreportInPower) {
+            Settings.Secure.putInt(getActivity().getContentResolver(),
+                    Settings.Secure.BUGREPORT_IN_POWER_MENU,
+                    mBugreportInPower.isChecked() ? 1 : 0);
         } else if (preference == mKeepScreenOn) {
-            Settings.System.putInt(getActivity().getContentResolver(),
-                    Settings.System.STAY_ON_WHILE_PLUGGED_IN, 
-                    mKeepScreenOn.isChecked() ? 
+            Settings.Global.putInt(getActivity().getContentResolver(),
+                    Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
+                    mKeepScreenOn.isChecked() ?
                     (BatteryManager.BATTERY_PLUGGED_AC | BatteryManager.BATTERY_PLUGGED_USB) : 0);
-        } else if (preference == mEnforceReadExternal) {
-            if (mEnforceReadExternal.isChecked()) {
-                ConfirmEnforceFragment.show(this);
-            } else {
-                setPermissionEnforced(getActivity(), READ_EXTERNAL_STORAGE, false);
-            }
+        } else if (preference == mBtHciSnoopLog) {
+            writeBtHciSnoopLogOptions();
         } else if (preference == mAllowMockLocation) {
             Settings.Secure.putInt(getActivity().getContentResolver(),
                     Settings.Secure.ALLOW_MOCK_LOCATION,
@@ -828,6 +1211,8 @@
             startActivityForResult(new Intent(getActivity(), AppPicker.class), RESULT_DEBUG_APP);
         } else if (preference == mWaitForDebugger) {
             writeDebuggerOptions();
+        } else if (preference == mVerifyAppsOverUsb) {
+            writeVerifyAppsOverUsbOptions();
         } else if (preference == mStrictMode) {
             writeStrictModeVisualOptions();
         } else if (preference == mPointerLocation) {
@@ -846,12 +1231,20 @@
             writeShowAllANRsOptions();
         } else if (preference == mForceHardwareUi) {
             writeHardwareUiOptions();
-        } else if (preference == mTrackFrameTime) {
-            writeTrackFrameTimeOptions();
+        } else if (preference == mForceMsaa) {
+            writeMsaaOptions();
         } else if (preference == mShowHwScreenUpdates) {
             writeShowHwScreenUpdatesOptions();
+        } else if (preference == mShowHwLayersUpdates) {
+            writeShowHwLayersUpdatesOptions();
         } else if (preference == mDebugLayout) {
             writeDebugLayoutOptions();
+        } else if (preference == mForceRtlLayout) {
+            writeForceRtlOptions();
+        } else if (preference == mWifiDisplayCertification) {
+            writeWifiDisplayCertificationOptions();
+        } else {
+            return super.onPreferenceTreeClick(preferenceScreen, preference);
         }
 
         return false;
@@ -859,7 +1252,34 @@
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (HDCP_CHECKING_KEY.equals(preference.getKey())) {
+        if (SELECT_RUNTIME_KEY.equals(preference.getKey())) {
+            final String oldRuntimeValue = VMRuntime.getRuntime().vmLibrary();
+            final String newRuntimeValue = newValue.toString();
+            if (!newRuntimeValue.equals(oldRuntimeValue)) {
+                final Context context = getActivity();
+                final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+                builder.setMessage(context.getResources().getString(R.string.select_runtime_warning_message,
+                                                                    oldRuntimeValue, newRuntimeValue));
+                builder.setPositiveButton(android.R.string.ok, new OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        SystemProperties.set(SELECT_RUNTIME_PROPERTY, newRuntimeValue);
+                        pokeSystemProperties();
+                        PowerManager pm = (PowerManager)
+                                context.getSystemService(Context.POWER_SERVICE);
+                        pm.reboot(null);
+                    }
+                });
+                builder.setNegativeButton(android.R.string.cancel, new OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        updateRuntimeValue();
+                    }
+                });
+                builder.show();
+            }
+            return true;
+        } else if (HDCP_CHECKING_KEY.equals(preference.getKey())) {
             SystemProperties.set(HDCP_CHECKING_PROPERTY, newValue.toString());
             updateHdcpValues();
             pokeSystemProperties();
@@ -873,8 +1293,20 @@
         } else if (preference == mAnimatorDurationScale) {
             writeAnimationScaleOption(2, mAnimatorDurationScale, newValue);
             return true;
-        } else if (preference == mEnableTracesPref) {
-            writeEnableTracesOptions();
+        } else if (preference == mOverlayDisplayDevices) {
+            writeOverlayDisplayDevicesOptions(newValue);
+            return true;
+        } else if (preference == mOpenGLTraces) {
+            writeOpenGLTracesOptions(newValue);
+            return true;
+        } else if (preference == mTrackFrameTime) {
+            writeTrackFrameTimeOptions(newValue);
+            return true;
+        } else if (preference == mDebugHwOverdraw) {
+            writeDebugHwOverdrawOptions(newValue);
+            return true;
+        } else if (preference == mShowNonRectClip) {
+            writeShowNonRectClipOptions(newValue);
             return true;
         } else if (preference == mAppProcessLimit) {
             writeAppProcessLimitOptions(newValue);
@@ -888,6 +1320,10 @@
             mAdbDialog.dismiss();
             mAdbDialog = null;
         }
+        if (mAdbKeysDialog != null) {
+            mAdbKeysDialog.dismiss();
+            mAdbKeysDialog = null;
+        }
         if (mEnableDialog != null) {
             mEnableDialog.dismiss();
             mEnableDialog = null;
@@ -898,17 +1334,30 @@
         if (dialog == mAdbDialog) {
             if (which == DialogInterface.BUTTON_POSITIVE) {
                 mDialogClicked = true;
-                Settings.Secure.putInt(getActivity().getContentResolver(),
-                        Settings.Secure.ADB_ENABLED, 1);
+                Settings.Global.putInt(getActivity().getContentResolver(),
+                        Settings.Global.ADB_ENABLED, 1);
+                mVerifyAppsOverUsb.setEnabled(true);
+                updateVerifyAppsOverUsbOptions();
+                updateBugreportOptions();
             } else {
                 // 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;
-                Settings.Secure.putInt(getActivity().getContentResolver(),
-                        Settings.Secure.DEVELOPMENT_SETTINGS_ENABLED, 1);
+                Settings.Global.putInt(getActivity().getContentResolver(),
+                        Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
                 mLastEnabledState = true;
                 setPrefsEnabledState(mLastEnabledState);
             } else {
@@ -941,6 +1390,7 @@
 
     void pokeSystemProperties() {
         if (!mDontPokeProperties) {
+            //noinspection unchecked
             (new SystemPropPoker()).execute();
         }
     }
@@ -961,6 +1411,9 @@
                     try {
                         obj.transact(IBinder.SYSPROPS_TRANSACTION, data, null, 0);
                     } catch (RemoteException e) {
+                    } catch (Exception e) {
+                        Log.i(TAG, "Someone wrote a bad service '" + service
+                                + "' that doesn't like to be poked: " + e);
                     }
                     data.recycle();
                 }
@@ -969,58 +1422,11 @@
         }
     }
 
-    /**
-     * Dialog to confirm enforcement of {@link #READ_EXTERNAL_STORAGE}.
-     */
-    public static class ConfirmEnforceFragment extends DialogFragment {
-        public static void show(DevelopmentSettings parent) {
-            final ConfirmEnforceFragment dialog = new ConfirmEnforceFragment();
-            dialog.setTargetFragment(parent, 0);
-            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_ENFORCE);
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            final Context context = getActivity();
-
-            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
-            builder.setTitle(R.string.enforce_read_external_confirm_title);
-            builder.setMessage(R.string.enforce_read_external_confirm_message);
-
-            builder.setPositiveButton(android.R.string.ok, new OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    setPermissionEnforced(context, READ_EXTERNAL_STORAGE, true);
-                    ((DevelopmentSettings) getTargetFragment()).updateAllOptions();
-                }
-            });
-            builder.setNegativeButton(android.R.string.cancel, new OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    ((DevelopmentSettings) getTargetFragment()).updateAllOptions();
-                }
-            });
-
-            return builder.create();
-        }
-    }
-
-    private static boolean isPermissionEnforced(Context context, String permission) {
+    private static boolean isPackageInstalled(Context context, String packageName) {
         try {
-            return ActivityThread.getPackageManager().isPermissionEnforced(READ_EXTERNAL_STORAGE);
-        } catch (RemoteException e) {
-            throw new RuntimeException("Problem talking with PackageManager", e);
-        }
-    }
-
-    private static void setPermissionEnforced(
-            Context context, String permission, boolean enforced) {
-        try {
-            // TODO: offload to background thread
-            ActivityThread.getPackageManager()
-                    .setPermissionEnforced(READ_EXTERNAL_STORAGE, enforced);
-        } catch (RemoteException e) {
-            throw new RuntimeException("Problem talking with PackageManager", e);
+            return context.getPackageManager().getPackageInfo(packageName, 0) != null;
+        } catch (NameNotFoundException e) {
+            return false;
         }
     }
 }
diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java
index b2145b0..6234038 100644
--- a/src/com/android/settings/DeviceAdminAdd.java
+++ b/src/com/android/settings/DeviceAdminAdd.java
@@ -50,6 +50,8 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
 
 public class DeviceAdminAdd extends Activity {
     static final String TAG = "DeviceAdminAdd";
@@ -104,7 +106,7 @@
             finish();
             return;
         }
-        
+
         ActivityInfo ai;
         try {
             ai = getPackageManager().getReceiverInfo(cn, PackageManager.GET_META_DATA);
@@ -113,7 +115,41 @@
             finish();
             return;
         }
-        
+
+        // When activating, make sure the given component name is actually a valid device admin.
+        // No need to check this when deactivating, because it is safe to deactivate an active
+        // invalid device admin.
+        if (!mDPM.isAdminActive(cn)) {
+            List<ResolveInfo> avail = getPackageManager().queryBroadcastReceivers(
+                    new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED),
+                    PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS);
+            int count = avail == null ? 0 : avail.size();
+            boolean found = false;
+            for (int i=0; i<count; i++) {
+                ResolveInfo ri = avail.get(i);
+                if (ai.packageName.equals(ri.activityInfo.packageName)
+                        && ai.name.equals(ri.activityInfo.name)) {
+                    try {
+                        // We didn't retrieve the meta data for all possible matches, so
+                        // need to use the activity info of this specific one that was retrieved.
+                        ri.activityInfo = ai;
+                        DeviceAdminInfo dpi = new DeviceAdminInfo(this, ri);
+                        found = true;
+                    } catch (XmlPullParserException e) {
+                        Log.w(TAG, "Bad " + ri.activityInfo, e);
+                    } catch (IOException e) {
+                        Log.w(TAG, "Bad " + ri.activityInfo, e);
+                    }
+                    break;
+                }
+            }
+            if (!found) {
+                Log.w(TAG, "Request to add invalid device admin: " + cn);
+                finish();
+                return;
+            }
+        }
+
         ResolveInfo ri = new ResolveInfo();
         ri.activityInfo = ai;
         try {
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 8254233..7e94741 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -17,29 +17,27 @@
 package com.android.settings;
 
 import android.app.Activity;
-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.Build;
 import android.os.Bundle;
 import android.os.SELinux;
 import android.os.SystemClock;
 import android.os.SystemProperties;
+import android.os.UserHandle;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
-import android.provider.Settings;
 import android.util.Log;
+import android.widget.Toast;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
-import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class DeviceInfoSettings extends SettingsPreferenceFragment {
+public class DeviceInfoSettings extends RestrictedSettingsFragment {
 
     private static final String LOG_TAG = "DeviceInfoSettings";
 
@@ -49,6 +47,7 @@
     private static final String KEY_CONTAINER = "container";
     private static final String KEY_TEAM = "team";
     private static final String KEY_CONTRIBUTORS = "contributors";
+    private static final String KEY_REGULATORY_INFO = "regulatory_info";
     private static final String KEY_TERMS = "terms";
     private static final String KEY_LICENSE = "license";
     private static final String KEY_COPYRIGHT = "copyright";
@@ -65,7 +64,15 @@
     private static final String KEY_EQUIPMENT_ID = "fcc_equipment_id";
     private static final String PROPERTY_EQUIPMENT_ID = "ro.ril.fccid";
 
+    static final int TAPS_TO_BE_A_DEVELOPER = 7;
+
     long[] mHits = new long[3];
+    int mDevHitCountdown;
+    Toast mDevHitToast;
+
+    public DeviceInfoSettings() {
+        super(null /* Don't PIN protect the entire screen */);
+    }
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -73,6 +80,10 @@
 
         addPreferencesFromResource(R.xml.device_info_settings);
 
+        // We only call ensurePinRestrictedPreference() when mDevHitCountdown == 0.
+        // This will keep us from entering developer mode without a PIN.
+        protectByRestrictions(KEY_BUILD_NUMBER);
+
         setStringSummary(KEY_FIRMWARE_VERSION, Build.VERSION.RELEASE);
         findPreference(KEY_FIRMWARE_VERSION).setEnabled(true);
         setValueSummary(KEY_BASEBAND_VERSION, "gsm.version.baseband");
@@ -80,6 +91,7 @@
         setValueSummary(KEY_EQUIPMENT_ID, PROPERTY_EQUIPMENT_ID);
         setStringSummary(KEY_DEVICE_MODEL, Build.MODEL);
         setStringSummary(KEY_BUILD_NUMBER, Build.DISPLAY);
+        findPreference(KEY_BUILD_NUMBER).setEnabled(true);
         findPreference(KEY_KERNEL_VERSION).setSummary(getFormattedKernelVersion());
 
         if (!SELinux.isSELinuxEnabled()) {
@@ -125,18 +137,33 @@
 
         // These are contained by the root preference screen
         parentPreference = getPreferenceScreen();
-        Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference,
-                KEY_SYSTEM_UPDATE_SETTINGS,
-                Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
+        if (UserHandle.myUserId() == UserHandle.USER_OWNER) {
+            Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference,
+                    KEY_SYSTEM_UPDATE_SETTINGS,
+                    Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
+        } else {
+            // Remove for secondary users
+            removePreference(KEY_SYSTEM_UPDATE_SETTINGS);
+        }
         Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_CONTRIBUTORS,
                 Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
 
         // Read platform settings for additional system update setting
-        boolean isUpdateSettingAvailable =
-                getResources().getBoolean(R.bool.config_additional_system_update_setting_enable);
-        if (isUpdateSettingAvailable == false) {
-            getPreferenceScreen().removePreference(findPreference(KEY_UPDATE_SETTING));
-        }
+        removePreferenceIfBoolFalse(KEY_UPDATE_SETTING,
+                R.bool.config_additional_system_update_setting_enable);
+
+        // Remove regulatory information if not enabled.
+        removePreferenceIfBoolFalse(KEY_REGULATORY_INFO,
+                R.bool.config_show_regulatory_info);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mDevHitCountdown = getActivity().getSharedPreferences(DevelopmentSettings.PREF_FILE,
+                Context.MODE_PRIVATE).getBoolean(DevelopmentSettings.PREF_SHOW,
+                        android.os.Build.TYPE.equals("eng")) ? -1 : TAPS_TO_BE_A_DEVELOPER;
+        mDevHitToast = null;
     }
 
     @Override
@@ -154,14 +181,52 @@
                     Log.e(LOG_TAG, "Unable to start activity " + intent.toString());
                 }
             }
+        } 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) {
+                if (mDevHitCountdown == 1) {
+                    if (super.ensurePinRestrictedPreference(preference)) {
+                        return true;
+                    }
+                }
+                mDevHitCountdown--;
+                if (mDevHitCountdown == 0) {
+                    getActivity().getSharedPreferences(DevelopmentSettings.PREF_FILE,
+                            Context.MODE_PRIVATE).edit().putBoolean(
+                                    DevelopmentSettings.PREF_SHOW, true).apply();
+                    if (mDevHitToast != null) {
+                        mDevHitToast.cancel();
+                    }
+                    mDevHitToast = Toast.makeText(getActivity(), R.string.show_dev_on,
+                            Toast.LENGTH_LONG);
+                    mDevHitToast.show();
+                } else if (mDevHitCountdown > 0
+                        && mDevHitCountdown < (TAPS_TO_BE_A_DEVELOPER-2)) {
+                    if (mDevHitToast != null) {
+                        mDevHitToast.cancel();
+                    }
+                    mDevHitToast = Toast.makeText(getActivity(), getResources().getQuantityString(
+                            R.plurals.show_dev_countdown, mDevHitCountdown, mDevHitCountdown),
+                            Toast.LENGTH_SHORT);
+                    mDevHitToast.show();
+                }
+            } else if (mDevHitCountdown < 0) {
+                if (mDevHitToast != null) {
+                    mDevHitToast.cancel();
+                }
+                mDevHitToast = Toast.makeText(getActivity(), R.string.show_dev_already,
+                        Toast.LENGTH_LONG);
+                mDevHitToast.show();
+            }
         }
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
     private void removePreferenceIfPropertyMissing(PreferenceGroup preferenceGroup,
             String preference, String property ) {
-        if (SystemProperties.get(property).equals(""))
-        {
+        if (SystemProperties.get(property).equals("")) {
             // Property is missing so remove preference from group
             try {
                 preferenceGroup.removePreference(findPreference(preference));
@@ -172,6 +237,15 @@
         }
     }
 
+    private void removePreferenceIfBoolFalse(String preference, int resId) {
+        if (!getResources().getBoolean(resId)) {
+            Preference pref = findPreference(preference);
+            if (pref != null) {
+                getPreferenceScreen().removePreference(pref);
+            }
+        }
+    }
+
     private void setStringSummary(String preference, String value) {
         try {
             findPreference(preference).setSummary(value);
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index fc162e2..813923d 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -19,19 +19,28 @@
 import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
 
 import android.app.ActivityManagerNative;
+import android.app.Dialog;
 import android.app.admin.DevicePolicyManager;
+import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.hardware.display.DisplayManager;
+import android.hardware.display.WifiDisplay;
+import android.hardware.display.WifiDisplayStatus;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
+import android.util.AttributeSet;
 import android.util.Log;
 
 import com.android.internal.view.RotationPolicy;
@@ -40,7 +49,7 @@
 import java.util.ArrayList;
 
 public class DisplaySettings extends SettingsPreferenceFragment implements
-        Preference.OnPreferenceChangeListener {
+        Preference.OnPreferenceChangeListener, OnPreferenceClickListener {
     private static final String TAG = "DisplaySettings";
 
     /** If there is no setting in the provider, use this. */
@@ -51,16 +60,24 @@
     private static final String KEY_FONT_SIZE = "font_size";
     private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";
     private static final String KEY_SCREEN_SAVER = "screensaver";
+    private static final String KEY_WIFI_DISPLAY = "wifi_display";
+
+    private static final int DLG_GLOBAL_CHANGE_WARNING = 1;
+
+    private DisplayManager mDisplayManager;
 
     private CheckBoxPreference mAccelerometer;
-    private ListPreference mFontSizePref;
+    private WarnedListPreference mFontSizePref;
     private CheckBoxPreference mNotificationPulse;
 
     private final Configuration mCurConfig = new Configuration();
-    
+
     private ListPreference mScreenTimeoutPreference;
     private Preference mScreenSaverPreference;
 
+    private WifiDisplayStatus mWifiDisplayStatus;
+    private Preference mWifiDisplayPreference;
+
     private final RotationPolicy.RotationPolicyListener mRotationPolicyListener =
             new RotationPolicy.RotationPolicyListener() {
         @Override
@@ -78,19 +95,21 @@
 
         mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
         mAccelerometer.setPersistent(false);
-        if (RotationPolicy.isRotationLockToggleSupported(getActivity())) {
+        if (!RotationPolicy.isRotationSupported(getActivity())
+                || RotationPolicy.isRotationLockToggleSupported(getActivity())) {
             // If rotation lock is supported, then we do not provide this option in
-            // Display settings.  However, is still available in Accessibility settings.
+            // Display settings.  However, is still available in Accessibility settings,
+            // if the device supports rotation.
             getPreferenceScreen().removePreference(mAccelerometer);
         }
 
         mScreenSaverPreference = findPreference(KEY_SCREEN_SAVER);
         if (mScreenSaverPreference != null
                 && getResources().getBoolean(
-                        com.android.internal.R.bool.config_enableDreams) == false) {
+                        com.android.internal.R.bool.config_dreamsSupported) == false) {
             getPreferenceScreen().removePreference(mScreenSaverPreference);
         }
-        
+
         mScreenTimeoutPreference = (ListPreference) findPreference(KEY_SCREEN_TIMEOUT);
         final long currentTimeout = Settings.System.getLong(resolver, SCREEN_OFF_TIMEOUT,
                 FALLBACK_SCREEN_TIMEOUT_VALUE);
@@ -99,8 +118,9 @@
         disableUnusableTimeouts(mScreenTimeoutPreference);
         updateTimeoutPreferenceDescription(currentTimeout);
 
-        mFontSizePref = (ListPreference) findPreference(KEY_FONT_SIZE);
+        mFontSizePref = (WarnedListPreference) findPreference(KEY_FONT_SIZE);
         mFontSizePref.setOnPreferenceChangeListener(this);
+        mFontSizePref.setOnPreferenceClickListener(this);
         mNotificationPulse = (CheckBoxPreference) findPreference(KEY_NOTIFICATION_PULSE);
         if (mNotificationPulse != null
                 && getResources().getBoolean(
@@ -116,6 +136,15 @@
             }
         }
 
+        mDisplayManager = (DisplayManager)getActivity().getSystemService(
+                Context.DISPLAY_SERVICE);
+        mWifiDisplayStatus = mDisplayManager.getWifiDisplayStatus();
+        mWifiDisplayPreference = (Preference)findPreference(KEY_WIFI_DISPLAY);
+        if (mWifiDisplayStatus.getFeatureState()
+                == WifiDisplayStatus.FEATURE_STATE_UNAVAILABLE) {
+            getPreferenceScreen().removePreference(mWifiDisplayPreference);
+            mWifiDisplayPreference = null;
+        }
     }
 
     private void updateTimeoutPreferenceDescription(long currentTimeout) {
@@ -127,15 +156,19 @@
         } else {
             final CharSequence[] entries = preference.getEntries();
             final CharSequence[] values = preference.getEntryValues();
-            int best = 0;
-            for (int i = 0; i < values.length; i++) {
-                long timeout = Long.parseLong(values[i].toString());
-                if (currentTimeout >= timeout) {
-                    best = i;
+            if (entries == null || entries.length == 0) {
+                summary = "";
+            } else {
+                int best = 0;
+                for (int i = 0; i < values.length; i++) {
+                    long timeout = Long.parseLong(values[i].toString());
+                    if (currentTimeout >= timeout) {
+                        best = i;
+                    }
                 }
+                summary = preference.getContext().getString(R.string.screen_timeout_summary,
+                        entries[best]);
             }
-            summary = preference.getContext().getString(R.string.screen_timeout_summary,
-                    entries[best]);
         }
         preference.setSummary(summary);
     }
@@ -160,13 +193,18 @@
             }
         }
         if (revisedEntries.size() != entries.length || revisedValues.size() != values.length) {
+            final int userPreference = Integer.parseInt(screenTimeoutPreference.getValue());
             screenTimeoutPreference.setEntries(
                     revisedEntries.toArray(new CharSequence[revisedEntries.size()]));
             screenTimeoutPreference.setEntryValues(
                     revisedValues.toArray(new CharSequence[revisedValues.size()]));
-            final int userPreference = Integer.parseInt(screenTimeoutPreference.getValue());
             if (userPreference <= maxTimeout) {
                 screenTimeoutPreference.setValue(String.valueOf(userPreference));
+            } else if (revisedValues.size() > 0
+                    && Long.parseLong(revisedValues.get(revisedValues.size() - 1).toString())
+                    == maxTimeout) {
+                // If the last one happens to be the same as the max timeout, select that
+                screenTimeoutPreference.setValue(String.valueOf(maxTimeout));
             } else {
                 // There will be no highlighted selection since nothing in the list matches
                 // maxTimeout. The user can still select anything less than maxTimeout.
@@ -188,7 +226,7 @@
         }
         return indices.length-1;
     }
-    
+
     public void readFontSizePreference(ListPreference pref) {
         try {
             mCurConfig.updateFrom(ActivityManagerNative.getDefault().getConfiguration());
@@ -206,15 +244,21 @@
         pref.setSummary(String.format(res.getString(R.string.summary_font_size),
                 fontSizeNames[index]));
     }
-    
+
     @Override
     public void onResume() {
         super.onResume();
 
-        updateState();
-
         RotationPolicy.registerRotationPolicyListener(getActivity(),
                 mRotationPolicyListener);
+
+        if (mWifiDisplayPreference != null) {
+            getActivity().registerReceiver(mReceiver, new IntentFilter(
+                    DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED));
+            mWifiDisplayStatus = mDisplayManager.getWifiDisplayStatus();
+        }
+
+        updateState();
     }
 
     @Override
@@ -223,19 +267,55 @@
 
         RotationPolicy.unregisterRotationPolicyListener(getActivity(),
                 mRotationPolicyListener);
+
+        if (mWifiDisplayPreference != null) {
+            getActivity().unregisterReceiver(mReceiver);
+        }
+    }
+
+    @Override
+    public Dialog onCreateDialog(int dialogId) {
+        if (dialogId == DLG_GLOBAL_CHANGE_WARNING) {
+            return Utils.buildGlobalChangeWarningDialog(getActivity(),
+                    R.string.global_font_change_title,
+                    new Runnable() {
+                        public void run() {
+                            mFontSizePref.click();
+                        }
+                    });
+        }
+        return null;
     }
 
     private void updateState() {
         updateAccelerometerRotationCheckbox();
         readFontSizePreference(mFontSizePref);
         updateScreenSaverSummary();
+        updateWifiDisplaySummary();
     }
 
     private void updateScreenSaverSummary() {
-        mScreenSaverPreference.setSummary(
-            DreamSettings.isScreenSaverEnabled(mScreenSaverPreference.getContext())
-                ? R.string.screensaver_settings_summary_on
-                : R.string.screensaver_settings_summary_off);
+        if (mScreenSaverPreference != null) {
+            mScreenSaverPreference.setSummary(
+                    DreamSettings.getSummaryTextWithDreamName(getActivity()));
+        }
+    }
+
+    private void updateWifiDisplaySummary() {
+        if (mWifiDisplayPreference != null) {
+            switch (mWifiDisplayStatus.getFeatureState()) {
+                case WifiDisplayStatus.FEATURE_STATE_OFF:
+                    mWifiDisplayPreference.setSummary(R.string.wifi_display_summary_off);
+                    break;
+                case WifiDisplayStatus.FEATURE_STATE_ON:
+                    mWifiDisplayPreference.setSummary(R.string.wifi_display_summary_on);
+                    break;
+                case WifiDisplayStatus.FEATURE_STATE_DISABLED:
+                default:
+                    mWifiDisplayPreference.setSummary(R.string.wifi_display_summary_disabled);
+                    break;
+            }
+        }
     }
 
     private void updateAccelerometerRotationCheckbox() {
@@ -270,8 +350,8 @@
     public boolean onPreferenceChange(Preference preference, Object objValue) {
         final String key = preference.getKey();
         if (KEY_SCREEN_TIMEOUT.equals(key)) {
-            int value = Integer.parseInt((String) objValue);
             try {
+                int value = Integer.parseInt((String) objValue);
                 Settings.System.putInt(getContentResolver(), SCREEN_OFF_TIMEOUT, value);
                 updateTimeoutPreferenceDescription(value);
             } catch (NumberFormatException e) {
@@ -284,4 +364,28 @@
 
         return true;
     }
+
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent.getAction().equals(DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED)) {
+                mWifiDisplayStatus = (WifiDisplayStatus)intent.getParcelableExtra(
+                        DisplayManager.EXTRA_WIFI_DISPLAY_STATUS);
+                updateWifiDisplaySummary();
+            }
+        }
+    };
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        if (preference == mFontSizePref) {
+            if (Utils.hasMultipleUsers(getActivity())) {
+                showDialog(DLG_GLOBAL_CHANGE_WARNING);
+                return true;
+            } else {
+                mFontSizePref.click();
+            }
+        }
+        return false;
+    }
 }
diff --git a/src/com/android/settings/DockSettings.java b/src/com/android/settings/DockSettings.java
deleted file mode 100644
index 1d3e2dd..0000000
--- a/src/com/android/settings/DockSettings.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import com.android.settings.bluetooth.DockEventReceiver;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.bluetooth.BluetoothDevice;
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.Preference;
-import android.preference.PreferenceScreen;
-import android.provider.Settings;
-
-public class DockSettings extends SettingsPreferenceFragment {
-
-    private static final int DIALOG_NOT_DOCKED = 1;
-    private static final String KEY_AUDIO_SETTINGS = "dock_audio";
-    private static final String KEY_DOCK_SOUNDS = "dock_sounds";
-    private Preference mAudioSettings;
-    private CheckBoxPreference mDockSounds;
-    private Intent mDockIntent;
-
-    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (intent.getAction().equals(Intent.ACTION_DOCK_EVENT)) {
-                handleDockChange(intent);
-            }
-        }
-    };
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.dock_settings);
-
-        initDockSettings();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        IntentFilter filter = new IntentFilter(Intent.ACTION_DOCK_EVENT);
-        getActivity().registerReceiver(mReceiver, filter);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-
-        getActivity().unregisterReceiver(mReceiver);
-    }
-
-    private void initDockSettings() {
-        ContentResolver resolver = getContentResolver();
-
-        mAudioSettings = findPreference(KEY_AUDIO_SETTINGS);
-        if (mAudioSettings != null) {
-            mAudioSettings.setSummary(R.string.dock_audio_summary_none);
-        }
-
-        mDockSounds = (CheckBoxPreference) findPreference(KEY_DOCK_SOUNDS);
-        mDockSounds.setPersistent(false);
-        mDockSounds.setChecked(Settings.System.getInt(resolver,
-                Settings.System.DOCK_SOUNDS_ENABLED, 0) != 0);
-    }
-
-    private void handleDockChange(Intent intent) {
-        if (mAudioSettings != null) {
-            int dockState = intent.getIntExtra(Intent.EXTRA_DOCK_STATE, 0);
-
-            boolean isBluetooth = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE) != null;
-
-            if (!isBluetooth) {
-                // No dock audio if not on Bluetooth.
-                mAudioSettings.setEnabled(false);
-                mAudioSettings.setSummary(R.string.dock_audio_summary_unknown);
-            } else {
-                mAudioSettings.setEnabled(true);
-
-                mDockIntent = intent;
-                int resId = R.string.dock_audio_summary_unknown;
-                switch (dockState) {
-                case Intent.EXTRA_DOCK_STATE_CAR:
-                    resId = R.string.dock_audio_summary_car;
-                    break;
-                case Intent.EXTRA_DOCK_STATE_DESK:
-                case Intent.EXTRA_DOCK_STATE_LE_DESK:
-                case Intent.EXTRA_DOCK_STATE_HE_DESK:
-                    resId = R.string.dock_audio_summary_desk;
-                    break;
-                case Intent.EXTRA_DOCK_STATE_UNDOCKED:
-                    resId = R.string.dock_audio_summary_none;
-                }
-                mAudioSettings.setSummary(resId);
-            }
-
-            if (dockState != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
-                // remove undocked dialog if currently showing.
-                try {
-                    removeDialog(DIALOG_NOT_DOCKED);
-                } catch (IllegalArgumentException iae) {
-                    // Maybe it was already dismissed
-                }
-            }
-        }
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        if (preference == mAudioSettings) {
-            int dockState = mDockIntent != null
-                    ? mDockIntent.getIntExtra(Intent.EXTRA_DOCK_STATE, 0)
-                    : Intent.EXTRA_DOCK_STATE_UNDOCKED;
-            if (dockState == Intent.EXTRA_DOCK_STATE_UNDOCKED) {
-                showDialog(DIALOG_NOT_DOCKED);
-            } else {
-                Intent i = new Intent(mDockIntent);
-                i.setAction(DockEventReceiver.ACTION_DOCK_SHOW_UI);
-                i.setClass(getActivity(), DockEventReceiver.class);
-                getActivity().sendBroadcast(i);
-            }
-        } else if (preference == mDockSounds) {
-            Settings.System.putInt(getContentResolver(), Settings.System.DOCK_SOUNDS_ENABLED,
-                    mDockSounds.isChecked() ? 1 : 0);
-        }
-
-        return true;
-    }
-
-    @Override
-    public Dialog onCreateDialog(int id) {
-        if (id == DIALOG_NOT_DOCKED) {
-            return createUndockedMessage();
-        }
-        return null;
-    }
-
-    private Dialog createUndockedMessage() {
-        final AlertDialog.Builder ab = new AlertDialog.Builder(getActivity());
-        ab.setTitle(R.string.dock_not_found_title);
-        ab.setMessage(R.string.dock_not_found_text);
-        ab.setPositiveButton(android.R.string.ok, null);
-        return ab.create();
-    }
-}
diff --git a/src/com/android/settings/DreamBackend.java b/src/com/android/settings/DreamBackend.java
new file mode 100644
index 0000000..1522705
--- /dev/null
+++ b/src/com/android/settings/DreamBackend.java
@@ -0,0 +1,310 @@
+/*
+ * 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 static android.provider.Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK;
+import static android.provider.Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP;
+import static android.provider.Settings.Secure.SCREENSAVER_ENABLED;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ServiceInfo;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.content.res.XmlResourceParser;
+import android.graphics.drawable.Drawable;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.provider.Settings;
+import android.service.dreams.DreamService;
+import android.service.dreams.IDreamManager;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.Xml;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+public class DreamBackend {
+    private static final String TAG = DreamSettings.class.getSimpleName() + ".Backend";
+
+    public static class DreamInfo {
+        CharSequence caption;
+        Drawable icon;
+        boolean isActive;
+        public ComponentName componentName;
+        public ComponentName settingsComponentName;
+
+        @Override
+        public String toString() {
+            StringBuilder sb = new StringBuilder(DreamInfo.class.getSimpleName());
+            sb.append('[').append(caption);
+            if (isActive)
+                sb.append(",active");
+            sb.append(',').append(componentName);
+            if (settingsComponentName != null)
+                sb.append("settings=").append(settingsComponentName);
+            return sb.append(']').toString();
+        }
+    }
+
+    private final Context mContext;
+    private final IDreamManager mDreamManager;
+    private final DreamInfoComparator mComparator;
+    private final boolean mDreamsEnabledByDefault;
+    private final boolean mDreamsActivatedOnSleepByDefault;
+    private final boolean mDreamsActivatedOnDockByDefault;
+
+    public DreamBackend(Context context) {
+        mContext = context;
+        mDreamManager = IDreamManager.Stub.asInterface(
+                ServiceManager.getService(DreamService.DREAM_SERVICE));
+        mComparator = new DreamInfoComparator(getDefaultDream());
+        mDreamsEnabledByDefault = context.getResources()
+                .getBoolean(com.android.internal.R.bool.config_dreamsEnabledByDefault);
+        mDreamsActivatedOnSleepByDefault = context.getResources()
+                .getBoolean(com.android.internal.R.bool.config_dreamsActivatedOnSleepByDefault);
+        mDreamsActivatedOnDockByDefault = context.getResources()
+                .getBoolean(com.android.internal.R.bool.config_dreamsActivatedOnDockByDefault);
+    }
+
+    public List<DreamInfo> getDreamInfos() {
+        logd("getDreamInfos()");
+        ComponentName activeDream = getActiveDream();
+        PackageManager pm = mContext.getPackageManager();
+        Intent dreamIntent = new Intent(DreamService.SERVICE_INTERFACE);
+        List<ResolveInfo> resolveInfos = pm.queryIntentServices(dreamIntent,
+                PackageManager.GET_META_DATA);
+        List<DreamInfo> dreamInfos = new ArrayList<DreamInfo>(resolveInfos.size());
+        for (ResolveInfo resolveInfo : resolveInfos) {
+            if (resolveInfo.serviceInfo == null)
+                continue;
+            DreamInfo dreamInfo = new DreamInfo();
+            dreamInfo.caption = resolveInfo.loadLabel(pm);
+            dreamInfo.icon = resolveInfo.loadIcon(pm);
+            dreamInfo.componentName = getDreamComponentName(resolveInfo);
+            dreamInfo.isActive = dreamInfo.componentName.equals(activeDream);
+            dreamInfo.settingsComponentName = getSettingsComponentName(pm, resolveInfo);
+            dreamInfos.add(dreamInfo);
+        }
+        Collections.sort(dreamInfos, mComparator);
+        return dreamInfos;
+    }
+
+    public ComponentName getDefaultDream() {
+        if (mDreamManager == null)
+            return null;
+        try {
+            return mDreamManager.getDefaultDreamComponent();
+        } catch (RemoteException e) {
+            Log.w(TAG, "Failed to get default dream", e);
+            return null;
+        }
+    }
+
+    public CharSequence getActiveDreamName() {
+        ComponentName cn = getActiveDream();
+        if (cn != null) {
+            PackageManager pm = mContext.getPackageManager();
+            try {
+                ServiceInfo ri = pm.getServiceInfo(cn, 0);
+                if (ri != null) {
+                    return ri.loadLabel(pm);
+                }
+            } catch (PackageManager.NameNotFoundException exc) {
+                return null; // uninstalled?
+            }
+        }
+        return null;
+    }
+
+    public boolean isEnabled() {
+        return getBoolean(SCREENSAVER_ENABLED, mDreamsEnabledByDefault);
+    }
+
+    public void setEnabled(boolean value) {
+        logd("setEnabled(%s)", value);
+        setBoolean(SCREENSAVER_ENABLED, value);
+    }
+
+    public boolean isActivatedOnDock() {
+        return getBoolean(SCREENSAVER_ACTIVATE_ON_DOCK, mDreamsActivatedOnDockByDefault);
+    }
+
+    public void setActivatedOnDock(boolean value) {
+        logd("setActivatedOnDock(%s)", value);
+        setBoolean(SCREENSAVER_ACTIVATE_ON_DOCK, value);
+    }
+
+    public boolean isActivatedOnSleep() {
+        return getBoolean(SCREENSAVER_ACTIVATE_ON_SLEEP, mDreamsActivatedOnSleepByDefault);
+    }
+
+    public void setActivatedOnSleep(boolean value) {
+        logd("setActivatedOnSleep(%s)", value);
+        setBoolean(SCREENSAVER_ACTIVATE_ON_SLEEP, value);
+    }
+
+    private boolean getBoolean(String key, boolean def) {
+        return Settings.Secure.getInt(mContext.getContentResolver(), key, def ? 1 : 0) == 1;
+    }
+
+    private void setBoolean(String key, boolean value) {
+        Settings.Secure.putInt(mContext.getContentResolver(), key, value ? 1 : 0);
+    }
+
+    public void setActiveDream(ComponentName dream) {
+        logd("setActiveDream(%s)", dream);
+        if (mDreamManager == null)
+            return;
+        try {
+            ComponentName[] dreams = { dream };
+            mDreamManager.setDreamComponents(dream == null ? null : dreams);
+        } catch (RemoteException e) {
+            Log.w(TAG, "Failed to set active dream to " + dream, e);
+        }
+    }
+
+    public ComponentName getActiveDream() {
+        if (mDreamManager == null)
+            return null;
+        try {
+            ComponentName[] dreams = mDreamManager.getDreamComponents();
+            return dreams != null && dreams.length > 0 ? dreams[0] : null;
+        } catch (RemoteException e) {
+            Log.w(TAG, "Failed to get active dream", e);
+            return null;
+        }
+    }
+
+    public void launchSettings(DreamInfo dreamInfo) {
+        logd("launchSettings(%s)", dreamInfo);
+        if (dreamInfo == null || dreamInfo.settingsComponentName == null)
+            return;
+        mContext.startActivity(new Intent().setComponent(dreamInfo.settingsComponentName));
+    }
+
+    public void preview(DreamInfo dreamInfo) {
+        logd("preview(%s)", dreamInfo);
+        if (mDreamManager == null || dreamInfo == null || dreamInfo.componentName == null)
+            return;
+        try {
+            mDreamManager.testDream(dreamInfo.componentName);
+        } catch (RemoteException e) {
+            Log.w(TAG, "Failed to preview " + dreamInfo, e);
+        }
+    }
+
+    public void startDreaming() {
+        logd("startDreaming()");
+        if (mDreamManager == null)
+            return;
+        try {
+            mDreamManager.dream();
+        } catch (RemoteException e) {
+            Log.w(TAG, "Failed to dream", e);
+        }
+    }
+
+    private static ComponentName getDreamComponentName(ResolveInfo resolveInfo) {
+        if (resolveInfo == null || resolveInfo.serviceInfo == null)
+            return null;
+        return new ComponentName(resolveInfo.serviceInfo.packageName, resolveInfo.serviceInfo.name);
+    }
+
+    private static ComponentName getSettingsComponentName(PackageManager pm, ResolveInfo resolveInfo) {
+        if (resolveInfo == null
+                || resolveInfo.serviceInfo == null
+                || resolveInfo.serviceInfo.metaData == null)
+            return null;
+        String cn = null;
+        XmlResourceParser parser = null;
+        Exception caughtException = null;
+        try {
+            parser = resolveInfo.serviceInfo.loadXmlMetaData(pm, DreamService.DREAM_META_DATA);
+            if (parser == null) {
+                Log.w(TAG, "No " + DreamService.DREAM_META_DATA + " meta-data");
+                return null;
+            }
+            Resources res = pm.getResourcesForApplication(resolveInfo.serviceInfo.applicationInfo);
+            AttributeSet attrs = Xml.asAttributeSet(parser);
+            int type;
+            while ((type=parser.next()) != XmlPullParser.END_DOCUMENT
+                    && type != XmlPullParser.START_TAG) {
+            }
+            String nodeName = parser.getName();
+            if (!"dream".equals(nodeName)) {
+                Log.w(TAG, "Meta-data does not start with dream tag");
+                return null;
+            }
+            TypedArray sa = res.obtainAttributes(attrs, com.android.internal.R.styleable.Dream);
+            cn = sa.getString(com.android.internal.R.styleable.Dream_settingsActivity);
+            sa.recycle();
+        } catch (NameNotFoundException e) {
+            caughtException = e;
+        } catch (IOException e) {
+            caughtException = e;
+        } catch (XmlPullParserException e) {
+            caughtException = e;
+        } finally {
+            if (parser != null) parser.close();
+        }
+        if (caughtException != null) {
+            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);
+    }
+
+    private static void logd(String msg, Object... args) {
+        if (DreamSettings.DEBUG)
+            Log.d(TAG, args == null || args.length == 0 ? msg : String.format(msg, args));
+    }
+
+    private static class DreamInfoComparator implements Comparator<DreamInfo> {
+        private final ComponentName mDefaultDream;
+
+        public DreamInfoComparator(ComponentName defaultDream) {
+            mDefaultDream = defaultDream;
+        }
+
+        @Override
+        public int compare(DreamInfo lhs, DreamInfo rhs) {
+            return sortKey(lhs).compareTo(sortKey(rhs));
+        }
+
+        private String sortKey(DreamInfo di) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(di.componentName.equals(mDefaultDream) ? '0' : '1');
+            sb.append(di.caption);
+            return sb.toString();
+        }
+    }
+}
diff --git a/src/com/android/settings/DreamComponentPreference.java b/src/com/android/settings/DreamComponentPreference.java
deleted file mode 100644
index 2114dd1..0000000
--- a/src/com/android/settings/DreamComponentPreference.java
+++ /dev/null
@@ -1,236 +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 static android.provider.Settings.Secure.SCREENSAVER_COMPONENT;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.ComponentName;
-import android.content.ContentResolver;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.ComponentInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.preference.Preference;
-import android.provider.Settings;
-import android.service.dreams.IDreamManager;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.ListAdapter;
-import android.widget.TextView;
-
-import java.text.Collator;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-public class DreamComponentPreference extends Preference {
-    private static final String TAG = "DreamComponentPreference";
-
-    private static final boolean SHOW_DOCK_APPS = false;
-    private static final boolean SHOW_DREAM_SERVICES = true;
-    private static final boolean SHOW_DREAM_ACTIVITIES = false;
-
-    private final PackageManager pm;
-    private final ContentResolver resolver;
-    private final Collator   sCollator = Collator.getInstance();
-
-    public DreamComponentPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        pm = getContext().getPackageManager();
-        resolver = getContext().getContentResolver();
-
-        refreshFromSettings();
-    }
-
-    private void refreshFromSettings() {
-        ComponentName cn = null;
-        IDreamManager dm = IDreamManager.Stub.asInterface(
-                ServiceManager.getService("dreams"));
-        try {
-            cn = dm.getDreamComponent();
-        } catch (RemoteException ex) {
-            setSummary("(unknown)");
-            return;
-        }
-
-        try {
-            setSummary(pm.getActivityInfo(cn, 0).loadLabel(pm));
-        } catch (PackageManager.NameNotFoundException ex) {
-            try {
-                setSummary(pm.getServiceInfo(cn, 0).loadLabel(pm));
-            } catch (PackageManager.NameNotFoundException ex2) {
-                setSummary("(unknown)");
-            }
-        }
-    }
-
-    // Group by package, then by name.
-    Comparator<ResolveInfo> sResolveInfoComparator = new Comparator<ResolveInfo>() {
-        @Override
-        public int compare(ResolveInfo a, ResolveInfo b) {
-            CharSequence sa, sb;
-            
-            ApplicationInfo aia = a.activityInfo != null ? a.activityInfo.applicationInfo : a.serviceInfo.applicationInfo;
-            ApplicationInfo aib = b.activityInfo != null ? b.activityInfo.applicationInfo : b.serviceInfo.applicationInfo;
-            
-            if (!aia.equals(aib)) {
-                sa = pm.getApplicationLabel(aia);
-                sb = pm.getApplicationLabel(aib);
-            } else {
-                sa = a.loadLabel(pm);
-                if (sa == null) {
-                    sa = (a.activityInfo != null) ? a.activityInfo.name : a.serviceInfo.name;
-                }
-                sb = b.loadLabel(pm);
-                if (sb == null) {
-                    sb = (b.activityInfo != null) ? b.activityInfo.name : b.serviceInfo.name;
-                }
-            }
-            return sCollator.compare(sa.toString(), sb.toString());
-        }
-    };
-
-    public class DreamListAdapter extends BaseAdapter implements ListAdapter {
-        private ArrayList<ResolveInfo> results;
-        private final LayoutInflater inflater;
-
-        public DreamListAdapter(Context context) {
-            Intent choosy = new Intent(Intent.ACTION_MAIN)
-                        .addCategory("android.intent.category.DREAM");
-
-            inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-            results = new ArrayList<ResolveInfo>();
-            
-            if (SHOW_DREAM_ACTIVITIES) {
-                results.addAll(pm.queryIntentActivities(choosy, PackageManager.GET_META_DATA));
-            }
-            
-            if (SHOW_DREAM_SERVICES) {
-                results.addAll(pm.queryIntentServices(choosy, PackageManager.GET_META_DATA));
-            }
-
-            // Group by package
-            Collections.sort(results, sResolveInfoComparator);
-
-            if (SHOW_DOCK_APPS) {
-                choosy = new Intent(Intent.ACTION_MAIN)
-                            .addCategory(Intent.CATEGORY_DESK_DOCK);
-
-                List<ResolveInfo> dockApps = pm.queryIntentActivities(choosy, 0);
-                for (ResolveInfo app : dockApps) {
-                    // do not insert duplicate packages
-                    int pos = Collections.binarySearch(results, app, sResolveInfoComparator);
-                    if (pos < 0) {
-                        results.add(-1-pos, app);
-                    }
-                }
-            }
-        }
-
-        @Override
-        public int getCount() {
-            return results.size();
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return results.get(position);
-        }
-
-        @Override
-        public long getItemId (int position) {
-            return (long) position;
-        }
-
-        private CharSequence loadDescription(ResolveInfo ri) {
-            CharSequence desc = null;
-            if (ri != null) {
-                Bundle metaData = (ri.activityInfo != null) ? ri.activityInfo.metaData : ri.serviceInfo.metaData;
-                Log.d(TAG, "loadDescription: ri=" + ri + " metaData=" + metaData);
-                if (metaData != null) {
-                    desc = metaData.getCharSequence("android.screensaver.description");
-                    Log.d(TAG, "loadDescription: desc=" + desc);
-                    if (desc != null) {
-                        desc = desc.toString().trim();
-                    }
-                }
-            }
-            return desc;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            View row = (convertView != null) 
-                ? convertView
-                : inflater.inflate(R.layout.dream_picker_row, parent, false);
-            ResolveInfo ri = results.get(position);
-            ((TextView)row.findViewById(R.id.title)).setText(ri.loadLabel(pm));
-            ((ImageView)row.findViewById(R.id.icon)).setImageDrawable(ri.loadIcon(pm));
-            return row;
-        }
-    }
-
-    @Override
-    protected void onClick() {
-        final DreamListAdapter list = new DreamListAdapter(getContext());
-        AlertDialog alert = new AlertDialog.Builder(getContext())
-            .setAdapter(
-                list,
-                new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        ResolveInfo ri = (ResolveInfo)list.getItem(which);
-                        String pn = (ri.activityInfo != null) ? ri.activityInfo.applicationInfo.packageName
-                                : ri.serviceInfo.applicationInfo.packageName;
-                        String n = (ri.activityInfo != null) ? ri.activityInfo.name : ri.serviceInfo.name;
-                        ComponentName cn = new ComponentName(pn, n);
-
-                        setSummary(ri.loadLabel(pm));
-                        //getContext().startActivity(intent);
-                        
-                        IDreamManager dm = IDreamManager.Stub.asInterface(
-                                ServiceManager.getService("dreams"));
-                        try {
-                            dm.setDreamComponent(cn);
-                        } catch (RemoteException ex) {
-                            // too bad, so sad, oh mom, oh dad
-                        }
-                    }
-                })
-            .create();
-        alert.show();
-    }
-}
diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
index d9953aa..1c8f988 100644
--- a/src/com/android/settings/DreamSettings.java
+++ b/src/com/android/settings/DreamSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 The Android Open Source Project
+ * 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.
@@ -16,144 +16,357 @@
 
 package com.android.settings;
 
-import static android.provider.Settings.Secure.SCREENSAVER_ENABLED;
-import static android.provider.Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK;
-
 import android.app.ActionBar;
 import android.app.Activity;
-import android.app.ActivityManagerNative;
-import android.app.admin.DevicePolicyManager;
-import android.content.ContentResolver;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.res.Configuration;
-import android.database.ContentObserver;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.preference.CheckBoxPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
 import android.preference.PreferenceActivity;
-import android.preference.PreferenceScreen;
-import android.provider.Settings;
 import android.util.Log;
 import android.view.Gravity;
-import android.view.IWindowManager;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.MenuItem.OnMenuItemClickListener;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnTouchListener;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
 import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.RadioButton;
 import android.widget.Switch;
+import android.widget.TextView;
 
-import java.util.ArrayList;
+import com.android.settings.DreamBackend.DreamInfo;
+
+import java.util.List;
 
 public class DreamSettings extends SettingsPreferenceFragment {
-    private static final String TAG = "DreamSettings";
+    private static final String TAG = DreamSettings.class.getSimpleName();
+    static final boolean DEBUG = false;
+    private static final int DIALOG_WHEN_TO_DREAM = 1;
+    private static final String PACKAGE_SCHEME = "package";
 
-    private static final String KEY_ACTIVATE_ON_DOCK = "activate_on_dock";
+    private final PackageReceiver mPackageReceiver = new PackageReceiver();
 
-    private CheckBoxPreference mActivateOnDockPreference;
+    private Context mContext;
+    private DreamBackend mBackend;
+    private DreamInfoAdapter mAdapter;
+    private Switch mSwitch;
+    private MenuItem[] mMenuItemsWhenEnabled;
+    private boolean mRefreshing;
 
-    private Switch mEnableSwitch;
-    private Enabler mEnabler;
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_dreams;
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        logd("onAttach(%s)", activity.getClass().getSimpleName());
+        super.onAttach(activity);
+        mContext = activity;
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        logd("onCreate(%s)", icicle);
+        super.onCreate(icicle);
+        Activity activity = getActivity();
+
+        mBackend = new DreamBackend(activity);
+        mSwitch = new Switch(activity);
+        mSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (!mRefreshing) {
+                    mBackend.setEnabled(isChecked);
+                    refreshFromBackend();
+                }
+            }
+        });
+
+        final int padding = activity.getResources().getDimensionPixelSize(
+                R.dimen.action_bar_switch_padding);
+        mSwitch.setPaddingRelative(0, 0, padding, 0);
+        activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                ActionBar.DISPLAY_SHOW_CUSTOM);
+        activity.getActionBar().setCustomView(mSwitch, new ActionBar.LayoutParams(
+                ActionBar.LayoutParams.WRAP_CONTENT,
+                ActionBar.LayoutParams.WRAP_CONTENT,
+                Gravity.CENTER_VERTICAL | Gravity.END));
+
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onDestroyView() {
+        getActivity().getActionBar().setCustomView(null);
+        super.onDestroyView();
+    }
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
+        logd("onActivityCreated(%s)", savedInstanceState);
         super.onActivityCreated(savedInstanceState);
 
-        addPreferencesFromResource(R.xml.dream_settings);
+        ListView listView = getListView();
 
-        mActivateOnDockPreference = (CheckBoxPreference) findPreference(KEY_ACTIVATE_ON_DOCK);
+        listView.setItemsCanFocus(true);
 
-        final Activity activity = getActivity();
+        TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
+        emptyView.setText(R.string.screensaver_settings_disabled_prompt);
+        listView.setEmptyView(emptyView);
 
-        mEnableSwitch = new Switch(activity);
-
-        if (activity instanceof PreferenceActivity) {
-            PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
-            // note: we do not check onIsHidingHeaders() or onIsMultiPane() because there's no
-            // switch in the left-hand pane to control this; we need to show the ON/OFF in our
-            // fragment every time
-            final int padding = activity.getResources().getDimensionPixelSize(
-                    R.dimen.action_bar_switch_padding);
-            mEnableSwitch.setPadding(0, 0, padding, 0);
-            activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
-                    ActionBar.DISPLAY_SHOW_CUSTOM);
-            activity.getActionBar().setCustomView(mEnableSwitch, new ActionBar.LayoutParams(
-                    ActionBar.LayoutParams.WRAP_CONTENT,
-                    ActionBar.LayoutParams.WRAP_CONTENT,
-                    Gravity.CENTER_VERTICAL | Gravity.RIGHT));
-            activity.getActionBar().setTitle(R.string.screensaver_settings_title);
-        }
-
-        mEnabler = new Enabler(activity, mEnableSwitch);
-    }
-
-    public static boolean isScreenSaverEnabled(Context context) {
-        return 0 != Settings.Secure.getInt(
-                    context.getContentResolver(), SCREENSAVER_ENABLED, 1);
-    }
-
-    public static void setScreenSaverEnabled(Context context, boolean enabled) {
-        Settings.Secure.putInt(
-                context.getContentResolver(), SCREENSAVER_ENABLED, enabled ? 1 : 0);
-    }
-
-    public static class Enabler implements CompoundButton.OnCheckedChangeListener  {
-        private final Context mContext;
-        private Switch mSwitch;
-
-        public Enabler(Context context, Switch switch_) {
-            mContext = context;
-            setSwitch(switch_);
-        }
-        @Override
-        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-            setScreenSaverEnabled(mContext, isChecked);
-        }
-        public void setSwitch(Switch switch_) {
-            if (mSwitch == switch_) return;
-            if (mSwitch != null) mSwitch.setOnCheckedChangeListener(null);
-            mSwitch = switch_;
-            mSwitch.setOnCheckedChangeListener(this);
-
-            final boolean enabled = isScreenSaverEnabled(mContext);
-            mSwitch.setChecked(enabled);
-        }
-        public void pause() {
-            mSwitch.setOnCheckedChangeListener(null);
-        }
-        public void resume() {
-            mSwitch.setOnCheckedChangeListener(this);
-        }
+        mAdapter = new DreamInfoAdapter(mContext);
+        listView.setAdapter(mAdapter);
     }
 
     @Override
-    public void onResume() {
-        if (mEnabler != null) {
-            mEnabler.resume();
-        }
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        logd("onCreateOptionsMenu()");
 
-        final boolean currentActivateOnDock = 0 != Settings.Secure.getInt(getContentResolver(),
-                SCREENSAVER_ACTIVATE_ON_DOCK, 1);
-        mActivateOnDockPreference.setChecked(currentActivateOnDock);
-        super.onResume();
+        boolean isEnabled = mBackend.isEnabled();
+
+        // create "start" action
+        MenuItem start = createMenuItem(menu, R.string.screensaver_settings_dream_start,
+                MenuItem.SHOW_AS_ACTION_ALWAYS,
+                isEnabled, new Runnable(){
+                    @Override
+                    public void run() {
+                        mBackend.startDreaming();
+                    }});
+
+        // create "when to dream" overflow menu item
+        MenuItem whenToDream = createMenuItem(menu,
+                R.string.screensaver_settings_when_to_dream,
+                MenuItem.SHOW_AS_ACTION_IF_ROOM,
+                isEnabled,
+                new Runnable() {
+                    @Override
+                    public void run() {
+                        showDialog(DIALOG_WHEN_TO_DREAM);
+                    }});
+
+        // create "help" overflow menu item (make sure it appears last)
+        super.onCreateOptionsMenu(menu, inflater);
+
+        mMenuItemsWhenEnabled = new MenuItem[] { start, whenToDream };
+    }
+
+    private MenuItem createMenuItem(Menu menu,
+            int titleRes, int actionEnum, boolean isEnabled, final Runnable onClick) {
+        MenuItem item = menu.add(titleRes);
+        item.setShowAsAction(actionEnum);
+        item.setEnabled(isEnabled);
+        item.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                onClick.run();
+                return true;
+            }
+        });
+        return item;
+    }
+
+    @Override
+    public Dialog onCreateDialog(int dialogId) {
+        logd("onCreateDialog(%s)", dialogId);
+        if (dialogId == DIALOG_WHEN_TO_DREAM)
+            return createWhenToDreamDialog();
+        return super.onCreateDialog(dialogId);
+    }
+
+    private Dialog createWhenToDreamDialog() {
+        final CharSequence[] items = {
+                mContext.getString(R.string.screensaver_settings_summary_dock),
+                mContext.getString(R.string.screensaver_settings_summary_sleep),
+                mContext.getString(R.string.screensaver_settings_summary_either_short)
+        };
+
+        int initialSelection = mBackend.isActivatedOnDock() && mBackend.isActivatedOnSleep() ? 2
+                : mBackend.isActivatedOnDock() ? 0
+                : mBackend.isActivatedOnSleep() ? 1
+                : -1;
+
+        return new AlertDialog.Builder(mContext)
+                .setTitle(R.string.screensaver_settings_when_to_dream)
+                .setSingleChoiceItems(items, initialSelection, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int item) {
+                        mBackend.setActivatedOnDock(item == 0 || item == 2);
+                        mBackend.setActivatedOnSleep(item == 1 || item == 2);
+                    }
+                })
+                .create();
     }
 
     @Override
     public void onPause() {
-        if (mEnabler != null) {
-            mEnabler.pause();
-        }
-
+        logd("onPause()");
         super.onPause();
+        mContext.unregisterReceiver(mPackageReceiver);
     }
 
     @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        if (preference == mActivateOnDockPreference) {
-            Settings.Secure.putInt(getContentResolver(),
-                    SCREENSAVER_ACTIVATE_ON_DOCK, 
-                    mActivateOnDockPreference.isChecked() ? 1 : 0);
+    public void onResume() {
+        logd("onResume()");
+        super.onResume();
+        refreshFromBackend();
+
+        // listen for package changes
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_PACKAGE_ADDED);
+        filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
+        filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+        filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
+        filter.addDataScheme(PACKAGE_SCHEME);
+        mContext.registerReceiver(mPackageReceiver , filter);
+    }
+
+    public static int getSummaryResource(Context context) {
+        DreamBackend backend = new DreamBackend(context);
+        boolean isEnabled = backend.isEnabled();
+        boolean activatedOnSleep = backend.isActivatedOnSleep();
+        boolean activatedOnDock = backend.isActivatedOnDock();
+        boolean activatedOnEither = activatedOnSleep && activatedOnDock;
+        return !isEnabled ? R.string.screensaver_settings_summary_off
+                : activatedOnEither ? R.string.screensaver_settings_summary_either_long
+                : activatedOnSleep ? R.string.screensaver_settings_summary_sleep
+                : activatedOnDock ? R.string.screensaver_settings_summary_dock
+                : 0;
+    }
+
+    public static CharSequence getSummaryTextWithDreamName(Context context) {
+        DreamBackend backend = new DreamBackend(context);
+        boolean isEnabled = backend.isEnabled();
+        if (!isEnabled) {
+            return context.getString(R.string.screensaver_settings_summary_off);
+        } else {
+            return backend.getActiveDreamName();
         }
-        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    }
+
+    private void refreshFromBackend() {
+        logd("refreshFromBackend()");
+        mRefreshing = true;
+        boolean dreamsEnabled = mBackend.isEnabled();
+        if (mSwitch.isChecked() != dreamsEnabled)
+            mSwitch.setChecked(dreamsEnabled);
+
+        mAdapter.clear();
+        if (dreamsEnabled) {
+            List<DreamInfo> dreamInfos = mBackend.getDreamInfos();
+            mAdapter.addAll(dreamInfos);
+        }
+        if (mMenuItemsWhenEnabled != null)
+            for (MenuItem menuItem : mMenuItemsWhenEnabled)
+                menuItem.setEnabled(dreamsEnabled);
+        mRefreshing = false;
+    }
+
+    private static void logd(String msg, Object... args) {
+        if (DEBUG)
+            Log.d(TAG, args == null || args.length == 0 ? msg : String.format(msg, args));
+    }
+
+    private class DreamInfoAdapter extends ArrayAdapter<DreamInfo> {
+        private final LayoutInflater mInflater;
+
+        public DreamInfoAdapter(Context context) {
+            super(context, 0);
+            mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            DreamInfo dreamInfo = getItem(position);
+            logd("getView(%s)", dreamInfo.caption);
+            final View row = convertView != null ? convertView : createDreamInfoRow(parent);
+            row.setTag(dreamInfo);
+
+            // bind icon
+            ((ImageView) row.findViewById(android.R.id.icon)).setImageDrawable(dreamInfo.icon);
+
+            // bind caption
+            ((TextView) row.findViewById(android.R.id.title)).setText(dreamInfo.caption);
+
+            // 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 = dreamInfo.settingsComponentName != null;
+            View settingsDivider = row.findViewById(R.id.divider);
+            settingsDivider.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
+
+            ImageView settingsButton = (ImageView) row.findViewById(android.R.id.button2);
+            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) {
+                    mBackend.launchSettings((DreamInfo) row.getTag());
+                }});
+
+            return row;
+        }
+
+        private View createDreamInfoRow(ViewGroup parent) {
+            final View row =  mInflater.inflate(R.layout.dream_info_row, parent, false);
+            final View header = row.findViewById(android.R.id.widget_frame);
+            header.setOnClickListener(new OnClickListener(){
+                @Override
+                public void onClick(View v) {
+                    v.setPressed(true);
+                    activate((DreamInfo) row.getTag());
+                }});
+            return row;
+        }
+
+        private DreamInfo getCurrentSelection() {
+            for (int i = 0; i < getCount(); i++) {
+                DreamInfo dreamInfo = getItem(i);
+                if (dreamInfo.isActive)
+                    return dreamInfo;
+            }
+            return null;
+        }
+        private void activate(DreamInfo dreamInfo) {
+            if (dreamInfo.equals(getCurrentSelection()))
+                return;
+            for (int i = 0; i < getCount(); i++) {
+                getItem(i).isActive = false;
+            }
+            dreamInfo.isActive = true;
+            mBackend.setActiveDream(dreamInfo.componentName);
+            notifyDataSetChanged();
+        }
+    }
+
+    private class PackageReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            logd("PackageReceiver.onReceive");
+            refreshFromBackend();
+        }
     }
 }
diff --git a/src/com/android/settings/DreamTesterPreference.java b/src/com/android/settings/DreamTesterPreference.java
deleted file mode 100644
index 87a142c..0000000
--- a/src/com/android/settings/DreamTesterPreference.java
+++ /dev/null
@@ -1,87 +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 static android.provider.Settings.Secure.SCREENSAVER_COMPONENT;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.ComponentName;
-import android.content.ContentResolver;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.res.Resources;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.preference.Preference;
-import android.provider.Settings;
-import android.service.dreams.IDreamManager;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.ListAdapter;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class DreamTesterPreference extends Preference {
-    private static final String TAG = "DreamTesterPreference";
-    
-    private final PackageManager pm;
-    private final ContentResolver resolver;
-
-    public DreamTesterPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        pm = getContext().getPackageManager();
-        resolver = getContext().getContentResolver();
-    }
-
-    @Override
-    protected void onClick() {
-        String component = Settings.Secure.getString(resolver, SCREENSAVER_COMPONENT);
-        Log.v(TAG, "component=" + component);
-        if (component != null) {
-            ComponentName cn = ComponentName.unflattenFromString(component);
-            Log.v(TAG, "cn=" + cn);
-//            Intent intent = new Intent(Intent.ACTION_MAIN)
-//                .setComponent(cn)
-//                .addFlags(
-//                    Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
-//                    )
-//                .putExtra("android.dreams.TEST", true);
-//            getContext().startService(intent);
-            IDreamManager dm = IDreamManager.Stub.asInterface(
-                    ServiceManager.getService("dreams"));
-            try {
-                dm.testDream(cn);
-            } catch (RemoteException ex) {
-                // too bad, so sad, oh mom, oh dad
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/EventLogTags.logtags b/src/com/android/settings/EventLogTags.logtags
new file mode 100644
index 0000000..3e87c53
--- /dev/null
+++ b/src/com/android/settings/EventLogTags.logtags
@@ -0,0 +1,6 @@
+# See system/core/logcat/event.logtags for a description of the format of this file.
+
+option java_package com.android.settings
+
+# log the type of screen lock when user sets lock screen
+90200 lock_screen_type (type|3)
diff --git a/src/com/android/settings/HelpUtils.java b/src/com/android/settings/HelpUtils.java
new file mode 100644
index 0000000..22e2f76
--- /dev/null
+++ b/src/com/android/settings/HelpUtils.java
@@ -0,0 +1,148 @@
+/*
+ * 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.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.net.Uri;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.MenuItem;
+
+import java.util.Locale;
+
+/**
+ * Functions to easily prepare contextual help menu option items with an intent that opens up the
+ * browser to a particular URL, while taking into account the preferred language and app version.
+ */
+public class HelpUtils {
+    private final static String TAG = HelpUtils.class.getName();
+
+    /**
+     * Help URL query parameter key for the preferred language.
+     */
+    private final static String PARAM_LANGUAGE_CODE = "hl";
+
+    /**
+     * Help URL query parameter key for the app version.
+     */
+    private final static String PARAM_VERSION = "version";
+
+    /**
+     * Cached version code to prevent repeated calls to the package manager.
+     */
+    private static String sCachedVersionCode = null;
+
+    /** Static helper that is not instantiable*/
+    private HelpUtils() { }
+
+    /**
+     * Prepares the help menu item by doing the following.
+     * - If the string corresponding to the helpUrlResourceId is empty or null, then the help menu
+     *   item is made invisible.
+     * - Otherwise, this makes the help menu item visible and sets the intent for the help menu
+     *   item to view the URL.
+     *
+     * @return returns whether the help menu item has been made visible.
+     */
+    public static boolean prepareHelpMenuItem(Context context, MenuItem helpMenuItem,
+            int helpUrlResourceId) {
+        String helpUrlString = context.getResources().getString(helpUrlResourceId);
+        return prepareHelpMenuItem(context, helpMenuItem, helpUrlString);
+    }
+
+    /**
+     * Prepares the help menu item by doing the following.
+     * - If the helpUrlString is empty or null, the help menu item is made invisible.
+     * - Otherwise, this makes the help menu item visible and sets the intent for the help menu
+     *   item to view the URL.
+     *
+     * @return returns whether the help menu item has been made visible.
+     */
+    public static boolean prepareHelpMenuItem(Context context, MenuItem helpMenuItem,
+            String helpUrlString) {
+        if (TextUtils.isEmpty(helpUrlString)) {
+            // The help url string is empty or null, so set the help menu item to be invisible.
+            helpMenuItem.setVisible(false);
+
+            // return that the help menu item is not visible (i.e. false)
+            return false;
+        } else {
+            // The help url string exists, so first add in some extra query parameters.
+            final Uri fullUri = uriWithAddedParameters(context, Uri.parse(helpUrlString));
+
+            // Then, create an intent that will be fired when the user
+            // selects this help menu item.
+            Intent intent = new Intent(Intent.ACTION_VIEW, fullUri);
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                    | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+
+            // Set the intent to the help menu item, show the help menu item in the overflow
+            // menu, and make it visible.
+            ComponentName component = intent.resolveActivity(context.getPackageManager());
+            if (component != null) {
+                helpMenuItem.setIntent(intent);
+                helpMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+                helpMenuItem.setVisible(true);
+            } else {
+                helpMenuItem.setVisible(false);
+                return false;
+            }
+
+            // return that the help menu item is visible (i.e., true)
+            return true;
+        }
+    }
+
+    /**
+     * Adds two query parameters into the Uri, namely the language code and the version code
+     * of the app's package as gotten via the context.
+     * @return the uri with added query parameters
+     */
+    public static Uri uriWithAddedParameters(Context context, Uri baseUri) {
+        Uri.Builder builder = baseUri.buildUpon();
+
+        // Add in the preferred language
+        builder.appendQueryParameter(PARAM_LANGUAGE_CODE, Locale.getDefault().toString());
+
+        // Add in the package version code
+        if (sCachedVersionCode == null) {
+            // There is no cached version code, so try to get it from the package manager.
+            try {
+                // cache the version code
+                PackageInfo info = context.getPackageManager().getPackageInfo(
+                        context.getPackageName(), 0);
+                sCachedVersionCode = Integer.toString(info.versionCode);
+
+                // append the version code to the uri
+                builder.appendQueryParameter(PARAM_VERSION, sCachedVersionCode);
+            } catch (NameNotFoundException e) {
+                // Cannot find the package name, so don't add in the version parameter
+                // This shouldn't happen.
+                Log.wtf(TAG, "Invalid package name for context", e);
+            }
+        } else {
+            builder.appendQueryParameter(PARAM_VERSION, sCachedVersionCode);
+        }
+
+        // Build the full uri and return it
+        return builder.build();
+    }
+}
diff --git a/src/com/android/settings/HomeSettings.java b/src/com/android/settings/HomeSettings.java
new file mode 100644
index 0000000..eb659e2
--- /dev/null
+++ b/src/com/android/settings/HomeSettings.java
@@ -0,0 +1,293 @@
+/*
+ * 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 java.util.ArrayList;
+
+import android.app.ActivityManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.graphics.ColorFilter;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.preference.Preference;
+import android.preference.PreferenceGroup;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ImageView;
+import android.widget.RadioButton;
+
+public class HomeSettings extends SettingsPreferenceFragment {
+    static final String TAG = "HomeSettings";
+
+    static final int REQUESTING_UNINSTALL = 10;
+
+    public static final String HOME_PREFS = "home_prefs";
+    public static final String HOME_PREFS_DO_SHOW = "do_show";
+
+    public static final String HOME_SHOW_NOTICE = "show";
+
+    PreferenceGroup mPrefGroup;
+
+    PackageManager mPm;
+    ComponentName[] mHomeComponentSet;
+    ArrayList<HomeAppPreference> mPrefs;
+    HomeAppPreference mCurrentHome = null;
+    final IntentFilter mHomeFilter;
+    boolean mShowNotice;
+
+    public HomeSettings() {
+        mHomeFilter = new IntentFilter(Intent.ACTION_MAIN);
+        mHomeFilter.addCategory(Intent.CATEGORY_HOME);
+        mHomeFilter.addCategory(Intent.CATEGORY_DEFAULT);
+    }
+
+    OnClickListener mHomeClickListener = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            int index = (Integer)v.getTag();
+            HomeAppPreference pref = mPrefs.get(index);
+            if (!pref.isChecked) {
+                makeCurrentHome(pref);
+            }
+        }
+    };
+
+    OnClickListener mDeleteClickListener = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            int index = (Integer)v.getTag();
+            uninstallApp(mPrefs.get(index));
+        }
+    };
+
+    void makeCurrentHome(HomeAppPreference newHome) {
+        if (mCurrentHome != null) {
+            mCurrentHome.setChecked(false);
+        }
+        newHome.setChecked(true);
+        mCurrentHome = newHome;
+
+        mPm.replacePreferredActivity(mHomeFilter, IntentFilter.MATCH_CATEGORY_EMPTY,
+                mHomeComponentSet, newHome.activityName);
+    }
+
+    void uninstallApp(HomeAppPreference pref) {
+        // Uninstallation is done by asking the OS to do it
+       Uri packageURI = Uri.parse("package:" + pref.uninstallTarget);
+       Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageURI);
+       uninstallIntent.putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, false);
+       int requestCode = REQUESTING_UNINSTALL + (pref.isChecked ? 1 : 0);
+       startActivityForResult(uninstallIntent, requestCode);
+   }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        // Rebuild the list now that we might have nuked something
+        buildHomeActivitiesList();
+
+        // if the previous home app is now gone, fall back to the system one
+        if (requestCode > REQUESTING_UNINSTALL) {
+            // if mCurrentHome has gone null, it means we didn't find the previously-
+            // default home app when rebuilding the list, i.e. it was the one we
+            // just uninstalled.  When that happens we make the system-bundled
+            // home app the active default.
+            if (mCurrentHome == null) {
+                for (int i = 0; i < mPrefs.size(); i++) {
+                    HomeAppPreference pref = mPrefs.get(i);
+                    if (pref.isSystem) {
+                        makeCurrentHome(pref);
+                        break;
+                    }
+                }
+            }
+        }
+
+        // If we're down to just one possible home app, back out of this settings
+        // fragment and show a dialog explaining to the user that they won't see
+        // 'Home' settings now until such time as there are multiple available.
+        if (mPrefs.size() < 2) {
+            if (mShowNotice) {
+                mShowNotice = false;
+                Settings.requestHomeNotice();
+            }
+            finishFragment();
+        }
+    }
+
+    void buildHomeActivitiesList() {
+        ArrayList<ResolveInfo> homeActivities = new ArrayList<ResolveInfo>();
+        ComponentName currentDefaultHome  = mPm.getHomeActivities(homeActivities);
+
+        Context context = getActivity();
+        mCurrentHome = null;
+        mPrefGroup.removeAll();
+        mPrefs = new ArrayList<HomeAppPreference>();
+        mHomeComponentSet = new ComponentName[homeActivities.size()];
+        int prefIndex = 0;
+        for (int i = 0; i < homeActivities.size(); i++) {
+            final ResolveInfo candidate = homeActivities.get(i);
+            final ActivityInfo info = candidate.activityInfo;
+            ComponentName activityName = new ComponentName(info.packageName, info.name);
+            mHomeComponentSet[i] = activityName;
+            try {
+                Drawable icon = info.loadIcon(mPm);
+                CharSequence name = info.loadLabel(mPm);
+                HomeAppPreference pref = new HomeAppPreference(context, activityName, prefIndex,
+                        icon, name, this, info);
+                mPrefs.add(pref);
+                mPrefGroup.addPreference(pref);
+                pref.setEnabled(true);
+                if (activityName.equals(currentDefaultHome)) {
+                    mCurrentHome = pref;
+                }
+                prefIndex++;
+            } catch (Exception e) {
+                Log.v(TAG, "Problem dealing with activity " + activityName, e);
+            }
+        }
+
+        if (mCurrentHome != null) {
+            new Handler().post(new Runnable() {
+               public void run() {
+                   mCurrentHome.setChecked(true);
+               }
+            });
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.home_selection);
+
+        mPm = getPackageManager();
+        mPrefGroup = (PreferenceGroup) findPreference("home");
+
+        Bundle args = getArguments();
+        mShowNotice = (args != null) && args.getBoolean(HOME_SHOW_NOTICE, false);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        buildHomeActivitiesList();
+    }
+
+    class HomeAppPreference extends Preference {
+        ComponentName activityName;
+        int index;
+        HomeSettings fragment;
+        final ColorFilter grayscaleFilter;
+        boolean isChecked;
+
+        boolean isSystem;
+        String uninstallTarget;
+
+        public HomeAppPreference(Context context, ComponentName activity,
+                int i, Drawable icon, CharSequence title,
+                HomeSettings parent, ActivityInfo info) {
+            super(context);
+            setLayoutResource(R.layout.preference_home_app);
+            setIcon(icon);
+            setTitle(title);
+            activityName = activity;
+            fragment = parent;
+            index = i;
+
+            ColorMatrix colorMatrix = new ColorMatrix();
+            colorMatrix.setSaturation(0f);
+            float[] matrix = colorMatrix.getArray();
+            matrix[18] = 0.5f;
+            grayscaleFilter = new ColorMatrixColorFilter(colorMatrix);
+
+            determineTargets(info);
+        }
+
+        // Check whether this activity is bundled on the system, with awareness
+        // of the META_HOME_ALTERNATE mechanism.
+        private void determineTargets(ActivityInfo info) {
+            final Bundle meta = info.metaData;
+            if (meta != null) {
+                final String altHomePackage = meta.getString(ActivityManager.META_HOME_ALTERNATE);
+                if (altHomePackage != null) {
+                    try {
+                        final int match = mPm.checkSignatures(info.packageName, altHomePackage);
+                        if (match >= PackageManager.SIGNATURE_MATCH) {
+                            PackageInfo altInfo = mPm.getPackageInfo(altHomePackage, 0);
+                            final int altFlags = altInfo.applicationInfo.flags;
+                            isSystem = (altFlags & ApplicationInfo.FLAG_SYSTEM) != 0;
+                            uninstallTarget = altInfo.packageName;
+                            return;
+                        }
+                    } catch (Exception e) {
+                        // e.g. named alternate package not found during lookup
+                        Log.w(TAG, "Unable to compare/resolve alternate", e);
+                    }
+                }
+            }
+            // No suitable metadata redirect, so use the package's own info
+            isSystem = (info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
+            uninstallTarget = info.packageName;
+        }
+
+        @Override
+        protected void onBindView(View view) {
+            super.onBindView(view);
+
+            RadioButton radio = (RadioButton) view.findViewById(R.id.home_radio);
+            radio.setChecked(isChecked);
+
+            Integer indexObj = new Integer(index);
+
+            ImageView icon = (ImageView) view.findViewById(R.id.home_app_uninstall);
+            if (isSystem) {
+                icon.setEnabled(false);
+                icon.setColorFilter(grayscaleFilter);
+            } else {
+                icon.setOnClickListener(mDeleteClickListener);
+                icon.setTag(indexObj);
+            }
+
+            View v = view.findViewById(R.id.home_app_pref);
+            v.setOnClickListener(mHomeClickListener);
+            v.setTag(indexObj);
+        }
+
+        void setChecked(boolean state) {
+            if (state != isChecked) {
+                isChecked = state;
+                notifyChanged();
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/KeyguardAppWidgetPickActivity.java b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
new file mode 100644
index 0000000..f3db2ca
--- /dev/null
+++ b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
@@ -0,0 +1,631 @@
+/*
+ * 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.app.LauncherActivity.IconResizer;
+import android.appwidget.AppWidgetHost;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProviderInfo;
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+import android.os.Bundle;
+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;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.GridView;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.android.internal.widget.LockPatternUtils;
+
+import java.lang.ref.WeakReference;
+import java.util.List;
+
+/**
+ * Displays a list of {@link AppWidgetProviderInfo} widgets, along with any
+ * injected special widgets specified through
+ * {@link AppWidgetManager#EXTRA_CUSTOM_INFO} and
+ * {@link AppWidgetManager#EXTRA_CUSTOM_EXTRAS}.
+ * <p>
+ * When an installed {@link AppWidgetProviderInfo} is selected, this activity
+ * will bind it to the given {@link AppWidgetManager#EXTRA_APPWIDGET_ID},
+ * otherwise it will return the requested extras.
+ */
+public class KeyguardAppWidgetPickActivity extends Activity
+    implements GridView.OnItemClickListener,
+        AppWidgetLoader.ItemConstructor<KeyguardAppWidgetPickActivity.Item> {
+    private static final String TAG = "KeyguardAppWidgetPickActivity";
+    private static final int REQUEST_PICK_APPWIDGET = 126;
+    private static final int REQUEST_CREATE_APPWIDGET = 127;
+
+    private AppWidgetLoader<Item> mAppWidgetLoader;
+    private List<Item> mItems;
+    private GridView mGridView;
+    private AppWidgetAdapter mAppWidgetAdapter;
+    private AppWidgetManager mAppWidgetManager;
+    private int mAppWidgetId;
+    // Might make it possible to make this be false in future
+    private boolean mAddingToKeyguard = true;
+    private Intent mResultData;
+    private LockPatternUtils mLockPatternUtils;
+    private Bundle mExtraConfigureOptions;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        setContentView(R.layout.keyguard_appwidget_picker_layout);
+        super.onCreate(savedInstanceState);
+
+        // Set default return data
+        setResultData(RESULT_CANCELED, null);
+
+        // Read the appWidgetId passed our direction, otherwise bail if not found
+        final Intent intent = getIntent();
+        if (intent.hasExtra(AppWidgetManager.EXTRA_APPWIDGET_ID)) {
+            mAppWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
+                    AppWidgetManager.INVALID_APPWIDGET_ID);
+        } else {
+            finish();
+        }
+        mExtraConfigureOptions = intent.getBundleExtra(AppWidgetManager.EXTRA_APPWIDGET_OPTIONS);
+
+        mGridView = (GridView) findViewById(R.id.widget_list);
+        DisplayMetrics dm = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(dm);
+        int maxGridWidth = getResources().getDimensionPixelSize(
+                R.dimen.keyguard_appwidget_picker_max_width);
+
+        if (maxGridWidth < dm.widthPixels) {
+            mGridView.getLayoutParams().width = maxGridWidth;
+        }
+        mAppWidgetManager = AppWidgetManager.getInstance(this);
+        mAppWidgetLoader = new AppWidgetLoader<Item>(this, mAppWidgetManager, this);
+        mItems = mAppWidgetLoader.getItems(getIntent());
+        mAppWidgetAdapter = new AppWidgetAdapter(this, mItems);
+        mGridView.setAdapter(mAppWidgetAdapter);
+        mGridView.setOnItemClickListener(this);
+
+        mLockPatternUtils = new LockPatternUtils(this); // TEMP-- we want to delete this
+    }
+
+    /**
+     * Convenience method for setting the result code and intent. This method
+     * correctly injects the {@link AppWidgetManager#EXTRA_APPWIDGET_ID} that
+     * most hosts expect returned.
+     */
+    void setResultData(int code, Intent intent) {
+        Intent result = intent != null ? intent : new Intent();
+        result.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId);
+        mResultData = result;
+        setResult(code, result);
+    }
+
+    /**
+     * Item that appears in the AppWidget picker grid.
+     */
+    public static class Item implements AppWidgetLoader.LabelledItem {
+        protected static IconResizer sResizer;
+
+
+        CharSequence label;
+        int appWidgetPreviewId;
+        int iconId;
+        String packageName;
+        String className;
+        Bundle extras;
+        private WidgetPreviewLoader mWidgetPreviewLoader;
+        private Context mContext;
+
+        /**
+         * Create a list item from given label and icon.
+         */
+        Item(Context context, CharSequence label) {
+            this.label = label;
+            mContext = context;
+        }
+
+        void loadWidgetPreview(ImageView v) {
+            mWidgetPreviewLoader = new WidgetPreviewLoader(mContext, v);
+            mWidgetPreviewLoader.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR, (Void[]) null);
+        }
+
+        void cancelLoadingWidgetPreview() {
+            if (mWidgetPreviewLoader != null) {
+                mWidgetPreviewLoader.cancel(false);
+                mWidgetPreviewLoader = null;
+            }
+        }
+
+        /**
+         * Build the {@link Intent} described by this item. If this item
+         * can't create a valid {@link android.content.ComponentName}, it will return
+         * {@link Intent#ACTION_CREATE_SHORTCUT} filled with the item label.
+         */
+        Intent getIntent() {
+            Intent intent = new Intent();
+            if (packageName != null && className != null) {
+                // Valid package and class, so fill details as normal intent
+                intent.setClassName(packageName, className);
+                if (extras != null) {
+                    intent.putExtras(extras);
+                }
+            } else {
+                // No valid package or class, so treat as shortcut with label
+                intent.setAction(Intent.ACTION_CREATE_SHORTCUT);
+                intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, label);
+            }
+            return intent;
+        }
+
+        public CharSequence getLabel() {
+            return label;
+        }
+
+        class WidgetPreviewLoader extends AsyncTask<Void, Bitmap, Void> {
+            private Resources mResources;
+            private PackageManager mPackageManager;
+            private int mIconDpi;
+            private ImageView mView;
+            public WidgetPreviewLoader(Context context, ImageView v) {
+                super();
+                mResources = context.getResources();
+                mPackageManager = context.getPackageManager();
+                ActivityManager activityManager =
+                        (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+                mIconDpi = activityManager.getLauncherLargeIconDensity();
+                mView = v;
+            }
+            public Void doInBackground(Void... params) {
+                if (!isCancelled()) {
+                    int appWidgetPreviewWidth =
+                            mResources.getDimensionPixelSize(R.dimen.appwidget_preview_width);
+                    int appWidgetPreviewHeight =
+                            mResources.getDimensionPixelSize(R.dimen.appwidget_preview_height);
+                    Bitmap b = getWidgetPreview(new ComponentName(packageName, className),
+                            appWidgetPreviewId, iconId,
+                            appWidgetPreviewWidth, appWidgetPreviewHeight);
+                    publishProgress(b);
+                }
+                return null;
+            }
+            public void onProgressUpdate(Bitmap... values) {
+                if (!isCancelled()) {
+                    Bitmap b = values[0];
+                    mView.setImageBitmap(b);
+                }
+            }
+            abstract class WeakReferenceThreadLocal<T> {
+                private ThreadLocal<WeakReference<T>> mThreadLocal;
+                public WeakReferenceThreadLocal() {
+                    mThreadLocal = new ThreadLocal<WeakReference<T>>();
+                }
+
+                abstract T initialValue();
+
+                public void set(T t) {
+                    mThreadLocal.set(new WeakReference<T>(t));
+                }
+
+                public T get() {
+                    WeakReference<T> reference = mThreadLocal.get();
+                    T obj;
+                    if (reference == null) {
+                        obj = initialValue();
+                        mThreadLocal.set(new WeakReference<T>(obj));
+                        return obj;
+                    } else {
+                        obj = reference.get();
+                        if (obj == null) {
+                            obj = initialValue();
+                            mThreadLocal.set(new WeakReference<T>(obj));
+                        }
+                        return obj;
+                    }
+                }
+            }
+
+            class CanvasCache extends WeakReferenceThreadLocal<Canvas> {
+                @Override
+                protected Canvas initialValue() {
+                    return new Canvas();
+                }
+            }
+
+            class PaintCache extends WeakReferenceThreadLocal<Paint> {
+                @Override
+                protected Paint initialValue() {
+                    return null;
+                }
+            }
+
+            class BitmapCache extends WeakReferenceThreadLocal<Bitmap> {
+                @Override
+                protected Bitmap initialValue() {
+                    return null;
+                }
+            }
+
+            class RectCache extends WeakReferenceThreadLocal<Rect> {
+                @Override
+                protected Rect initialValue() {
+                    return new Rect();
+                }
+            }
+
+            // Used for drawing widget previews
+            CanvasCache sCachedAppWidgetPreviewCanvas = new CanvasCache();
+            RectCache sCachedAppWidgetPreviewSrcRect = new RectCache();
+            RectCache sCachedAppWidgetPreviewDestRect = new RectCache();
+            PaintCache sCachedAppWidgetPreviewPaint = new PaintCache();
+
+            private Bitmap getWidgetPreview(ComponentName provider, int previewImage,
+                    int iconId, int maxWidth, int maxHeight) {
+                // Load the preview image if possible
+                String packageName = provider.getPackageName();
+                if (maxWidth < 0) maxWidth = Integer.MAX_VALUE;
+                if (maxHeight < 0) maxHeight = Integer.MAX_VALUE;
+
+
+                int appIconSize = mResources.getDimensionPixelSize(R.dimen.app_icon_size);
+
+                Drawable drawable = null;
+                if (previewImage != 0) {
+                    drawable = mPackageManager.getDrawable(packageName, previewImage, null);
+                    if (drawable == null) {
+                        Log.w(TAG, "Can't load widget preview drawable 0x" +
+                                Integer.toHexString(previewImage) + " for provider: " + provider);
+                    }
+                }
+
+                int bitmapWidth;
+                int bitmapHeight;
+                Bitmap defaultPreview = null;
+                boolean widgetPreviewExists = (drawable != null);
+                if (widgetPreviewExists) {
+                    bitmapWidth = drawable.getIntrinsicWidth();
+                    bitmapHeight = drawable.getIntrinsicHeight();
+                } else {
+                    // Generate a preview image if we couldn't load one
+                    bitmapWidth = appIconSize;
+                    bitmapHeight = appIconSize;
+                    defaultPreview = Bitmap.createBitmap(bitmapWidth, bitmapHeight,
+                            Config.ARGB_8888);
+
+                    try {
+                        Drawable icon = null;
+                        if (iconId > 0)
+                            icon = getFullResIcon(packageName, iconId);
+                        if (icon != null) {
+                            renderDrawableToBitmap(icon, defaultPreview, 0,
+                                    0, appIconSize, appIconSize);
+                        }
+                    } catch (Resources.NotFoundException e) {
+                    }
+                }
+
+                // Scale to fit width only - let the widget preview be clipped in the
+                // vertical dimension
+                float scale = 1f;
+                if (bitmapWidth > maxWidth) {
+                    scale = maxWidth / (float) bitmapWidth;
+                }
+                int finalPreviewWidth = (int) (scale * bitmapWidth);
+                int finalPreviewHeight = (int) (scale * bitmapHeight);
+
+                bitmapWidth = finalPreviewWidth;
+                bitmapHeight = Math.min(finalPreviewHeight, maxHeight);
+
+                Bitmap preview = Bitmap.createBitmap(bitmapWidth, bitmapHeight,
+                        Config.ARGB_8888);
+
+                // Draw the scaled preview into the final bitmap
+                if (widgetPreviewExists) {
+                    renderDrawableToBitmap(drawable, preview, 0, 0, finalPreviewWidth,
+                            finalPreviewHeight);
+                } else {
+                    final Canvas c = sCachedAppWidgetPreviewCanvas.get();
+                    final Rect src = sCachedAppWidgetPreviewSrcRect.get();
+                    final Rect dest = sCachedAppWidgetPreviewDestRect.get();
+                    c.setBitmap(preview);
+                    src.set(0, 0, defaultPreview.getWidth(), defaultPreview.getHeight());
+                    dest.set(0, 0, finalPreviewWidth, finalPreviewHeight);
+
+                    Paint p = sCachedAppWidgetPreviewPaint.get();
+                    if (p == null) {
+                        p = new Paint();
+                        p.setFilterBitmap(true);
+                        sCachedAppWidgetPreviewPaint.set(p);
+                    }
+                    c.drawBitmap(defaultPreview, src, dest, p);
+                    c.setBitmap(null);
+                }
+                return preview;
+            }
+            public Drawable getFullResDefaultActivityIcon() {
+                return getFullResIcon(Resources.getSystem(),
+                        android.R.mipmap.sym_def_app_icon);
+            }
+
+            public Drawable getFullResIcon(Resources resources, int iconId) {
+                Drawable d;
+                try {
+                    d = resources.getDrawableForDensity(iconId, mIconDpi);
+                } catch (Resources.NotFoundException e) {
+                    d = null;
+                }
+
+                return (d != null) ? d : getFullResDefaultActivityIcon();
+            }
+
+            public Drawable getFullResIcon(String packageName, int iconId) {
+                Resources resources;
+                try {
+                    resources = mPackageManager.getResourcesForApplication(packageName);
+                } catch (PackageManager.NameNotFoundException e) {
+                    resources = null;
+                }
+                if (resources != null) {
+                    if (iconId != 0) {
+                        return getFullResIcon(resources, iconId);
+                    }
+                }
+                return getFullResDefaultActivityIcon();
+            }
+
+            private void renderDrawableToBitmap(Drawable d, Bitmap bitmap, int x, int y, int w, int h) {
+                renderDrawableToBitmap(d, bitmap, x, y, w, h, 1f);
+            }
+
+            private void renderDrawableToBitmap(Drawable d, Bitmap bitmap, int x, int y, int w, int h,
+                    float scale) {
+                if (bitmap != null) {
+                    Canvas c = new Canvas(bitmap);
+                    c.scale(scale, scale);
+                    Rect oldBounds = d.copyBounds();
+                    d.setBounds(x, y, x + w, y + h);
+                    d.draw(c);
+                    d.setBounds(oldBounds); // Restore the bounds
+                    c.setBitmap(null);
+                }
+            }
+        }
+    }
+
+    @Override
+    public Item createItem(Context context, AppWidgetProviderInfo info, Bundle extras) {
+        CharSequence label = info.label;
+
+        Item item = new Item(context, label);
+        item.appWidgetPreviewId = info.previewImage;
+        item.iconId = info.icon;
+        item.packageName = info.provider.getPackageName();
+        item.className = info.provider.getClassName();
+        item.extras = extras;
+        return item;
+    }
+
+    protected static class AppWidgetAdapter extends BaseAdapter {
+        private final LayoutInflater mInflater;
+        private final List<Item> mItems;
+
+        /**
+         * Create an adapter for the given items.
+         */
+        public AppWidgetAdapter(Context context, List<Item> items) {
+            mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            mItems = items;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public int getCount() {
+            return mItems.size();
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public Object getItem(int position) {
+            return mItems.get(position);
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public long getItemId(int position) {
+            return position;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public View getView(int position, View convertView, ViewGroup parent) {
+            if (convertView == null) {
+                convertView = mInflater.inflate(R.layout.keyguard_appwidget_item, parent, false);
+            }
+
+            Item item = (Item) getItem(position);
+            TextView textView = (TextView) convertView.findViewById(R.id.label);
+            textView.setText(item.label);
+            ImageView iconView = (ImageView) convertView.findViewById(R.id.icon);
+            iconView.setImageDrawable(null);
+            item.loadWidgetPreview(iconView);
+            return convertView;
+        }
+
+        public void cancelAllWidgetPreviewLoaders() {
+            for (int i = 0; i < mItems.size(); i++) {
+                mItems.get(i).cancelLoadingWidgetPreview();
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        Item item = mItems.get(position);
+        Intent intent = item.getIntent();
+
+        int result;
+        if (item.extras != null) {
+            // If these extras are present it's because this entry is custom.
+            // Don't try to bind it, just pass it back to the app.
+            result = RESULT_OK;
+            setResultData(result, intent);
+        } else {
+            try {
+                if (mAddingToKeyguard && mAppWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
+                    // Found in KeyguardHostView.java
+                    final int KEYGUARD_HOST_ID = 0x4B455947;
+                    int userId = ActivityManager.getCurrentUser();
+                    mAppWidgetId = AppWidgetHost.allocateAppWidgetIdForPackage(KEYGUARD_HOST_ID,
+                            userId, "com.android.keyguard");
+                }
+                mAppWidgetManager.bindAppWidgetId(
+                        mAppWidgetId, intent.getComponent(), mExtraConfigureOptions);
+                result = RESULT_OK;
+            } catch (IllegalArgumentException e) {
+                // This is thrown if they're already bound, or otherwise somehow
+                // bogus.  Set the result to canceled, and exit.  The app *should*
+                // clean up at this point.  We could pass the error along, but
+                // it's not clear that that's useful -- the widget will simply not
+                // appear.
+                result = RESULT_CANCELED;
+            }
+            setResultData(result, null);
+        }
+        if (mAddingToKeyguard) {
+            onActivityResult(REQUEST_PICK_APPWIDGET, result, mResultData);
+        } else {
+            finish();
+        }
+    }
+
+    protected void onDestroy() {
+        if (mAppWidgetAdapter != null) {
+            mAppWidgetAdapter.cancelAllWidgetPreviewLoaders();
+        }
+        super.onDestroy();
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_PICK_APPWIDGET || requestCode == REQUEST_CREATE_APPWIDGET) {
+            int appWidgetId;
+            if  (data == null) {
+                appWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID ;
+            } else {
+                appWidgetId = data.getIntExtra(
+                        AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
+            }
+            if (requestCode == REQUEST_PICK_APPWIDGET && resultCode == Activity.RESULT_OK) {
+                AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(this);
+
+                AppWidgetProviderInfo appWidget = null;
+                appWidget = appWidgetManager.getAppWidgetInfo(appWidgetId);
+
+                if (appWidget.configure != null) {
+                    // Launch over to configure widget, if needed
+                    Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_CONFIGURE);
+                    intent.setComponent(appWidget.configure);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+                    intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
+
+                    startActivityForResultSafely(intent, REQUEST_CREATE_APPWIDGET);
+                } else {
+                    // Otherwise just add it
+                    onActivityResult(REQUEST_CREATE_APPWIDGET, Activity.RESULT_OK, data);
+                }
+            } else if (requestCode == REQUEST_CREATE_APPWIDGET && resultCode == Activity.RESULT_OK) {
+                mLockPatternUtils.addAppWidget(appWidgetId, 0);
+                finishDelayedAndShowLockScreen(appWidgetId);
+            } else {
+                if (mAddingToKeyguard &&
+                        mAppWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID) {
+                    int userId = ActivityManager.getCurrentUser();
+                    AppWidgetHost.deleteAppWidgetIdForSystem(mAppWidgetId, userId);
+                }
+                finishDelayedAndShowLockScreen(AppWidgetManager.INVALID_APPWIDGET_ID);
+            }
+        }
+    }
+
+    private void finishDelayedAndShowLockScreen(int appWidgetId) {
+        IBinder b = ServiceManager.getService(Context.WINDOW_SERVICE);
+        IWindowManager iWm = IWindowManager.Stub.asInterface(b);
+        Bundle opts = null;
+        if (appWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID) {
+            opts = new Bundle();
+            opts.putInt(LockPatternUtils.KEYGUARD_SHOW_APPWIDGET, appWidgetId);
+        }
+        try {
+            iWm.lockNow(opts);
+        } catch (RemoteException e) {
+        }
+
+        // Change background to all black
+        ViewGroup root = (ViewGroup) findViewById(R.id.layout_root);
+        root.setBackgroundColor(0xFF000000);
+        // Hide all children
+        final int childCount = root.getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            root.getChildAt(i).setVisibility(View.INVISIBLE);
+        }
+        mGridView.postDelayed(new Runnable() {
+            public void run() {
+                finish();
+            }
+        }, 500);
+    }
+
+    void startActivityForResultSafely(Intent intent, int requestCode) {
+        try {
+            startActivityForResult(intent, requestCode);
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(this, R.string.activity_not_found, Toast.LENGTH_SHORT).show();
+        } catch (SecurityException e) {
+            Toast.makeText(this, R.string.activity_not_found, Toast.LENGTH_SHORT).show();
+            Log.e(TAG, "Settings does not have the permission to launch " + intent, e);
+        }
+    }
+}
diff --git a/src/com/android/settings/LocalePicker.java b/src/com/android/settings/LocalePicker.java
index 8b94ccb..6600703 100644
--- a/src/com/android/settings/LocalePicker.java
+++ b/src/com/android/settings/LocalePicker.java
@@ -16,18 +16,111 @@
 
 package com.android.settings;
 
+import android.app.Dialog;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListView;
+import android.content.Context;
+
+import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
+import com.android.settings.DevelopmentSettings;
+
 import java.util.Locale;
 
 public class LocalePicker extends com.android.internal.app.LocalePicker
-        implements com.android.internal.app.LocalePicker.LocaleSelectionListener {
+        implements com.android.internal.app.LocalePicker.LocaleSelectionListener,
+        DialogCreatable {
+
+    private static final String TAG = "LocalePicker";
+
+    private SettingsDialogFragment mDialogFragment;
+    private static final int DLG_SHOW_GLOBAL_WARNING = 1;
+    private static final String SAVE_TARGET_LOCALE = "locale";
+
+    private Locale mTargetLocale;
+
     public LocalePicker() {
         super();
         setLocaleSelectionListener(this);
     }
 
     @Override
-    public void onLocaleSelected(Locale locale) {
-        getActivity().onBackPressed();
-        LocalePicker.updateLocale(locale);
+    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)) {
+            mTargetLocale = new Locale(savedInstanceState.getString(SAVE_TARGET_LOCALE));
+        }
+    }
+
+    @Override
+    public View onCreateView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        final View view = super.onCreateView(inflater, container, savedInstanceState);
+        final ListView list = (ListView) view.findViewById(android.R.id.list);
+        Utils.forcePrepareCustomPreferencesList(container, view, list, false);
+        return view;
+    }
+
+    @Override
+    public void onLocaleSelected(final Locale locale) {
+        if (Utils.hasMultipleUsers(getActivity())) {
+            mTargetLocale = locale;
+            showDialog(DLG_SHOW_GLOBAL_WARNING);
+        } else {
+            getActivity().onBackPressed();
+            LocalePicker.updateLocale(locale);
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        if (mTargetLocale != null) {
+            outState.putString(SAVE_TARGET_LOCALE, mTargetLocale.toString());
+        }
+    }
+
+    protected void showDialog(int dialogId) {
+        if (mDialogFragment != null) {
+            Log.e(TAG, "Old dialog fragment not null!");
+        }
+        mDialogFragment = new SettingsDialogFragment(this, dialogId);
+        mDialogFragment.show(getActivity().getFragmentManager(), Integer.toString(dialogId));
+    }
+
+    public Dialog onCreateDialog(final int dialogId) {
+        return Utils.buildGlobalChangeWarningDialog(getActivity(),
+                R.string.global_locale_change_title,
+                new Runnable() {
+                    public void run() {
+                        removeDialog(dialogId);
+                        getActivity().onBackPressed();
+                        LocalePicker.updateLocale(mTargetLocale);
+                    }
+                }
+        );
+    }
+
+    protected void removeDialog(int dialogId) {
+        // mDialogFragment may not be visible yet in parent fragment's onResume().
+        // To be able to dismiss dialog at that time, don't check
+        // mDialogFragment.isVisible().
+        if (mDialogFragment != null && mDialogFragment.getDialogId() == dialogId) {
+            mDialogFragment.dismiss();
+        }
+        mDialogFragment = null;
     }
 }
diff --git a/src/com/android/settings/LocationSettings.java b/src/com/android/settings/LocationSettings.java
deleted file mode 100644
index d5c4d9f..0000000
--- a/src/com/android/settings/LocationSettings.java
+++ /dev/null
@@ -1,232 +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.ContentQueryMap;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.location.LocationManager;
-import android.preference.CheckBoxPreference;
-import android.preference.Preference;
-import android.preference.PreferenceScreen;
-import android.preference.SwitchPreference;
-import android.provider.Settings;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.TextView;
-
-import java.util.Observable;
-import java.util.Observer;
-
-/**
- * Gesture lock pattern settings.
- */
-public class LocationSettings extends SettingsPreferenceFragment
-        implements Preference.OnPreferenceChangeListener {
-
-    // Location Settings
-    private static final String KEY_LOCATION_TOGGLE = "location_toggle";
-    private static final String KEY_LOCATION_NETWORK = "location_network";
-    private static final String KEY_LOCATION_GPS = "location_gps";
-    private static final String KEY_ASSISTED_GPS = "assisted_gps";
-
-    private CheckBoxPreference mNetwork;
-    private CheckBoxPreference mGps;
-    private CheckBoxPreference mAssistedGps;
-    private SwitchPreference mLocationAccess;
-
-    // These provide support for receiving notification when Location Manager settings change.
-    // This is necessary because the Network Location Provider can change settings
-    // if the user does not confirm enabling the provider.
-    private ContentQueryMap mContentQueryMap;
-
-    private Observer mSettingsObserver;
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        // listen for Location Manager settings changes
-        Cursor settingsCursor = getContentResolver().query(Settings.Secure.CONTENT_URI, null,
-                "(" + Settings.System.NAME + "=?)",
-                new String[]{Settings.Secure.LOCATION_PROVIDERS_ALLOWED},
-                null);
-        mContentQueryMap = new ContentQueryMap(settingsCursor, Settings.System.NAME, true, null);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        if (mSettingsObserver != null) {
-            mContentQueryMap.deleteObserver(mSettingsObserver);
-        }
-    }
-
-    private PreferenceScreen createPreferenceHierarchy() {
-        PreferenceScreen root = getPreferenceScreen();
-        if (root != null) {
-            root.removeAll();
-        }
-        addPreferencesFromResource(R.xml.location_settings);
-        root = getPreferenceScreen();
-
-        mLocationAccess = (SwitchPreference) root.findPreference(KEY_LOCATION_TOGGLE);
-        mNetwork = (CheckBoxPreference) root.findPreference(KEY_LOCATION_NETWORK);
-        mGps = (CheckBoxPreference) root.findPreference(KEY_LOCATION_GPS);
-        mAssistedGps = (CheckBoxPreference) root.findPreference(KEY_ASSISTED_GPS);
-
-        mLocationAccess.setOnPreferenceChangeListener(this);
-        return root;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        // Make sure we reload the preference hierarchy since some of these settings
-        // depend on others...
-        createPreferenceHierarchy();
-        updateLocationToggles();
-
-        if (mSettingsObserver == null) {
-            mSettingsObserver = new Observer() {
-                public void update(Observable o, Object arg) {
-                    updateLocationToggles();
-                }
-            };
-        }
-
-        mContentQueryMap.addObserver(mSettingsObserver);
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        final ContentResolver cr = getContentResolver();
-        if (preference == mNetwork) {
-            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);
-            }
-        } else if (preference == mAssistedGps) {
-            Settings.Secure.putInt(cr, Settings.Secure.ASSISTED_GPS_ENABLED,
-                    mAssistedGps.isChecked() ? 1 : 0);
-        } else {
-            // If we didn't handle it, let preferences handle it.
-            return super.onPreferenceTreeClick(preferenceScreen, preference);
-        }
-
-        return true;
-    }
-
-    /*
-     * Creates toggles for each available location provider
-     */
-    private void updateLocationToggles() {
-        ContentResolver res = getContentResolver();
-        boolean gpsEnabled = Settings.Secure.isLocationProviderEnabled(
-                res, LocationManager.GPS_PROVIDER);
-        boolean networkEnabled = Settings.Secure.isLocationProviderEnabled(
-                res, LocationManager.NETWORK_PROVIDER);
-        mGps.setChecked(gpsEnabled);
-        mNetwork.setChecked(networkEnabled);
-        mLocationAccess.setChecked(gpsEnabled || networkEnabled);
-        if (mAssistedGps != null) {
-            mAssistedGps.setChecked(Settings.Secure.getInt(res,
-                    Settings.Secure.ASSISTED_GPS_ENABLED, 2) == 1);
-            mAssistedGps.setEnabled(gpsEnabled);
-        }
-    }
-
-    /**
-     * see confirmPatternThenDisableAndClear
-     */
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        createPreferenceHierarchy();
-    }
-
-    /** Enable or disable all providers when the master toggle is changed. */
-    private void onToggleLocationAccess(boolean checked) {
-        final ContentResolver cr = getContentResolver();
-        Settings.Secure.setLocationProviderEnabled(cr,
-                LocationManager.GPS_PROVIDER, checked);
-        Settings.Secure.setLocationProviderEnabled(cr,
-                LocationManager.NETWORK_PROVIDER, checked);
-        updateLocationToggles();
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference pref, Object newValue) {
-        if (pref.getKey().equals(KEY_LOCATION_TOGGLE)) {
-            onToggleLocationAccess((Boolean) newValue);
-        }
-        return true;
-    }
-
-}
-
-class WrappingSwitchPreference extends SwitchPreference {
-
-    public WrappingSwitchPreference(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    public WrappingSwitchPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    protected void onBindView(View view) {
-        super.onBindView(view);
-
-        TextView title = (TextView) view.findViewById(android.R.id.title);
-        if (title != null) {
-            title.setSingleLine(false);
-            title.setMaxLines(3);
-        }
-    }
-}
-
-class WrappingCheckBoxPreference extends CheckBoxPreference {
-
-    public WrappingCheckBoxPreference(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    public WrappingCheckBoxPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    protected void onBindView(View view) {
-        super.onBindView(view);
-
-        TextView title = (TextView) view.findViewById(android.R.id.title);
-        if (title != null) {
-            title.setSingleLine(false);
-            title.setMaxLines(3);
-        }
-    }
-}
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 495f3fd..262aca3 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -29,6 +29,7 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.SystemProperties;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.util.Log;
@@ -54,6 +55,7 @@
     private static final String TAG = "MasterClear";
 
     private static final int KEYGUARD_REQUEST = 55;
+    private static final int PIN_REQUEST = 56;
 
     static final String ERASE_EXTERNAL_EXTRA = "erase_sd";
 
@@ -61,6 +63,7 @@
     private Button mInitiateButton;
     private View mExternalStorageContainer;
     private CheckBox mExternalStorage;
+    private boolean mPinConfirmed;
 
     /**
      * Keyguard validation is run using the standard {@link ConfirmLockPattern}
@@ -76,11 +79,25 @@
                         res.getText(R.string.master_clear_gesture_explanation));
     }
 
+    private boolean runRestrictionsChallenge() {
+        if (UserManager.get(getActivity()).hasRestrictionsChallenge()) {
+            startActivityForResult(
+                    new Intent(Intent.ACTION_RESTRICTIONS_CHALLENGE), PIN_REQUEST);
+            return true;
+        }
+        return false;
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if (requestCode != KEYGUARD_REQUEST) {
+        if (requestCode == PIN_REQUEST) {
+            if (resultCode == Activity.RESULT_OK) {
+                mPinConfirmed = true;
+            }
+            return;
+        } else if (requestCode != KEYGUARD_REQUEST) {
             return;
         }
 
@@ -109,6 +126,10 @@
     private final Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
 
         public void onClick(View v) {
+            mPinConfirmed = false;
+            if (runRestrictionsChallenge()) {
+                return;
+            }
             if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
                 showFinalConfirmation();
             }
@@ -239,4 +260,17 @@
         establishInitialState();
         return mContentView;
     }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // If this is the second step after restrictions pin challenge
+        if (mPinConfirmed) {
+            mPinConfirmed = false;
+            if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
+                showFinalConfirmation();
+            }
+        }
+    }
 }
diff --git a/src/com/android/settings/MonitoringCertInfoActivity.java b/src/com/android/settings/MonitoringCertInfoActivity.java
new file mode 100644
index 0000000..e2ac5d0
--- /dev/null
+++ b/src/com/android/settings/MonitoringCertInfoActivity.java
@@ -0,0 +1,94 @@
+/*
+ * 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.app.Dialog;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.view.WindowManager;
+import android.view.WindowManagerGlobal;
+
+/**
+ * Activity that shows a dialog explaining that a CA cert is allowing someone to monitor network
+ * traffic.
+ */
+public class MonitoringCertInfoActivity extends Activity implements OnClickListener {
+
+    private boolean hasDeviceOwner = false;
+
+    @Override
+    protected void onCreate(Bundle savedStates) {
+        super.onCreate(savedStates);
+
+        DevicePolicyManager dpm =
+                (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+
+        final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.ssl_ca_cert_dialog_title);
+        builder.setCancelable(true);
+        hasDeviceOwner = dpm.getDeviceOwner() != null;
+        int buttonLabel;
+        if (hasDeviceOwner) {
+            // Institutional case.  Show informational message.
+            String message = this.getResources().getString(R.string.ssl_ca_cert_info_message,
+                    dpm.getDeviceOwnerName());
+            builder.setMessage(message);
+            buttonLabel = R.string.done_button;
+        } else {
+            // Consumer case.  Show scary warning.
+            builder.setIcon(android.R.drawable.stat_notify_error);
+            builder.setMessage(R.string.ssl_ca_cert_warning_message);
+            buttonLabel = R.string.ssl_ca_cert_settings_button;
+        }
+
+        builder.setPositiveButton(buttonLabel, this);
+
+        final Dialog dialog = builder.create();
+        dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
+        try {
+            WindowManagerGlobal.getWindowManagerService().dismissKeyguard();
+        } catch (RemoteException e) {
+        }
+        dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+            @Override public void onCancel(DialogInterface dialog) {
+                finish();
+            }
+        });
+
+        dialog.show();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        if (hasDeviceOwner) {
+            finish();
+        } else {
+            Intent intent =
+                    new Intent(android.provider.Settings.ACTION_TRUSTED_CREDENTIALS_USER);
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            startActivity(intent);
+            finish();
+        }
+    }
+}
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 77484e4..2f7721b 100644
--- a/src/com/android/settings/OwnerInfoSettings.java
+++ b/src/com/android/settings/OwnerInfoSettings.java
@@ -19,7 +19,10 @@
 import android.app.Fragment;
 import android.content.ContentResolver;
 import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.provider.Settings;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -28,34 +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) {
+            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
             }
         });
     }
@@ -63,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/ProgressCategory.java b/src/com/android/settings/ProgressCategory.java
index 625aa59..6fe34bf 100644
--- a/src/com/android/settings/ProgressCategory.java
+++ b/src/com/android/settings/ProgressCategory.java
@@ -20,17 +20,19 @@
 import android.preference.Preference;
 import android.util.AttributeSet;
 import android.view.View;
-import android.widget.TextView;
 
 public class ProgressCategory extends ProgressCategoryBase {
 
+    private final int mEmptyTextRes;
     private boolean mProgress = false;
     private Preference mNoDeviceFoundPreference;
     private boolean mNoDeviceFoundAdded;
 
-    public ProgressCategory(Context context, AttributeSet attrs) {
+    public ProgressCategory(Context context, AttributeSet attrs,
+            int emptyTextRes) {
         super(context, attrs);
         setLayoutResource(R.layout.preference_progress_category);
+        mEmptyTextRes = emptyTextRes;
     }
 
     @Override
@@ -52,7 +54,7 @@
                 if (mNoDeviceFoundPreference == null) {
                     mNoDeviceFoundPreference = new Preference(getContext());
                     mNoDeviceFoundPreference.setLayoutResource(R.layout.preference_empty_list);
-                    mNoDeviceFoundPreference.setTitle(R.string.bluetooth_no_devices_found);
+                    mNoDeviceFoundPreference.setTitle(mEmptyTextRes);
                     mNoDeviceFoundPreference.setSelectable(false);
                 }
                 addPreference(mNoDeviceFoundPreference);
diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java
index 909496e..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 5ba3837..df93626 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -23,16 +23,14 @@
 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;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
@@ -40,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;
@@ -53,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";
 
@@ -111,6 +102,7 @@
     private TextView mCfi;
     private TextView mLocation;
     private TextView mNeighboringCids;
+    private TextView mCellInfo;
     private TextView resets;
     private TextView attempts;
     private TextView successes;
@@ -124,6 +116,7 @@
     private TextView dnsCheckState;
     private EditText smsc;
     private Button radioPowerButton;
+    private Button cellInfoListRateButton;
     private Button dnsCheckToggleButton;
     private Button pingTestButton;
     private Button updateSmscButton;
@@ -140,6 +133,7 @@
     private String mHttpClientTestResult;
     private boolean mMwiValue = false;
     private boolean mCfiValue = false;
+    private List<CellInfo> mCellInfoValue;
 
     private PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
         @Override
@@ -171,6 +165,12 @@
             mCfiValue = cfi;
             updateCallRedirect();
         }
+
+        @Override
+        public void onCellInfoChanged(List<CellInfo> arrayCi) {
+            log("onCellInfoChanged: arrayCi=" + arrayCi);
+            updateCellInfoTv(arrayCi);
+        }
     };
 
     private Handler mHandler = new Handler() {
@@ -195,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;
                         }
@@ -263,6 +263,7 @@
         mCfi = (TextView) findViewById(R.id.cfi);
         mLocation = (TextView) findViewById(R.id.location);
         mNeighboringCids = (TextView) findViewById(R.id.neighboring);
+        mCellInfo = (TextView) findViewById(R.id.cellinfo);
 
         resets = (TextView) findViewById(R.id.resets);
         attempts = (TextView) findViewById(R.id.attempts);
@@ -288,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);
 
@@ -326,6 +330,10 @@
                 mHandler.obtainMessage(EVENT_QUERY_NEIGHBORING_CIDS_DONE));
 
         CellLocation.requestLocationUpdate();
+
+        // Get current cell info
+        mCellInfoValue = mTelephonyManager.getAllCellInfo();
+        log("onCreate: mCellInfoValue=" + mCellInfoValue);
     }
 
     @Override
@@ -342,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,
@@ -356,14 +365,15 @@
                 | PhoneStateListener.LISTEN_DATA_ACTIVITY
                 | PhoneStateListener.LISTEN_CELL_LOCATION
                 | PhoneStateListener.LISTEN_MESSAGE_WAITING_INDICATOR
-                | PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR);
+                | PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR
+                | PhoneStateListener.LISTEN_CELL_INFO);
     }
 
     @Override
     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);
@@ -421,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");
@@ -508,6 +523,24 @@
         mNeighboringCids.setText(sb.toString());
     }
 
+    private final void updateCellInfoTv(List<CellInfo> arrayCi) {
+        mCellInfoValue = arrayCi;
+        StringBuilder value = new StringBuilder();
+        if (mCellInfoValue != null) {
+            int index = 0;
+            for (CellInfo ci : mCellInfoValue) {
+                value.append('[');
+                value.append(index);
+                value.append("]=");
+                value.append(ci.toString());
+                if (++index < mCellInfoValue.size()) {
+                    value.append("\n");
+                }
+            }
+        }
+        mCellInfo.setText(value.toString());
+    }
+
     private final void
     updateMessageWaiting() {
         mMwi.setText(String.valueOf(mMwiValue));
@@ -895,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,
@@ -914,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);
@@ -926,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");
@@ -939,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);
@@ -951,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");
@@ -964,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);
@@ -984,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...
             }
@@ -1038,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..171059c
--- /dev/null
+++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.java
@@ -0,0 +1,118 @@
+/*
+ * 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.os.SystemProperties;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.ImageView;
+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 (If ro.bootloader.hardware.sku property is set use
+ * "regulatory_info_<sku>.png where sku is ro.bootloader.hardware.sku property value in lowercase"),
+ * 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 {
+    private final String REGULATORY_INFO_RESOURCE = "regulatory_info";
+
+    /**
+     * 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 = false;
+        int resId = getResourceId();
+        if (resId != 0) {
+            try {
+                Drawable d = resources.getDrawable(resId);
+                // 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) {
+            View view = getLayoutInflater().inflate(R.layout.regulatory_info, null);
+            ImageView image = (ImageView) view.findViewById(R.id.regulatoryInfo);
+            image.setImageResource(resId);
+            builder.setView(view);
+            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();
+        }
+    }
+
+    private int getResourceId() {
+        // Use regulatory_info by default.
+        int resId = getResources().getIdentifier(
+                REGULATORY_INFO_RESOURCE, "drawable", getPackageName());
+
+        // When hardware sku property exists, use regulatory_info_<sku> resource if valid.
+        String sku = SystemProperties.get("ro.boot.hardware.sku", "");
+        if (!TextUtils.isEmpty(sku)) {
+            String regulatory_info_res = REGULATORY_INFO_RESOURCE + "_" + sku.toLowerCase();
+            int id = getResources().getIdentifier(
+                    regulatory_info_res, "drawable", getPackageName());
+            if (id != 0) {
+                resId = id;
+            }
+        }
+        return resId;
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        finish();   // close the activity
+    }
+}
diff --git a/src/com/android/settings/RestrictedSettingsFragment.java b/src/com/android/settings/RestrictedSettingsFragment.java
new file mode 100644
index 0000000..34eda1e
--- /dev/null
+++ b/src/com/android/settings/RestrictedSettingsFragment.java
@@ -0,0 +1,261 @@
+/*
+ * 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 java.util.HashSet;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.os.UserManager;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+
+/**
+ * Base class for settings activities that should be pin protected when in restricted mode.
+ * The constructor for this class will take the restriction key that this screen should be
+ * locked by.  If {@link UserManager.hasRestrictionsPin()} and
+ * {@link UserManager.hasUserRestriction(String)} returns true for the restriction key, then
+ * the user will have to enter the restrictions pin before seeing the Settings screen.
+ *
+ * If this settings screen should be pin protected whenever
+ * {@link UserManager.hasUserRestriction(String)} returns true, pass in
+ * {@link RESTRICTIONS_PIN_SET} to the constructor instead of a restrictions key.
+ */
+public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
+
+    protected static final String RESTRICTIONS_PIN_SET = "restrictions_pin_set";
+
+    private static final String EXTRA_PREFERENCE = "pref";
+    private static final String EXTRA_CHECKBOX_STATE = "isChecked";
+    // Should be unique across all settings screens that use this.
+    private static final int REQUEST_PIN_CHALLENGE = 12309;
+
+    private static final String KEY_CHALLENGE_SUCCEEDED = "chsc";
+    private static final String KEY_CHALLENGE_REQUESTED = "chrq";
+    private static final String KEY_RESUME_ACTION_BUNDLE = "rsmb";
+
+    // If the restriction PIN is entered correctly.
+    private boolean mChallengeSucceeded;
+    private boolean mChallengeRequested;
+    private Bundle mResumeActionBundle;
+
+    private UserManager mUserManager;
+
+    private final String mRestrictionKey;
+
+    private final HashSet<Preference> mProtectedByRestictionsPrefs = new HashSet<Preference>();
+
+    // Receiver to clear pin status when the screen is turned off.
+    private BroadcastReceiver mScreenOffReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            mChallengeSucceeded = false;
+            if (shouldBePinProtected(mRestrictionKey)) {
+                ensurePin(null);
+            }
+        }
+    };
+
+    /**
+     * @param restrictionKey The restriction key to check before pin protecting
+     *            this settings page. Pass in {@link RESTRICTIONS_PIN_SET} if it should
+     *            be PIN protected whenever a restrictions pin is set. Pass in
+     *            null if it should never be PIN protected.
+     */
+    public RestrictedSettingsFragment(String restrictionKey) {
+        mRestrictionKey = restrictionKey;
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);
+
+        if (icicle != null) {
+            mChallengeSucceeded = icicle.getBoolean(KEY_CHALLENGE_SUCCEEDED, false);
+            mChallengeRequested = icicle.getBoolean(KEY_CHALLENGE_REQUESTED, false);
+            mResumeActionBundle = icicle.getBundle(KEY_RESUME_ACTION_BUNDLE);
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putBoolean(KEY_CHALLENGE_REQUESTED, mChallengeRequested);
+        if (mResumeActionBundle != null) {
+            outState.putBundle(KEY_RESUME_ACTION_BUNDLE, mResumeActionBundle);
+        }
+        if (getActivity().isChangingConfigurations()) {
+            outState.putBoolean(KEY_CHALLENGE_SUCCEEDED, mChallengeSucceeded);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (shouldBePinProtected(mRestrictionKey)) {
+            ensurePin(null);
+        } else {
+            // If the whole screen is not pin protected, reset mChallengeSucceeded so next
+            // time user uses a protected preference, they are prompted for pin again.
+            mChallengeSucceeded = false;
+        }
+        IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_OFF);
+        filter.addAction(Intent.ACTION_USER_PRESENT);
+        getActivity().registerReceiver(mScreenOffReceiver, filter);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        getActivity().unregisterReceiver(mScreenOffReceiver);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_PIN_CHALLENGE) {
+            Bundle resumeActionBundle = mResumeActionBundle;
+            mResumeActionBundle = null;
+            mChallengeRequested = false;
+            if (resultCode == Activity.RESULT_OK) {
+                mChallengeSucceeded = true;
+                String prefKey = resumeActionBundle == null ?
+                        null : resumeActionBundle.getString(EXTRA_PREFERENCE);
+                if (prefKey != null) {
+                    Preference pref = findPreference(prefKey);
+                    if (pref != null) {
+                        // Make sure the checkbox state is the same as it was when we launched the
+                        // pin challenge.
+                        if (pref instanceof CheckBoxPreference
+                                && resumeActionBundle.containsKey(EXTRA_CHECKBOX_STATE)) {
+                            boolean isChecked =
+                                    resumeActionBundle.getBoolean(EXTRA_CHECKBOX_STATE, false);
+                            ((CheckBoxPreference)pref).setChecked(isChecked);
+                        }
+                        if (!onPreferenceTreeClick(getPreferenceScreen(), pref)) {
+                            Intent prefIntent = pref.getIntent();
+                            if (prefIntent != null) {
+                                pref.getContext().startActivity(prefIntent);
+                            }
+                        }
+                    }
+                }
+            } else if (!isDetached()) {
+                finishFragment();
+            }
+            return;
+        }
+
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    private void ensurePin(Preference preference) {
+        if (!mChallengeSucceeded) {
+            final UserManager um = UserManager.get(getActivity());
+            if (!mChallengeRequested) {
+                if (um.hasRestrictionsChallenge()) {
+                    mResumeActionBundle = new Bundle();
+                    if (preference != null) {
+                        mResumeActionBundle.putString(EXTRA_PREFERENCE, preference.getKey());
+                        if (preference instanceof CheckBoxPreference) {
+                            mResumeActionBundle.putBoolean(EXTRA_CHECKBOX_STATE,
+                                    ((CheckBoxPreference)preference).isChecked());
+                        }
+                    }
+                    Intent requestPin = new Intent(Intent.ACTION_RESTRICTIONS_CHALLENGE);
+                    startActivityForResult(requestPin, REQUEST_PIN_CHALLENGE);
+                    mChallengeRequested = true;
+                }
+            }
+        }
+        mChallengeSucceeded = false;
+    }
+
+    /**
+     * Returns true if this activity is restricted, but no restriction pin has been set.
+     * Used to determine if the settings UI should disable UI.
+     */
+    protected boolean isRestrictedAndNotPinProtected() {
+        if (mRestrictionKey == null || RESTRICTIONS_PIN_SET.equals(mRestrictionKey)) {
+            return false;
+        }
+        return mUserManager.hasUserRestriction(mRestrictionKey)
+                && !mUserManager.hasRestrictionsChallenge();
+    }
+
+    /**
+     * Called to trigger the pin entry if the given restriction key is locked down.
+     * @param restrictionsKey The restriction key or {@link RESTRICTIONS_PIN_SET} if
+     *          pin entry should get triggered if there is a pin set.
+     */
+   protected boolean restrictionsPinCheck(String restrictionsKey, Preference preference) {
+       if (shouldBePinProtected(restrictionsKey) && !mChallengeSucceeded) {
+           ensurePin(preference);
+           return false;
+       } else {
+           return true;
+       }
+   }
+
+   protected boolean hasChallengeSucceeded() {
+       return mChallengeSucceeded;
+   }
+
+   /**
+    * Returns true if this restrictions key is locked down.
+    */
+   protected boolean shouldBePinProtected(String restrictionKey) {
+       if (restrictionKey == null) {
+           return false;
+       }
+       boolean restricted = RESTRICTIONS_PIN_SET.equals(restrictionKey)
+               || mUserManager.hasUserRestriction(restrictionKey);
+       return restricted && mUserManager.hasRestrictionsChallenge();
+   }
+
+   /**
+    * If the preference is one that was added by protectByRestrictions(), then it will
+    * prompt the user for the restrictions pin if they haven't entered it already.
+    * Intended to be called at the top of onPreferenceTreeClick.  If this function returns
+    * true, then onPreferenceTreeClick should return true.
+    */
+   boolean ensurePinRestrictedPreference(Preference preference) {
+       return mProtectedByRestictionsPrefs.contains(preference)
+               && !restrictionsPinCheck(RESTRICTIONS_PIN_SET, preference);
+   }
+
+    /**
+     * Call this with any preferences that should require the PIN to be entered
+     * before they are accessible.
+     */
+   protected void protectByRestrictions(Preference pref) {
+       if (pref != null) {
+           mProtectedByRestictionsPrefs.add(pref);
+       }
+   }
+
+   protected void protectByRestrictions(String key) {
+       Preference pref = findPreference(key);
+       protectByRestrictions(pref);
+   }
+}
diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 954213d..dd81ded 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -80,6 +80,13 @@
         R.id.alarm_mute_button
     };
 
+    private static final int[] SEEKBAR_SECTION_ID = new int[] {
+        R.id.media_section,
+        R.id.ringer_section,
+        R.id.notification_section,
+        R.id.alarm_section
+    };
+
     private static final int[] SEEKBAR_MUTED_RES_ID = new int[] {
         com.android.internal.R.drawable.ic_audio_vol_mute,
         com.android.internal.R.drawable.ic_audio_ring_notif_mute,
@@ -115,7 +122,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);
@@ -197,15 +205,33 @@
             getContext().registerReceiver(mRingModeChangedReceiver, filter);
         }
 
-        // Disable either ringer+notifications or notifications
-        int id;
-        if (!Utils.isVoiceCapable(getContext())) {
-            id = R.id.ringer_section;
+        boolean useMasterVolume = getContext().getResources().
+                getBoolean(com.android.internal.R.bool.config_useMasterVolume);
+        if (useMasterVolume) {
+            // If config_useMasterVolume is true, all streams are treated as STREAM_MASTER.
+            // So hide all except a stream.
+            int id;
+            if (Utils.isVoiceCapable(getContext())) {
+                id = R.id.ringer_section;
+            } else {
+                id = R.id.media_section;
+            }
+            for (int i = 0; i < SEEKBAR_SECTION_ID.length; i++) {
+                if (SEEKBAR_SECTION_ID[i] != id) {
+                    view.findViewById(SEEKBAR_SECTION_ID[i]).setVisibility(View.GONE);
+                }
+            }
         } else {
-            id = R.id.notification_section;
+            // Disable either ringer+notifications or notifications
+            int id;
+            if (!Utils.isVoiceCapable(getContext())) {
+                id = R.id.ringer_section;
+            } else {
+                id = R.id.notification_section;
+            }
+            View hideSection = view.findViewById(id);
+            hideSection.setVisibility(View.GONE);
         }
-        View hideSection = view.findViewById(id);
-        hideSection.setVisibility(View.GONE);
     }
 
     private Uri getMediaVolumeUri(Context context) {
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index a12da3e..e002264 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -20,14 +20,18 @@
 import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
 
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
 import android.os.Bundle;
-import android.os.UserId;
-import android.os.Vibrator;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
@@ -39,16 +43,17 @@
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
-import com.android.internal.telephony.Phone;
 import com.android.internal.widget.LockPatternUtils;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Gesture lock pattern settings.
  */
-public class SecuritySettings extends SettingsPreferenceFragment
+public class SecuritySettings extends RestrictedSettingsFragment
         implements OnPreferenceChangeListener, DialogInterface.OnClickListener {
+    static final String TAG = "SecuritySettings";
 
     // Lock Settings
     private static final String KEY_UNLOCK_SET_OR_CHANGE = "unlock_set_or_change";
@@ -57,9 +62,12 @@
     private static final String KEY_BIOMETRIC_WEAK_LIVELINESS = "biometric_weak_liveliness";
     private static final String KEY_LOCK_ENABLED = "lockenabled";
     private static final String KEY_VISIBLE_PATTERN = "visiblepattern";
-    private static final String KEY_TACTILE_FEEDBACK_ENABLED = "unlock_tactile_feedback";
     private static final String KEY_SECURITY_CATEGORY = "security_category";
+    private static final String KEY_DEVICE_ADMIN_CATEGORY = "device_admin_category";
     private static final String KEY_LOCK_AFTER_TIMEOUT = "lock_after_timeout";
+    private static final String KEY_OWNER_INFO_SETTINGS = "owner_info_settings";
+    private static final String KEY_ENABLE_WIDGETS = "keyguard_enable_widgets";
+
     private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST = 123;
     private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_IMPROVE_REQUEST = 124;
     private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF = 125;
@@ -67,11 +75,18 @@
     // 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_CREDENTIALS_INSTALL = "credentials_install";
     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";
 
-    DevicePolicyManager mDPM;
+    private PackageManager mPM;
+    private DevicePolicyManager mDPM;
 
     private ChooseLockSettingsHelper mChooseLockSettingsHelper;
     private LockPatternUtils mLockPatternUtils;
@@ -79,15 +94,25 @@
 
     private CheckBoxPreference mBiometricWeakLiveliness;
     private CheckBoxPreference mVisiblePattern;
-    private CheckBoxPreference mTactileFeedback;
 
     private CheckBoxPreference mShowPassword;
 
+    private KeyStore mKeyStore;
     private Preference mResetCredentials;
 
     private CheckBoxPreference mToggleAppInstallation;
     private DialogInterface mWarnInstallApps;
+    private CheckBoxPreference mToggleVerifyApps;
     private CheckBoxPreference mPowerButtonInstantlyLocks;
+    private CheckBoxPreference mEnableKeyguardWidgets;
+
+    private Preference mNotificationAccess;
+
+    private boolean mIsPrimary;
+
+    public SecuritySettings() {
+        super(null /* Don't ask for restrictions pin on creation. */);
+    }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -95,6 +120,7 @@
 
         mLockPatternUtils = new LockPatternUtils(getActivity());
 
+        mPM = getActivity().getPackageManager();
         mDPM = (DevicePolicyManager)getSystemService(Context.DEVICE_POLICY_SERVICE);
 
         mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());
@@ -111,7 +137,12 @@
         // Add options for lock/unlock screen
         int resid = 0;
         if (!mLockPatternUtils.isSecure()) {
-            if (mLockPatternUtils.isLockScreenDisabled()) {
+            // if there are multiple users, disable "None" setting
+            UserManager mUm = (UserManager) getSystemService(Context.USER_SERVICE);
+            List<UserInfo> users = mUm.getUsers(true);
+            final boolean singleUser = users.size() == 1;
+
+            if (singleUser && mLockPatternUtils.isLockScreenDisabled()) {
                 resid = R.xml.security_settings_lockscreen;
             } else {
                 resid = R.xml.security_settings_chooser;
@@ -138,11 +169,22 @@
 
 
         // Add options for device encryption
-        DevicePolicyManager dpm =
-                (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+        mIsPrimary = UserHandle.myUserId() == UserHandle.USER_OWNER;
 
-        if (UserId.myUserId() == 0) {
-            switch (dpm.getStorageEncryptionStatus()) {
+        if (!mIsPrimary) {
+            // Rename owner info settings
+            Preference ownerInfoPref = findPreference(KEY_OWNER_INFO_SETTINGS);
+            if (ownerInfoPref != null) {
+                if (UserManager.get(getActivity()).isLinkedUser()) {
+                    ownerInfoPref.setTitle(R.string.profile_info_settings_title);
+                } else {
+                    ownerInfoPref.setTitle(R.string.user_info_settings_title);
+                }
+            }
+        }
+
+        if (mIsPrimary) {
+            switch (mDPM.getStorageEncryptionStatus()) {
             case DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE:
                 // The device is currently encrypted.
                 addPreferencesFromResource(R.xml.security_settings_encrypted);
@@ -183,27 +225,12 @@
             }
         }
 
-        // tactile feedback. Should be common to all unlock preference screens.
-        mTactileFeedback = (CheckBoxPreference) root.findPreference(KEY_TACTILE_FEEDBACK_ENABLED);
-        if (!((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).hasVibrator()) {
-            PreferenceGroup securityCategory = (PreferenceGroup)
-                    root.findPreference(KEY_SECURITY_CATEGORY);
-            if (securityCategory != null && mTactileFeedback != null) {
-                securityCategory.removePreference(mTactileFeedback);
-            }
-        }
-
-        if (UserId.myUserId() > 0) {
-            return root;
-        }
-        // Rest are for primary user...
-
         // Append the rest of the settings
         addPreferencesFromResource(R.xml.security_settings_misc);
 
         // Do not display SIM lock for devices without an Icc card
         TelephonyManager tm = TelephonyManager.getDefault();
-        if (!tm.hasIccCard()) {
+        if (!mIsPrimary || !tm.hasIccCard()) {
             root.removePreference(root.findPreference(KEY_SIM_LOCK));
         } else {
             // Disable SIM lock if sim card is missing or unknown
@@ -215,30 +242,147 @@
             }
         }
 
+        // Enable or disable keyguard widget checkbox based on DPM state
+        mEnableKeyguardWidgets = (CheckBoxPreference) root.findPreference(KEY_ENABLE_WIDGETS);
+        if (mEnableKeyguardWidgets != null) {
+            if (ActivityManager.isLowRamDeviceStatic()) {
+                // Widgets take a lot of RAM, so disable them on low-memory devices
+                PreferenceGroup securityCategory
+                        = (PreferenceGroup) root.findPreference(KEY_SECURITY_CATEGORY);
+                if (securityCategory != null) {
+                    securityCategory.removePreference(root.findPreference(KEY_ENABLE_WIDGETS));
+                    mEnableKeyguardWidgets = null;
+                }
+            } else {
+                final boolean disabled = (0 != (mDPM.getKeyguardDisabledFeatures(null)
+                        & DevicePolicyManager.KEYGUARD_DISABLE_WIDGETS_ALL));
+                if (disabled) {
+                    mEnableKeyguardWidgets.setSummary(
+                            R.string.security_enable_widgets_disabled_summary);
+                } else {
+                    mEnableKeyguardWidgets.setSummary("");
+                }
+                mEnableKeyguardWidgets.setEnabled(!disabled);
+            }
+        }
+
         // Show password
         mShowPassword = (CheckBoxPreference) root.findPreference(KEY_SHOW_PASSWORD);
-
-        // Credential storage
         mResetCredentials = root.findPreference(KEY_RESET_CREDENTIALS);
 
+        // Credential storage
+        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        mKeyStore = KeyStore.getInstance(); // needs to be initialized for onResume()
+        if (!um.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {
+            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);
+
+        } 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()) {
+            if (isVerifierInstalled()) {
+                mToggleVerifyApps.setChecked(isVerifyAppsEnabled());
+            } else {
+                mToggleVerifyApps.setChecked(false);
+                mToggleVerifyApps.setEnabled(false);
+            }
+        } else {
+            if (deviceAdminCategory != null) {
+                deviceAdminCategory.removePreference(mToggleVerifyApps);
+            } else {
+                mToggleVerifyApps.setEnabled(false);
+            }
+        }
+
+        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)));
+                }
+            }
+        }
+
+        if (shouldBePinProtected(RESTRICTIONS_PIN_SET)) {
+            protectByRestrictions(mToggleAppInstallation);
+            protectByRestrictions(mToggleVerifyApps);
+            protectByRestrictions(mResetCredentials);
+            protectByRestrictions(root.findPreference(KEY_CREDENTIALS_INSTALL));
+        }
         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.Secure.getInt(getContentResolver(),
-                                      Settings.Secure.INSTALL_NON_MARKET_APPS, 0) > 0;
+        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.Secure.putInt(getContentResolver(), Settings.Secure.INSTALL_NON_MARKET_APPS,
+        Settings.Global.putInt(getContentResolver(), Settings.Global.INSTALL_NON_MARKET_APPS,
                                 enabled ? 1 : 0);
     }
 
+    private boolean isVerifyAppsEnabled() {
+        return Settings.Global.getInt(getContentResolver(),
+                                      Settings.Global.PACKAGE_VERIFIER_ENABLE, 1) > 0;
+    }
+
+    private boolean isVerifierInstalled() {
+        final PackageManager pm = getPackageManager();
+        final Intent verification = new Intent(Intent.ACTION_PACKAGE_NEEDS_VERIFICATION);
+        verification.setType(PACKAGE_MIME_TYPE);
+        verification.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        final List<ResolveInfo> receivers = pm.queryBroadcastReceivers(verification, 0);
+        return (receivers.size() > 0) ? true : false;
+    }
+
+    private boolean showVerifierSetting() {
+        return Settings.Global.getInt(getContentResolver(),
+                                      Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 1) > 0;
+    }
+
     private void warnAppInstallation() {
         // TODO: DialogFragment?
         mWarnInstallApps = new AlertDialog.Builder(getActivity()).setTitle(
@@ -250,6 +394,7 @@
                 .show();
     }
 
+    @Override
     public void onClick(DialogInterface dialog, int which) {
         if (dialog == mWarnInstallApps && which == DialogInterface.BUTTON_POSITIVE) {
             setNonMarketAppsAllowed(true);
@@ -345,9 +490,6 @@
         if (mVisiblePattern != null) {
             mVisiblePattern.setChecked(lockPatternUtils.isVisiblePatternEnabled());
         }
-        if (mTactileFeedback != null) {
-            mTactileFeedback.setChecked(lockPatternUtils.isTactileFeedbackEnabled());
-        }
         if (mPowerButtonInstantlyLocks != null) {
             mPowerButtonInstantlyLocks.setChecked(lockPatternUtils.getPowerButtonInstantlyLocks());
         }
@@ -357,14 +499,20 @@
                     Settings.System.TEXT_SHOW_PASSWORD, 1) != 0);
         }
 
-        KeyStore.State state = KeyStore.getInstance().state();
         if (mResetCredentials != null) {
-            mResetCredentials.setEnabled(state != KeyStore.State.UNINITIALIZED);
+            mResetCredentials.setEnabled(!mKeyStore.isEmpty());
+        }
+
+        if (mEnableKeyguardWidgets != null) {
+            mEnableKeyguardWidgets.setChecked(lockPatternUtils.getWidgetsEnabled());
         }
     }
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        if (ensurePinRestrictedPreference(preference)) {
+            return true;
+        }
         final String key = preference.getKey();
 
         final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
@@ -406,10 +554,10 @@
             lockPatternUtils.setLockPatternEnabled(isToggled(preference));
         } else if (KEY_VISIBLE_PATTERN.equals(key)) {
             lockPatternUtils.setVisiblePatternEnabled(isToggled(preference));
-        } else if (KEY_TACTILE_FEEDBACK_ENABLED.equals(key)) {
-            lockPatternUtils.setTactileFeedbackEnabled(isToggled(preference));
         } else if (KEY_POWER_INSTANTLY_LOCKS.equals(key)) {
             lockPatternUtils.setPowerButtonInstantlyLocks(isToggled(preference));
+        } else if (KEY_ENABLE_WIDGETS.equals(key)) {
+            lockPatternUtils.setWidgetsEnabled(mEnableKeyguardWidgets.isChecked());
         } else if (preference == mShowPassword) {
             Settings.System.putInt(getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD,
                     mShowPassword.isChecked() ? 1 : 0);
@@ -420,6 +568,9 @@
             } else {
                 setNonMarketAppsAllowed(false);
             }
+        } else if (KEY_TOGGLE_VERIFY_APPLICATIONS.equals(key)) {
+            Settings.Global.putInt(getContentResolver(), Settings.Global.PACKAGE_VERIFIER_ENABLE,
+                    mToggleVerifyApps.isChecked() ? 1 : 0);
         } else {
             // If we didn't handle it, let preferences handle it.
             return super.onPreferenceTreeClick(preferenceScreen, preference);
@@ -446,12 +597,15 @@
                 resultCode == Activity.RESULT_OK) {
             final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
             lockPatternUtils.setBiometricWeakLivelinessEnabled(false);
-            mBiometricWeakLiveliness.setChecked(false);
+            // Setting the mBiometricWeakLiveliness checked value to false is handled when onResume
+            // is called by grabbing the value from lockPatternUtils.  We can't set it here
+            // because mBiometricWeakLiveliness could be null
             return;
         }
         createPreferenceHierarchy();
     }
 
+    @Override
     public boolean onPreferenceChange(Preference preference, Object value) {
         if (preference == mLockAfter) {
             int timeout = Integer.parseInt((String) value);
@@ -466,6 +620,11 @@
         return true;
     }
 
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_security;
+    }
+
     public void startBiometricWeakImprove(){
         Intent intent = new Intent();
         intent.setClassName("com.android.facelock", "com.android.facelock.AddToSetup");
diff --git a/src/com/android/settings/SelectableEditTextPreference.java b/src/com/android/settings/SelectableEditTextPreference.java
new file mode 100644
index 0000000..503db13
--- /dev/null
+++ b/src/com/android/settings/SelectableEditTextPreference.java
@@ -0,0 +1,71 @@
+/*
+ * 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.EditTextPreference;
+import android.preference.ListPreference;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.EditText;
+
+public class SelectableEditTextPreference extends EditTextPreference {
+
+    private int mSelectionMode;
+
+    public static final int SELECTION_CURSOR_END   = 0;
+    public static final int SELECTION_CURSOR_START = 1;
+    public static final int SELECTION_SELECT_ALL   = 2;
+
+    public SelectableEditTextPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    /**
+     * Sets the selection mode for the text when it shows up in the dialog
+     * @hide
+     * @param selectionMode can be SELECTION_CURSOR_START, SELECTION_CURSOR_END or
+     * SELECTION_SELECT_ALL. Default is SELECTION_CURSOR_END
+     */
+    public void setInitialSelectionMode(int selectionMode) {
+        mSelectionMode = selectionMode;
+    }
+
+    @Override
+    protected void onBindDialogView(View view) {
+        super.onBindDialogView(view);
+
+        EditText editText = getEditText();
+        // Set the selection based on the mSelectionMode
+        int length = editText.getText() != null ? editText.getText().length() : 0;
+        if (!TextUtils.isEmpty(editText.getText())) {
+            switch (mSelectionMode) {
+            case SELECTION_CURSOR_END:
+                editText.setSelection(length);
+                break;
+            case SELECTION_CURSOR_START:
+                editText.setSelection(0);
+                break;
+            case SELECTION_SELECT_ALL:
+                editText.setSelection(0, length);
+                break;
+            }
+        }
+    }
+}
+
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index ebbec5dd..e93fa18 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -16,34 +16,34 @@
 
 package com.android.settings;
 
-import com.android.internal.util.ArrayUtils;
-import com.android.settings.accounts.AccountSyncSettings;
-import com.android.settings.accounts.AuthenticatorHelper;
-import com.android.settings.accounts.ManageAccountsSettings;
-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.wifi.WifiEnabler;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.OnAccountsUpdateListener;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.admin.DevicePolicyManager;
+import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
 import android.graphics.drawable.Drawable;
+import android.nfc.NfcAdapter;
 import android.os.Bundle;
 import android.os.INetworkManagementService;
 import android.os.RemoteException;
 import android.os.ServiceManager;
-import android.os.UserId;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
-import android.preference.PreferenceActivity.Header;
 import android.preference.PreferenceFragment;
 import android.text.TextUtils;
 import android.util.Log;
@@ -52,13 +52,47 @@
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.BaseAdapter;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.Switch;
 import android.widget.TextView;
 
+import com.android.internal.util.ArrayUtils;
+import com.android.settings.accessibility.AccessibilitySettings;
+import com.android.settings.accessibility.ToggleAccessibilityServicePreferenceFragment;
+import com.android.settings.accessibility.ToggleCaptioningPreferenceFragment;
+import com.android.settings.accounts.AccountSyncSettings;
+import com.android.settings.accounts.AuthenticatorHelper;
+import com.android.settings.accounts.ManageAccountsSettings;
+import com.android.settings.applications.AppOpsSummary;
+import com.android.settings.applications.ManageApplications;
+import com.android.settings.applications.ProcessStatsUi;
+import com.android.settings.bluetooth.BluetoothEnabler;
+import com.android.settings.bluetooth.BluetoothSettings;
+import com.android.settings.deviceinfo.Memory;
+import com.android.settings.deviceinfo.UsbSettings;
+import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
+import com.android.settings.inputmethod.KeyboardLayoutPickerFragment;
+import com.android.settings.inputmethod.SpellCheckersSettings;
+import com.android.settings.inputmethod.UserDictionaryList;
+import com.android.settings.location.LocationSettings;
+import com.android.settings.nfc.AndroidBeam;
+import com.android.settings.nfc.PaymentSettings;
+import com.android.settings.print.PrintJobSettingsFragment;
+import com.android.settings.print.PrintServiceSettingsFragment;
+import com.android.settings.print.PrintSettingsFragment;
+import com.android.settings.tts.TextToSpeechSettings;
+import com.android.settings.users.UserSettings;
+import com.android.settings.vpn2.VpnSettings;
+import com.android.settings.wfd.WifiDisplaySettings;
+import com.android.settings.wifi.AdvancedWifiSettings;
+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;
@@ -82,11 +116,15 @@
     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";
 
+    static final int DIALOG_ONLY_ONE_HOME = 1;
+
+    private static boolean sShowNoHomeNotice = false;
+
     private String mFragmentClass;
     private int mTopLevelHeaderId;
     private Header mFirstHeader;
@@ -96,16 +134,35 @@
 
     // Show only these settings for restricted users
     private int[] SETTINGS_FOR_RESTRICTED = {
+            R.id.wireless_section,
             R.id.wifi_settings,
             R.id.bluetooth_settings,
+            R.id.data_usage_settings,
+            R.id.wireless_settings,
+            R.id.device_section,
             R.id.sound_settings,
             R.id.display_settings,
+            R.id.storage_settings,
+            R.id.application_settings,
+            R.id.battery_settings,
+            R.id.personal_section,
+            R.id.location_settings,
             R.id.security_settings,
+            R.id.language_settings,
+            R.id.user_settings,
             R.id.account_settings,
-            R.id.about_settings
+            R.id.account_add,
+            R.id.system_section,
+            R.id.date_time_settings,
+            R.id.about_settings,
+            R.id.accessibility_settings,
+            R.id.print_settings,
+            R.id.nfc_payment_settings,
+            R.id.home_settings
     };
 
-    private boolean mEnableUserManagement = false;
+    private SharedPreferences mDevelopmentPreferences;
+    private SharedPreferences.OnSharedPreferenceChangeListener mDevelopmentPreferencesListener;
 
     // TODO: Update Call Settings based on airplane mode state.
 
@@ -115,21 +172,36 @@
     private Header mLastHeader;
     private boolean mListeningToAccountUpdates;
 
+    private boolean mBatteryPresent = true;
+    private BroadcastReceiver mBatteryInfoReceiver = new BroadcastReceiver() {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (Intent.ACTION_BATTERY_CHANGED.equals(action)) {
+                boolean batteryPresent = Utils.isBatteryPresent(intent);
+
+                if (mBatteryPresent != batteryPresent) {
+                    mBatteryPresent = batteryPresent;
+                    invalidateHeaders();
+                }
+            }
+        }
+    };
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        if (getIntent().getBooleanExtra(EXTRA_CLEAR_UI_OPTIONS, false)) {
-            getWindow().setUiOptions(0);
-        }
-
-        if (android.provider.Settings.Secure.getInt(getContentResolver(), "multiuser_enabled", -1)
-                > 0) {
-            mEnableUserManagement = true;
+        if (getIntent().hasExtra(EXTRA_UI_OPTIONS)) {
+            getWindow().setUiOptions(getIntent().getIntExtra(EXTRA_UI_OPTIONS, 0));
         }
 
         mAuthenticatorHelper = new AuthenticatorHelper();
         mAuthenticatorHelper.updateAuthDescriptions(this);
         mAuthenticatorHelper.onAccountsUpdated(this, null);
 
+        mDevelopmentPreferences = getSharedPreferences(DevelopmentSettings.PREF_FILE,
+                Context.MODE_PRIVATE);
+
         getMetaData();
         mInLocalHeaderSwitch = true;
         super.onCreate(savedInstanceState);
@@ -156,6 +228,7 @@
 
         if (mParentHeader != null) {
             setParentTitle(mParentHeader.title, null, new OnClickListener() {
+                @Override
                 public void onClick(View v) {
                     switchToParent(mParentHeader.fragment);
                 }
@@ -186,21 +259,38 @@
     public void onResume() {
         super.onResume();
 
+        mDevelopmentPreferencesListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
+            @Override
+            public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+                invalidateHeaders();
+            }
+        };
+        mDevelopmentPreferences.registerOnSharedPreferenceChangeListener(
+                mDevelopmentPreferencesListener);
+
         ListAdapter listAdapter = getListAdapter();
         if (listAdapter instanceof HeaderAdapter) {
             ((HeaderAdapter) listAdapter).resume();
         }
         invalidateHeaders();
+
+        registerReceiver(mBatteryInfoReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
     }
 
     @Override
     public void onPause() {
         super.onPause();
 
+        unregisterReceiver(mBatteryInfoReceiver);
+
         ListAdapter listAdapter = getListAdapter();
         if (listAdapter instanceof HeaderAdapter) {
             ((HeaderAdapter) listAdapter).pause();
         }
+
+        mDevelopmentPreferences.unregisterOnSharedPreferenceChangeListener(
+                mDevelopmentPreferencesListener);
+        mDevelopmentPreferencesListener = null;
     }
 
     @Override
@@ -211,6 +301,69 @@
         }
     }
 
+    @Override
+    public boolean onIsMultiPane() {
+        return false;
+    }
+
+    private static final String[] ENTRY_FRAGMENTS = {
+        WirelessSettings.class.getName(),
+        WifiSettings.class.getName(),
+        AdvancedWifiSettings.class.getName(),
+        BluetoothSettings.class.getName(),
+        TetherSettings.class.getName(),
+        WifiP2pSettings.class.getName(),
+        VpnSettings.class.getName(),
+        DateTimeSettings.class.getName(),
+        LocalePicker.class.getName(),
+        InputMethodAndLanguageSettings.class.getName(),
+        SpellCheckersSettings.class.getName(),
+        UserDictionaryList.class.getName(),
+        UserDictionarySettings.class.getName(),
+        SoundSettings.class.getName(),
+        DisplaySettings.class.getName(),
+        DeviceInfoSettings.class.getName(),
+        ManageApplications.class.getName(),
+        ProcessStatsUi.class.getName(),
+        NotificationStation.class.getName(),
+        AppOpsSummary.class.getName(),
+        LocationSettings.class.getName(),
+        SecuritySettings.class.getName(),
+        PrivacySettings.class.getName(),
+        DeviceAdminSettings.class.getName(),
+        AccessibilitySettings.class.getName(),
+        ToggleCaptioningPreferenceFragment.class.getName(),
+        TextToSpeechSettings.class.getName(),
+        Memory.class.getName(),
+        DevelopmentSettings.class.getName(),
+        UsbSettings.class.getName(),
+        AndroidBeam.class.getName(),
+        WifiDisplaySettings.class.getName(),
+        PowerUsageSummary.class.getName(),
+        AccountSyncSettings.class.getName(),
+        CryptKeeperSettings.class.getName(),
+        DataUsageSummary.class.getName(),
+        DreamSettings.class.getName(),
+        UserSettings.class.getName(),
+        NotificationAccessSettings.class.getName(),
+        ManageAccountsSettings.class.getName(),
+        PrintSettingsFragment.class.getName(),
+        PrintJobSettingsFragment.class.getName(),
+        TrustedCredentialsSettings.class.getName(),
+        PaymentSettings.class.getName(),
+        KeyboardLayoutPickerFragment.class.getName()
+    };
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        // Almost all fragments are wrapped in this,
+        // except for a few that have their own activities.
+        for (int i = 0; i < ENTRY_FRAGMENTS.length; i++) {
+            if (ENTRY_FRAGMENTS[i].equals(fragmentName)) return true;
+        }
+        return false;
+    }
+
     private void switchToHeaderLocal(Header header) {
         mInLocalHeaderSwitch = true;
         switchToHeader(header);
@@ -262,9 +415,11 @@
         super.onNewIntent(intent);
 
         // If it is not launched from history, then reset to top-level
-        if ((intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == 0
-                && mFirstHeader != null && !onIsHidingHeaders() && onIsMultiPane()) {
-            switchToHeaderLocal(mFirstHeader);
+        if ((intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == 0) {
+            if (mFirstHeader != null && !onIsHidingHeaders() && onIsMultiPane()) {
+                switchToHeaderLocal(mFirstHeader);
+            }
+            getListView().setSelectionFromTop(0, 0);
         }
     }
 
@@ -273,7 +428,9 @@
             Integer index = mHeaderIndexMap.get(id);
             if (index != null) {
                 getListView().setItemChecked(index, true);
-                getListView().smoothScrollToPosition(index);
+                if (isMultiPane()) {
+                    getListView().smoothScrollToPosition(index);
+                }
             }
         }
     }
@@ -345,18 +502,18 @@
         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)) {
-            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) ||
+                LocationSettings.class.getName().equals(fragmentName) ||
+                ToggleAccessibilityServicePreferenceFragment.class.getName().equals(fragmentName) ||
+                PrintSettingsFragment.class.getName().equals(fragmentName) ||
+                PrintServiceSettingsFragment.class.getName().equals(fragmentName)) {
+            intent.putExtra(EXTRA_UI_OPTIONS, ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW);
         }
 
         intent.setClass(this, SubSettings.class);
@@ -368,31 +525,35 @@
      */
     @Override
     public void onBuildHeaders(List<Header> headers) {
-        loadHeadersFromResource(R.xml.settings_headers, headers);
-
-        updateHeaderList(headers);
+        if (!onIsHidingHeaders()) {
+            loadHeadersFromResource(R.xml.settings_headers, headers);
+            updateHeaderList(headers);
+        }
     }
 
     private void updateHeaderList(List<Header> target) {
+        final boolean showDev = mDevelopmentPreferences.getBoolean(
+                DevelopmentSettings.PREF_SHOW,
+                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);
             // Ids are integers, so downcasting
             int id = (int) header.id;
-            if (id == R.id.dock_settings) {
-                if (!needsDockSettings())
-                    target.remove(header);
-            } else if (id == R.id.operator_settings || id == R.id.manufacturer_settings) {
+            if (id == R.id.operator_settings || id == R.id.manufacturer_settings) {
                 Utils.updateHeaderToSpecificActivityFromMetaDataOrRemove(this, target, header);
             } else if (id == R.id.wifi_settings) {
                 // Remove WiFi Settings if WiFi service is not available.
                 if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI)) {
-                    target.remove(header);
+                    target.remove(i);
                 }
             } else if (id == R.id.bluetooth_settings) {
                 // Remove Bluetooth Settings if Bluetooth service is not available.
                 if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)) {
-                    target.remove(header);
+                    target.remove(i);
                 }
             } else if (id == R.id.data_usage_settings) {
                 // Remove data usage when kernel module not enabled
@@ -400,29 +561,59 @@
                         .asInterface(ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE));
                 try {
                     if (!netManager.isBandwidthControlEnabled()) {
-                        target.remove(header);
+                        target.remove(i);
                     }
                 } catch (RemoteException e) {
                     // ignored
                 }
+            } else if (id == R.id.battery_settings) {
+                // Remove battery settings when battery is not available. (e.g. TV)
+
+                if (!mBatteryPresent) {
+                    target.remove(i);
+                }
             } else if (id == R.id.account_settings) {
                 int headerIndex = i + 1;
                 i = insertAccountsHeaders(target, headerIndex);
+            } else if (id == R.id.home_settings) {
+                if (!updateHomeSettingHeaders(header)) {
+                    target.remove(i);
+                }
             } else if (id == R.id.user_settings) {
-                if (!mEnableUserManagement
-                        || !UserId.MU_ENABLED || UserId.myUserId() != 0
-                        || !getResources().getBoolean(R.bool.enable_user_management)
+                if (!UserHandle.MU_ENABLED
+                        || !UserManager.supportsMultipleUsers()
                         || Utils.isMonkeyRunning()) {
-                    target.remove(header);
+                    target.remove(i);
+                }
+            } else if (id == R.id.nfc_payment_settings) {
+                if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC)) {
+                    target.remove(i);
+                } else {
+                    // Only show if NFC is on and we have the HCE feature
+                    NfcAdapter adapter = NfcAdapter.getDefaultAdapter(this);
+                    if (!adapter.isEnabled() || !getPackageManager().hasSystemFeature(
+                            PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {
+                        target.remove(i);
+                    }
+                }
+            } else if (id == R.id.development_settings) {
+                if (!showDev) {
+                    target.remove(i);
+                }
+            } else if (id == R.id.account_add) {
+                if (um.hasUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS)) {
+                    target.remove(i);
                 }
             }
-            if (UserId.MU_ENABLED && UserId.myUserId() != 0
+
+            if (i < target.size() && target.get(i) == header
+                    && UserHandle.MU_ENABLED && UserHandle.myUserId() != 0
                     && !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, id)) {
-                target.remove(header);
+                target.remove(i);
             }
 
             // Increment if the current one wasn't removed by the Utils code.
-            if (target.get(i) == header) {
+            if (i < target.size() && target.get(i) == header) {
                 // Hold on to the first header, when we need to reset to the top-level
                 if (mFirstHeader == null &&
                         HeaderAdapter.getHeaderType(header) != HeaderAdapter.HEADER_TYPE_CATEGORY) {
@@ -475,6 +666,7 @@
                 }
             }
             accountHeaders.add(accHeader);
+            mAuthenticatorHelper.preloadDrawableForType(this, accountType);
         }
 
         // Sort by label
@@ -495,8 +687,42 @@
         return headerIndex;
     }
 
-    private boolean needsDockSettings() {
-        return getResources().getBoolean(R.bool.has_dock_settings);
+    private boolean updateHomeSettingHeaders(Header header) {
+        // Once we decide to show Home settings, keep showing it forever
+        SharedPreferences sp = getSharedPreferences(HomeSettings.HOME_PREFS, Context.MODE_PRIVATE);
+        if (sp.getBoolean(HomeSettings.HOME_PREFS_DO_SHOW, false)) {
+            return true;
+        }
+
+        try {
+            final ArrayList<ResolveInfo> homeApps = new ArrayList<ResolveInfo>();
+            getPackageManager().getHomeActivities(homeApps);
+            if (homeApps.size() < 2) {
+                // When there's only one available home app, omit this settings
+                // category entirely at the top level UI.  If the user just
+                // uninstalled the penultimate home app candidiate, we also
+                // now tell them about why they aren't seeing 'Home' in the list.
+                if (sShowNoHomeNotice) {
+                    sShowNoHomeNotice = false;
+                    NoHomeDialogFragment.show(this);
+                }
+                return false;
+            } else {
+                // Okay, we're allowing the Home settings category.  Tell it, when
+                // invoked via this front door, that we'll need to be told about the
+                // case when the user uninstalls all but one home app.
+                if (header.fragmentArguments == null) {
+                    header.fragmentArguments = new Bundle();
+                }
+                header.fragmentArguments.putBoolean(HomeSettings.HOME_SHOW_NOTICE, true);
+            }
+        } catch (Exception e) {
+            // Can't look up the home activity; bail on configuring the icon
+            Log.w(LOG_TAG, "Problem looking up home activity!", e);
+        }
+
+        sp.edit().putBoolean(HomeSettings.HOME_PREFS_DO_SHOW, true).apply();
+        return true;
     }
 
     private void getMetaData() {
@@ -532,21 +758,40 @@
         return super.getNextButton();
     }
 
+    public static class NoHomeDialogFragment extends DialogFragment {
+        public static void show(Activity parent) {
+            final NoHomeDialogFragment dialog = new NoHomeDialogFragment();
+            dialog.show(parent.getFragmentManager(), null);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            return new AlertDialog.Builder(getActivity())
+                    .setMessage(R.string.only_one_home_message)
+                    .setPositiveButton(android.R.string.ok, null)
+                    .create();
+        }
+    }
+
     private static class HeaderAdapter extends ArrayAdapter<Header> {
         static final int HEADER_TYPE_CATEGORY = 0;
         static final int HEADER_TYPE_NORMAL = 1;
         static final int HEADER_TYPE_SWITCH = 2;
-        private static final int HEADER_TYPE_COUNT = HEADER_TYPE_SWITCH + 1;
+        static final int HEADER_TYPE_BUTTON = 3;
+        private static final int HEADER_TYPE_COUNT = HEADER_TYPE_BUTTON + 1;
 
         private final WifiEnabler mWifiEnabler;
         private final BluetoothEnabler mBluetoothEnabler;
         private AuthenticatorHelper mAuthHelper;
+        private DevicePolicyManager mDevicePolicyManager;
 
         private static class HeaderViewHolder {
             ImageView icon;
             TextView title;
             TextView summary;
             Switch switch_;
+            ImageButton button_;
+            View divider_;
         }
 
         private LayoutInflater mInflater;
@@ -556,6 +801,8 @@
                 return HEADER_TYPE_CATEGORY;
             } else if (header.id == R.id.wifi_settings || header.id == R.id.bluetooth_settings) {
                 return HEADER_TYPE_SWITCH;
+            } else if (header.id == R.id.security_settings) {
+                return HEADER_TYPE_BUTTON;
             } else {
                 return HEADER_TYPE_NORMAL;
             }
@@ -588,7 +835,7 @@
         }
 
         public HeaderAdapter(Context context, List<Header> objects,
-                AuthenticatorHelper authenticatorHelper) {
+                AuthenticatorHelper authenticatorHelper, DevicePolicyManager dpm) {
             super(context, 0, objects);
 
             mAuthHelper = authenticatorHelper;
@@ -598,6 +845,7 @@
             // Switches inflated from their layouts. Must be done before adapter is set in super
             mWifiEnabler = new WifiEnabler(context, new Switch(context));
             mBluetoothEnabler = new BluetoothEnabler(context, new Switch(context));
+            mDevicePolicyManager = dpm;
         }
 
         @Override
@@ -627,6 +875,18 @@
                         holder.switch_ = (Switch) view.findViewById(R.id.switchWidget);
                         break;
 
+                    case HEADER_TYPE_BUTTON:
+                        view = mInflater.inflate(R.layout.preference_header_button_item, parent,
+                                false);
+                        holder.icon = (ImageView) view.findViewById(R.id.icon);
+                        holder.title = (TextView)
+                                view.findViewById(com.android.internal.R.id.title);
+                        holder.summary = (TextView)
+                                view.findViewById(com.android.internal.R.id.summary);
+                        holder.button_ = (ImageButton) view.findViewById(R.id.buttonWidget);
+                        holder.divider_ = view.findViewById(R.id.divider);
+                        break;
+
                     case HEADER_TYPE_NORMAL:
                         view = mInflater.inflate(
                                 R.layout.preference_header_item, parent,
@@ -657,38 +917,75 @@
                     } else {
                         mBluetoothEnabler.setSwitch(holder.switch_);
                     }
-                    // No break, fall through on purpose to update common fields
+                    updateCommonHeaderView(header, holder);
+                    break;
 
-                    //$FALL-THROUGH$
+                case HEADER_TYPE_BUTTON:
+                    if (header.id == R.id.security_settings) {
+                        boolean hasCert = DevicePolicyManager.hasAnyCaCertsInstalled();
+                        if (hasCert) {
+                            holder.button_.setVisibility(View.VISIBLE);
+                            holder.divider_.setVisibility(View.VISIBLE);
+                            boolean isManaged = mDevicePolicyManager.getDeviceOwner() != null;
+                            if (isManaged) {
+                                holder.button_.setImageResource(R.drawable.ic_settings_about);
+                            } else {
+                                holder.button_.setImageResource(
+                                        android.R.drawable.stat_notify_error);
+                            }
+                            holder.button_.setOnClickListener(new OnClickListener() {
+                                @Override
+                                public void onClick(View v) {
+                                    Intent intent = new Intent(
+                                            android.provider.Settings.ACTION_MONITORING_CERT_INFO);
+                                    getContext().startActivity(intent);
+                                }
+                            });
+                        } else {
+                            holder.button_.setVisibility(View.GONE);
+                            holder.divider_.setVisibility(View.GONE);
+                        }
+                    }
+                    updateCommonHeaderView(header, holder);
+                    break;
+
                 case HEADER_TYPE_NORMAL:
-                    if (header.extras != null
-                            && header.extras.containsKey(ManageAccountsSettings.KEY_ACCOUNT_TYPE)) {
-                        String accType = header.extras.getString(
-                                ManageAccountsSettings.KEY_ACCOUNT_TYPE);
-                        ViewGroup.LayoutParams lp = holder.icon.getLayoutParams();
-                        lp.width = getContext().getResources().getDimensionPixelSize(
-                                R.dimen.header_icon_width);
-                        lp.height = lp.width;
-                        holder.icon.setLayoutParams(lp);
-                        Drawable icon = mAuthHelper.getDrawableForType(getContext(), accType);
-                        holder.icon.setImageDrawable(icon);
-                    } else {
-                        holder.icon.setImageResource(header.iconRes);
-                    }
-                    holder.title.setText(header.getTitle(getContext().getResources()));
-                    CharSequence summary = header.getSummary(getContext().getResources());
-                    if (!TextUtils.isEmpty(summary)) {
-                        holder.summary.setVisibility(View.VISIBLE);
-                        holder.summary.setText(summary);
-                    } else {
-                        holder.summary.setVisibility(View.GONE);
-                    }
+                    updateCommonHeaderView(header, holder);
                     break;
             }
 
             return view;
         }
 
+        private void updateCommonHeaderView(Header header, HeaderViewHolder holder) {
+                if (header.extras != null
+                        && header.extras.containsKey(ManageAccountsSettings.KEY_ACCOUNT_TYPE)) {
+                    String accType = header.extras.getString(
+                            ManageAccountsSettings.KEY_ACCOUNT_TYPE);
+                    Drawable icon = mAuthHelper.getDrawableForType(getContext(), accType);
+                    setHeaderIcon(holder, icon);
+                } else {
+                    holder.icon.setImageResource(header.iconRes);
+                }
+                holder.title.setText(header.getTitle(getContext().getResources()));
+                CharSequence summary = header.getSummary(getContext().getResources());
+                if (!TextUtils.isEmpty(summary)) {
+                    holder.summary.setVisibility(View.VISIBLE);
+                    holder.summary.setText(summary);
+                } else {
+                    holder.summary.setVisibility(View.GONE);
+                }
+            }
+
+        private void setHeaderIcon(HeaderViewHolder holder, Drawable icon) {
+            ViewGroup.LayoutParams lp = holder.icon.getLayoutParams();
+            lp.width = getContext().getResources().getDimensionPixelSize(
+                    R.dimen.header_icon_width);
+            lp.height = lp.width;
+            holder.icon.setLayoutParams(lp);
+            holder.icon.setImageDrawable(icon);
+        }
+
         public void resume() {
             mWifiEnabler.resume();
             mBluetoothEnabler.resume();
@@ -722,12 +1019,20 @@
         int titleRes = pref.getTitleRes();
         if (pref.getFragment().equals(WallpaperTypeSettings.class.getName())) {
             titleRes = R.string.wallpaper_settings_fragment_title;
+        } else if (pref.getFragment().equals(OwnerInfoSettings.class.getName())
+                && UserHandle.myUserId() != UserHandle.USER_OWNER) {
+            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));
     }
@@ -737,16 +1042,24 @@
         if (adapter == null) {
             super.setListAdapter(null);
         } else {
-            super.setListAdapter(new HeaderAdapter(this, getHeaders(), mAuthenticatorHelper));
+            DevicePolicyManager dpm =
+                    (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+            super.setListAdapter(new HeaderAdapter(this, getHeaders(), mAuthenticatorHelper, dpm));
         }
     }
 
     @Override
     public void onAccountsUpdated(Account[] accounts) {
+        // TODO: watch for package upgrades to invalidate cache; see 7206643
+        mAuthenticatorHelper.updateAuthDescriptions(this);
         mAuthenticatorHelper.onAccountsUpdated(this, accounts);
         invalidateHeaders();
     }
 
+    public static void requestHomeNotice() {
+        sShowNoHomeNotice = true;
+    }
+
     /*
      * Settings subclasses for launching independently.
      */
@@ -769,13 +1082,14 @@
     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 */ }
+    public static class CaptioningSettingsActivity extends Settings { /* empty */ }
     public static class SecuritySettingsActivity extends Settings { /* empty */ }
     public static class LocationSettingsActivity extends Settings { /* empty */ }
     public static class PrivacySettingsActivity extends Settings { /* empty */ }
-    public static class DockSettingsActivity extends Settings { /* empty */ }
     public static class RunningServicesActivity extends Settings { /* empty */ }
     public static class ManageAccountsSettingsActivity extends Settings { /* empty */ }
     public static class PowerUsageSummaryActivity extends Settings { /* empty */ }
@@ -787,4 +1101,14 @@
     public static class AdvancedWifiSettingsActivity extends Settings { /* empty */ }
     public static class TextToSpeechSettingsActivity extends Settings { /* empty */ }
     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 */ }
+    public static class UsbSettingsActivity extends Settings { /* empty */ }
+    public static class TrustedCredentialsSettingsActivity extends Settings { /* empty */ }
+    public static class PaymentSettingsActivity extends Settings { /* empty */ }
+    public static class PrintSettingsActivity extends Settings { /* empty */ }
+    public static class PrintJobSettingsActivity extends Settings { /* empty */ }
 }
diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java
index b9efa72..3d66b77 100644
--- a/src/com/android/settings/SettingsLicenseActivity.java
+++ b/src/com/android/settings/SettingsLicenseActivity.java
@@ -203,7 +203,9 @@
             @Override
             public void onPageFinished(WebView view, String url) {
                 mSpinnerDlg.dismiss();
-                mTextDlg.show();
+                if (SettingsLicenseActivity.this.isResumed()) {
+                    mTextDlg.show();
+                }
             }
         });
 
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 368976a..0a382b5 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -20,11 +20,13 @@
 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;
 import android.net.Uri;
 import android.os.Bundle;
+import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
 import android.text.TextUtils;
@@ -47,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);
@@ -66,6 +71,13 @@
         }
     }
 
+    protected void removePreference(String key) {
+        Preference pref = findPreference(key);
+        if (pref != null) {
+            getPreferenceScreen().removePreference(pref);
+        }
+    }
+
     /**
      * Override this if you want to show a help item in the menu, by returning the resource id.
      * @return the resource id for the help url
@@ -76,13 +88,9 @@
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (mHelpUrl != null) {
-            Intent helpIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(mHelpUrl));
-            helpIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+        if (mHelpUrl != null && getActivity() != null) {
             MenuItem helpItem = menu.add(0, MENU_HELP, 0, R.string.help_label);
-            helpItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-            helpItem.setIntent(helpIntent);
+            HelpUtils.prepareHelpMenuItem(getActivity(), helpItem, mHelpUrl);
         }
     }
 
@@ -100,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;
     }
 
     /**
@@ -174,6 +186,10 @@
         }
     }
 
+    public void onDialogShowing() {
+        // override in subclass to attach a dismiss listener, for instance
+    }
+
     public static class SettingsDialogFragment extends DialogFragment {
         private static final String KEY_DIALOG_ID = "key_dialog_id";
         private static final String KEY_PARENT_FRAGMENT_ID = "key_parent_fragment_id";
@@ -208,6 +224,15 @@
         }
 
         @Override
+        public void onStart() {
+            super.onStart();
+
+            if (mParentFragment != null && mParentFragment instanceof SettingsPreferenceFragment) {
+                ((SettingsPreferenceFragment) mParentFragment).onDialogShowing();
+            }
+        }
+
+        @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             if (savedInstanceState != null) {
                 mDialogId = savedInstanceState.getInt(KEY_DIALOG_ID, 0);
@@ -216,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/SmsDefaultDialog.java b/src/com/android/settings/SmsDefaultDialog.java
new file mode 100644
index 0000000..d9a6c5f
--- /dev/null
+++ b/src/com/android/settings/SmsDefaultDialog.java
@@ -0,0 +1,106 @@
+/*
+ * 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.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.provider.Telephony.Sms.Intents;
+import android.telephony.TelephonyManager;
+
+import com.android.internal.app.AlertActivity;
+import com.android.internal.app.AlertController;
+import com.android.internal.telephony.SmsApplication;
+import com.android.internal.telephony.SmsApplication.SmsApplicationData;
+import com.android.settings.R;
+
+public final class SmsDefaultDialog extends AlertActivity implements
+        DialogInterface.OnClickListener {
+    private ComponentName mNewDefault;
+    private SmsApplicationData mNewSmsApplicationData;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        String packageName = intent.getStringExtra(Intents.EXTRA_PACKAGE_NAME);
+
+        setResult(RESULT_CANCELED);
+        if (!buildDialog(packageName)) {
+            finish();
+        }
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        switch (which) {
+            case BUTTON_POSITIVE:
+                SmsApplication.setDefaultApplication(mNewSmsApplicationData.mPackageName, this);
+                setResult(RESULT_OK);
+                break;
+            case BUTTON_NEGATIVE:
+                break;
+        }
+    }
+
+    private boolean buildDialog(String packageName) {
+        TelephonyManager tm = (TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
+        if (tm.getPhoneType() == TelephonyManager.PHONE_TYPE_NONE) {
+            // No phone, no SMS
+            return false;
+        }
+
+        mNewSmsApplicationData = SmsApplication.getSmsApplicationData(packageName, this);
+        if (mNewSmsApplicationData == null) {
+            return false;
+        }
+
+        SmsApplicationData oldSmsApplicationData = null;
+        ComponentName oldSmsComponent = SmsApplication.getDefaultSmsApplication(this, true);
+        if (oldSmsComponent != null) {
+            oldSmsApplicationData =
+                    SmsApplication.getSmsApplicationData(oldSmsComponent.getPackageName(), this);
+            if (oldSmsApplicationData.mPackageName.equals(mNewSmsApplicationData.mPackageName)) {
+                return false;
+            }
+        }
+
+        // Compose dialog; get
+        final AlertController.AlertParams p = mAlertParams;
+        p.mTitle = getString(R.string.sms_change_default_dialog_title);
+        if (oldSmsApplicationData != null) {
+            p.mMessage = getString(R.string.sms_change_default_dialog_text,
+                    mNewSmsApplicationData.mApplicationName,
+                    oldSmsApplicationData.mApplicationName);
+        } else {
+            p.mMessage = getString(R.string.sms_change_default_no_previous_dialog_text,
+                    mNewSmsApplicationData.mApplicationName);
+        }
+        p.mPositiveButtonText = getString(R.string.yes);
+        p.mNegativeButtonText = getString(R.string.no);
+        p.mPositiveButtonListener = this;
+        p.mNegativeButtonListener = this;
+        setupAlert();
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/SmsListPreference.java b/src/com/android/settings/SmsListPreference.java
new file mode 100644
index 0000000..15df776
--- /dev/null
+++ b/src/com/android/settings/SmsListPreference.java
@@ -0,0 +1,86 @@
+/*
+ * 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.Builder;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.preference.ListPreference;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.CheckedTextView;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+
+/**
+ * Extends ListPreference to allow us to show the icons for the available SMS applications. We do
+ * this because the names of SMS applications are very similar and the user may not be able to
+ * determine what app they are selecting without an icon.
+ */
+public class SmsListPreference extends ListPreference {
+    private Drawable[] mEntryDrawables;
+
+    public class SmsArrayAdapter extends ArrayAdapter<CharSequence> {
+        private Drawable[] mImageDrawables = null;
+        private int mSelectedIndex = 0;
+
+        public SmsArrayAdapter(Context context, int textViewResourceId,
+                CharSequence[] objects, Drawable[] imageDrawables, int selectedIndex) {
+            super(context, textViewResourceId, objects);
+            mSelectedIndex = selectedIndex;
+            mImageDrawables = imageDrawables;
+        }
+
+        public View getView(int position, View convertView, ViewGroup parent) {
+            LayoutInflater inflater = ((Activity)getContext()).getLayoutInflater();
+            View view = inflater.inflate(R.layout.sms_preference_item, parent, false);
+            CheckedTextView checkedTextView = (CheckedTextView)view.findViewById(R.id.sms_text);
+            checkedTextView.setText(getItem(position));
+            if (position == mSelectedIndex) {
+                checkedTextView.setChecked(true);
+            }
+            ImageView imageView = (ImageView)view.findViewById(R.id.sms_image);
+            imageView.setImageDrawable(mImageDrawables[position]);
+            return view;
+        }
+    }
+
+    public SmsListPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public void setEntryDrawables(Drawable[] entries) {
+        mEntryDrawables = entries;
+    }
+
+    public Drawable[] getEntryDrawables() {
+        return mEntryDrawables;
+    }
+
+    @Override
+    protected void onPrepareDialogBuilder(Builder builder) {
+        int selectedIndex = findIndexOfValue(getValue());
+        ListAdapter adapter = new SmsArrayAdapter(getContext(),
+            R.layout.sms_preference_item, getEntries(), mEntryDrawables, selectedIndex);
+        builder.setAdapter(adapter, this);
+        super.onPrepareDialogBuilder(builder);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index 67557b9..28d93f1 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java
@@ -16,9 +16,16 @@
 
 package com.android.settings;
 
+import com.android.settings.bluetooth.DockEventReceiver;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.bluetooth.BluetoothDevice;
+import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.database.Cursor;
@@ -47,6 +54,8 @@
         Preference.OnPreferenceChangeListener {
     private static final String TAG = "SoundSettings";
 
+    private static final int DIALOG_NOT_DOCKED = 1;
+
     /** If there is no setting in the provider, use this. */
     private static final int FALLBACK_EMERGENCY_TONE_VALUE = 0;
 
@@ -62,10 +71,14 @@
     private static final String KEY_RINGTONE = "ringtone";
     private static final String KEY_NOTIFICATION_SOUND = "notification_sound";
     private static final String KEY_CATEGORY_CALLS = "category_calls_and_notification";
+    private static final String KEY_DOCK_CATEGORY = "dock_category";
+    private static final String KEY_DOCK_AUDIO_SETTINGS = "dock_audio";
+    private static final String KEY_DOCK_SOUNDS = "dock_sounds";
+    private static final String KEY_DOCK_AUDIO_MEDIA_ENABLED = "dock_audio_media_enabled";
 
     private static final String[] NEED_VOICE_CAPABILITY = {
             KEY_RINGTONE, KEY_DTMF_TONE, KEY_CATEGORY_CALLS,
-            KEY_EMERGENCY_TONE
+            KEY_EMERGENCY_TONE, KEY_VIBRATE
     };
 
     private static final int MSG_UPDATE_RINGTONE_SUMMARY = 1;
@@ -84,6 +97,11 @@
 
     private AudioManager mAudioManager;
 
+    private Preference mDockAudioSettings;
+    private CheckBoxPreference mDockSounds;
+    private Intent mDockIntent;
+    private CheckBoxPreference mDockAudioMediaEnabled;
+
     private Handler mHandler = new Handler() {
         public void handleMessage(Message msg) {
             switch (msg.what) {
@@ -97,6 +115,15 @@
         }
     };
 
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent.getAction().equals(Intent.ACTION_DOCK_EVENT)) {
+                handleDockChange(intent);
+            }
+        }
+    };
+
     private PreferenceGroup mSoundSettings;
 
     @Override
@@ -118,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,
@@ -145,15 +177,15 @@
 
         Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
         if (vibrator == null || !vibrator.hasVibrator()) {
-            getPreferenceScreen().removePreference(mVibrateWhenRinging);
-            getPreferenceScreen().removePreference(mHapticFeedback);
+            removePreference(KEY_VIBRATE);
+            removePreference(KEY_HAPTIC_FEEDBACK);
         }
 
         if (TelephonyManager.PHONE_TYPE_CDMA == activePhoneType) {
             ListPreference emergencyTonePreference =
                 (ListPreference) findPreference(KEY_EMERGENCY_TONE);
-            emergencyTonePreference.setValue(String.valueOf(Settings.System.getInt(
-                resolver, Settings.System.EMERGENCY_TONE, FALLBACK_EMERGENCY_TONE_VALUE)));
+            emergencyTonePreference.setValue(String.valueOf(Settings.Global.getInt(
+                resolver, Settings.Global.EMERGENCY_TONE, FALLBACK_EMERGENCY_TONE_VALUE)));
             emergencyTonePreference.setOnPreferenceChangeListener(this);
         }
 
@@ -193,6 +225,8 @@
                 }
             }
         };
+
+        initDockSettings();
     }
 
     @Override
@@ -200,6 +234,16 @@
         super.onResume();
 
         lookupRingtoneNames();
+
+        IntentFilter filter = new IntentFilter(Intent.ACTION_DOCK_EVENT);
+        getActivity().registerReceiver(mReceiver, filter);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        getActivity().unregisterReceiver(mReceiver);
     }
 
     private void updateRingtoneName(int type, Preference preference, int msg) {
@@ -262,8 +306,37 @@
         } else if (preference == mMusicFx) {
             // let the framework fire off the intent
             return false;
-        }
+        } else if (preference == mDockAudioSettings) {
+            int dockState = mDockIntent != null
+                    ? mDockIntent.getIntExtra(Intent.EXTRA_DOCK_STATE, 0)
+                    : Intent.EXTRA_DOCK_STATE_UNDOCKED;
 
+            if (dockState == Intent.EXTRA_DOCK_STATE_UNDOCKED) {
+                showDialog(DIALOG_NOT_DOCKED);
+            } else {
+                boolean isBluetooth = mDockIntent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE) != null;
+
+                if (isBluetooth) {
+                    Intent i = new Intent(mDockIntent);
+                    i.setAction(DockEventReceiver.ACTION_DOCK_SHOW_UI);
+                    i.setClass(getActivity(), DockEventReceiver.class);
+                    getActivity().sendBroadcast(i);
+                } else {
+                    PreferenceScreen ps = (PreferenceScreen)mDockAudioSettings;
+                    Bundle extras = ps.getExtras();
+                    extras.putBoolean("checked",
+                            Settings.Global.getInt(getContentResolver(),
+                                    Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, 0) == 1);
+                    super.onPreferenceTreeClick(ps, ps);
+                }
+            }
+        } else if (preference == mDockSounds) {
+            Settings.Global.putInt(getContentResolver(), Settings.Global.DOCK_SOUNDS_ENABLED,
+                    mDockSounds.isChecked() ? 1 : 0);
+        } else if (preference == mDockAudioMediaEnabled) {
+            Settings.Global.putInt(getContentResolver(), Settings.Global.DOCK_AUDIO_MEDIA_ENABLED,
+                    mDockAudioMediaEnabled.isChecked() ? 1 : 0);
+        }
         return true;
     }
 
@@ -272,8 +345,8 @@
         if (KEY_EMERGENCY_TONE.equals(key)) {
             try {
                 int value = Integer.parseInt((String) objValue);
-                Settings.System.putInt(getContentResolver(),
-                        Settings.System.EMERGENCY_TONE, value);
+                Settings.Global.putInt(getContentResolver(),
+                        Settings.Global.EMERGENCY_TONE, value);
             } catch (NumberFormatException e) {
                 Log.e(TAG, "could not persist emergency tone setting", e);
             }
@@ -286,4 +359,87 @@
     protected int getHelpResource() {
         return R.string.help_url_sound;
     }
+
+    private boolean needsDockSettings() {
+        return getResources().getBoolean(R.bool.has_dock_settings);
+    }
+
+    private void initDockSettings() {
+        ContentResolver resolver = getContentResolver();
+
+        if (needsDockSettings()) {
+            mDockSounds = (CheckBoxPreference) findPreference(KEY_DOCK_SOUNDS);
+            mDockSounds.setPersistent(false);
+            mDockSounds.setChecked(Settings.Global.getInt(resolver,
+                    Settings.Global.DOCK_SOUNDS_ENABLED, 0) != 0);
+            mDockAudioSettings = findPreference(KEY_DOCK_AUDIO_SETTINGS);
+            mDockAudioSettings.setEnabled(false);
+        } else {
+            getPreferenceScreen().removePreference(findPreference(KEY_DOCK_CATEGORY));
+            getPreferenceScreen().removePreference(findPreference(KEY_DOCK_AUDIO_SETTINGS));
+            getPreferenceScreen().removePreference(findPreference(KEY_DOCK_SOUNDS));
+            Settings.Global.putInt(resolver, Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, 1);
+        }
+    }
+
+    private void handleDockChange(Intent intent) {
+        if (mDockAudioSettings != null) {
+            int dockState = intent.getIntExtra(Intent.EXTRA_DOCK_STATE, 0);
+
+            boolean isBluetooth =
+                    intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE) != null;
+
+            mDockIntent = intent;
+
+            if (dockState != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
+                // remove undocked dialog if currently showing.
+                try {
+                    removeDialog(DIALOG_NOT_DOCKED);
+                } catch (IllegalArgumentException iae) {
+                    // Maybe it was already dismissed
+                }
+
+                if (isBluetooth) {
+                    mDockAudioSettings.setEnabled(true);
+                } else {
+                    if (dockState == Intent.EXTRA_DOCK_STATE_LE_DESK) {
+                        ContentResolver resolver = getContentResolver();
+                        mDockAudioSettings.setEnabled(true);
+                        if (Settings.Global.getInt(resolver,
+                                Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, -1) == -1) {
+                            Settings.Global.putInt(resolver,
+                                    Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, 0);
+                        }
+                        mDockAudioMediaEnabled =
+                                (CheckBoxPreference) findPreference(KEY_DOCK_AUDIO_MEDIA_ENABLED);
+                        mDockAudioMediaEnabled.setPersistent(false);
+                        mDockAudioMediaEnabled.setChecked(
+                                Settings.Global.getInt(resolver,
+                                        Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, 0) != 0);
+                    } else {
+                        mDockAudioSettings.setEnabled(false);
+                    }
+                }
+            } else {
+                mDockAudioSettings.setEnabled(false);
+            }
+        }
+    }
+
+    @Override
+    public Dialog onCreateDialog(int id) {
+        if (id == DIALOG_NOT_DOCKED) {
+            return createUndockedMessage();
+        }
+        return null;
+    }
+
+    private Dialog createUndockedMessage() {
+        final AlertDialog.Builder ab = new AlertDialog.Builder(getActivity());
+        ab.setTitle(R.string.dock_not_found_title);
+        ab.setMessage(R.string.dock_not_found_text);
+        ab.setPositiveButton(android.R.string.ok, null);
+        return ab.create();
+    }
 }
+
diff --git a/src/com/android/settings/SubSettings.java b/src/com/android/settings/SubSettings.java
index eb275ad..34e9ba3 100644
--- a/src/com/android/settings/SubSettings.java
+++ b/src/com/android/settings/SubSettings.java
@@ -16,6 +16,11 @@
 
 package com.android.settings;
 
+import android.app.Fragment;
+import android.util.Log;
+
+import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
+
 /**
  * Stub class for showing sub-settings; we can't use the main Settings class
  * since for our app it is a special singleTask class.
@@ -27,4 +32,10 @@
         finish();
         return true;
     }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        Log.d("SubSettings", "Launching fragment " + fragmentName);
+        return true;
+    }
 }
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 4a79eca..4e0933d 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -38,6 +38,8 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.SystemProperties;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
@@ -48,6 +50,7 @@
 
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.Locale;
 
 /*
@@ -55,6 +58,7 @@
  */
 public class TetherSettings extends SettingsPreferenceFragment
         implements DialogInterface.OnClickListener, Preference.OnPreferenceChangeListener {
+    private static final String TAG = "TetherSettings";
 
     private static final String USB_TETHER_SETTINGS = "usb_tether_settings";
     private static final String ENABLE_WIFI_AP = "enable_wifi_ap";
@@ -77,7 +81,7 @@
     private String[] mWifiRegexs;
 
     private String[] mBluetoothRegexs;
-    private BluetoothPan mBluetoothPan;
+    private AtomicReference<BluetoothPan> mBluetoothPan = new AtomicReference<BluetoothPan>();
 
     private static final String WIFI_AP_SSID_AND_SECURITY = "wifi_ap_ssid_and_security";
     private static final int CONFIG_SUBTEXT = R.string.wifi_tether_configure_subtext;
@@ -150,7 +154,8 @@
         if (!bluetoothAvailable) {
             getPreferenceScreen().removePreference(mBluetoothTether);
         } else {
-            if (mBluetoothPan != null && mBluetoothPan.isTetheringOn()) {
+            BluetoothPan pan = mBluetoothPan.get();
+            if (pan != null && pan.isTetheringOn()) {
                 mBluetoothTether.setChecked(true);
             } else {
                 mBluetoothTether.setChecked(false);
@@ -187,10 +192,10 @@
     private BluetoothProfile.ServiceListener mProfileServiceListener =
         new BluetoothProfile.ServiceListener() {
         public void onServiceConnected(int profile, BluetoothProfile proxy) {
-            mBluetoothPan = (BluetoothPan) proxy;
+            mBluetoothPan.set((BluetoothPan) proxy);
         }
         public void onServiceDisconnected(int profile) {
-            mBluetoothPan = null;
+            mBluetoothPan.set(null);
         }
     };
 
@@ -234,8 +239,11 @@
                     switch (intent
                             .getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR)) {
                         case BluetoothAdapter.STATE_ON:
-                            mBluetoothPan.setBluetoothTethering(true);
-                            mBluetoothEnableForTether = false;
+                            BluetoothPan bluetoothPan = mBluetoothPan.get();
+                            if (bluetoothPan != null) {
+                                bluetoothPan.setBluetoothTethering(true);
+                                mBluetoothEnableForTether = false;
+                            }
                             break;
 
                         case BluetoothAdapter.STATE_OFF:
@@ -371,12 +379,6 @@
 
     private void updateBluetoothState(String[] available, String[] tethered,
             String[] errored) {
-        int bluetoothTethered = 0;
-        for (String s : tethered) {
-            for (String regex : mBluetoothRegexs) {
-                if (s.matches(regex)) bluetoothTethered++;
-            }
-        }
         boolean bluetoothErrored = false;
         for (String s: errored) {
             for (String regex : mBluetoothRegexs) {
@@ -385,31 +387,40 @@
         }
 
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        if (adapter == null)
+            return;
         int btState = adapter.getState();
         if (btState == BluetoothAdapter.STATE_TURNING_OFF) {
             mBluetoothTether.setEnabled(false);
-            mBluetoothTether.setSummary(R.string.wifi_stopping);
+            mBluetoothTether.setSummary(R.string.bluetooth_turning_off);
         } else if (btState == BluetoothAdapter.STATE_TURNING_ON) {
             mBluetoothTether.setEnabled(false);
             mBluetoothTether.setSummary(R.string.bluetooth_turning_on);
-        } else if (btState == BluetoothAdapter.STATE_ON && mBluetoothPan.isTetheringOn()) {
-            mBluetoothTether.setChecked(true);
-            mBluetoothTether.setEnabled(true);
-            if (bluetoothTethered > 1) {
-                String summary = getString(
-                        R.string.bluetooth_tethering_devices_connected_subtext, bluetoothTethered);
-                mBluetoothTether.setSummary(summary);
-            } else if (bluetoothTethered == 1) {
-                mBluetoothTether.setSummary(R.string.bluetooth_tethering_device_connected_subtext);
-            } else if (bluetoothErrored) {
-                mBluetoothTether.setSummary(R.string.bluetooth_tethering_errored_subtext);
-            } else {
-                mBluetoothTether.setSummary(R.string.bluetooth_tethering_available_subtext);
-            }
         } else {
-            mBluetoothTether.setEnabled(true);
-            mBluetoothTether.setChecked(false);
-            mBluetoothTether.setSummary(R.string.bluetooth_tethering_off_subtext);
+            BluetoothPan bluetoothPan = mBluetoothPan.get();
+            if (btState == BluetoothAdapter.STATE_ON && bluetoothPan != null &&
+                    bluetoothPan.isTetheringOn()) {
+                mBluetoothTether.setChecked(true);
+                mBluetoothTether.setEnabled(true);
+                int bluetoothTethered = bluetoothPan.getConnectedDevices().size();
+                if (bluetoothTethered > 1) {
+                    String summary = getString(
+                            R.string.bluetooth_tethering_devices_connected_subtext,
+                            bluetoothTethered);
+                    mBluetoothTether.setSummary(summary);
+                } else if (bluetoothTethered == 1) {
+                    mBluetoothTether.setSummary(
+                            R.string.bluetooth_tethering_device_connected_subtext);
+                } else if (bluetoothErrored) {
+                    mBluetoothTether.setSummary(R.string.bluetooth_tethering_errored_subtext);
+                } else {
+                    mBluetoothTether.setSummary(R.string.bluetooth_tethering_available_subtext);
+                }
+            } else {
+                mBluetoothTether.setEnabled(true);
+                mBluetoothTether.setChecked(false);
+                mBluetoothTether.setSummary(R.string.bluetooth_tethering_off_subtext);
+            }
         }
     }
 
@@ -477,7 +488,8 @@
                     mBluetoothTether.setSummary(R.string.bluetooth_turning_on);
                     mBluetoothTether.setEnabled(false);
                 } else {
-                    mBluetoothPan.setBluetoothTethering(true);
+                    BluetoothPan bluetoothPan = mBluetoothPan.get();
+                    if (bluetoothPan != null) bluetoothPan.setBluetoothTethering(true);
                     mBluetoothTether.setSummary(R.string.bluetooth_tethering_available_subtext);
                 }
                 break;
@@ -529,7 +541,8 @@
                     errored = true;
                 }
 
-                mBluetoothPan.setBluetoothTethering(false);
+                BluetoothPan bluetoothPan = mBluetoothPan.get();
+                if (bluetoothPan != null) bluetoothPan.setBluetoothTethering(false);
                 if (errored) {
                     mBluetoothTether.setSummary(R.string.bluetooth_tethering_errored_subtext);
                 } else {
@@ -581,4 +594,17 @@
     public int getHelpResource() {
         return R.string.help_url_tether;
     }
+
+    /**
+     * Checks whether this screen will have anything to show on this device. This is called by
+     * the shortcut picker for Settings shortcuts (home screen widget).
+     * @param context a context object for getting a system service.
+     * @return whether Tether & portable hotspot should be shown in the shortcuts picker.
+     */
+    public static boolean showInShortcuts(Context context) {
+        final ConnectivityManager cm =
+                (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        final boolean isSecondaryUser = UserHandle.myUserId() != UserHandle.USER_OWNER;
+        return !isSecondaryUser && cm.isTetheringSupported();
+    }
 }
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index 687663a..cdb96cb 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -16,14 +16,18 @@
 
 package com.android.settings;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Fragment;
+import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.net.http.SslCertificate;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.RemoteException;
+import android.os.UserManager;
 import android.security.IKeyChainService;
 import android.security.KeyChain;
 import android.security.KeyChain.KeyChainConnection;
@@ -45,12 +49,23 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-import org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore;
+
+import com.android.org.conscrypt.TrustedCertificateStore;
 
 public class TrustedCredentialsSettings extends Fragment {
 
     private static final String TAG = "TrustedCredentialsSettings";
 
+    private UserManager mUserManager;
+
+    private static final String USER_ACTION = "com.android.settings.TRUSTED_CREDENTIALS_USER";
+
+    private static final int REQUEST_PIN_CHALLENGE = 12309;
+    // If the restriction PIN is entered correctly.
+    private boolean mChallengeSucceeded;
+    private boolean mChallengeRequested;
+
+
     private enum Tab {
         SYSTEM("system",
                R.string.trusted_credentials_system_tab,
@@ -141,6 +156,13 @@
 
     private TabHost mTabHost;
 
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+    }
+
+
     @Override public View onCreateView(
             LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
         mTabHost = (TabHost) inflater.inflate(R.layout.trusted_credentials, parent, false);
@@ -148,6 +170,10 @@
         addTab(Tab.SYSTEM);
         // TODO add Install button on Tab.USER to go to CertInstaller like KeyChainActivity
         addTab(Tab.USER);
+        if (getActivity().getIntent() != null &&
+                USER_ACTION.equals(getActivity().getIntent().getAction())) {
+            mTabHost.setCurrentTabByTag(Tab.USER.mTag);
+        }
         return mTabHost;
     }
 
@@ -354,6 +380,11 @@
         removeButton.setText(certHolder.mTab.getButtonLabel(certHolder));
         removeButton.setOnClickListener(new View.OnClickListener() {
             @Override public void onClick(View v) {
+                if (mUserManager.hasRestrictionsChallenge() && !mChallengeSucceeded) {
+                    ensurePin();
+                    return;
+                }
+
                 AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
                 builder.setMessage(certHolder.mTab.getButtonConfirmation(certHolder));
                 builder.setPositiveButton(
@@ -378,6 +409,35 @@
         certDialog.show();
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_PIN_CHALLENGE) {
+            mChallengeRequested = false;
+            if (resultCode == Activity.RESULT_OK) {
+                mChallengeSucceeded = true;
+            }
+            return;
+        }
+
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    private void ensurePin() {
+        if (!mChallengeSucceeded) {
+            final UserManager um = UserManager.get(getActivity());
+            if (!mChallengeRequested) {
+                if (um.hasRestrictionsChallenge()) {
+                    Intent requestPin =
+                            new Intent(Intent.ACTION_RESTRICTIONS_CHALLENGE);
+                    startActivityForResult(requestPin, REQUEST_PIN_CHALLENGE);
+                    mChallengeRequested = true;
+                }
+            }
+        }
+        mChallengeSucceeded = false;
+    }
+
+
     private class AliasOperation extends AsyncTask<Void, Void, Boolean> {
         private final CertHolder mCertHolder;
         private AliasOperation(CertHolder certHolder) {
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index b561ed4..da12004 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -16,38 +16,30 @@
 
 package com.android.settings;
 
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
+import com.android.settings.inputmethod.UserDictionaryAddWordContents;
+import com.android.settings.inputmethod.UserDictionarySettingsUtils;
+
 import android.app.ListFragment;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.UserDictionary;
-import android.text.InputType;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.widget.AlphabetIndexer;
-import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.SectionIndexer;
 import android.widget.SimpleCursorAdapter;
 import android.widget.TextView;
 
-import com.android.settings.inputmethod.UserDictionaryAddWordContents;
-
 import java.util.Locale;
 
 public class UserDictionarySettings extends ListFragment {
@@ -82,6 +74,7 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        getActivity().getActionBar().setTitle(R.string.user_dict_settings_title);
     }
 
     @Override
@@ -123,7 +116,9 @@
         listView.setEmptyView(emptyView);
 
         setHasOptionsMenu(true);
-
+        // Show the language as a subtitle of the action bar
+        getActivity().getActionBar().setSubtitle(
+                UserDictionarySettingsUtils.getLocaleDisplayName(getActivity(), mLocale));
     }
 
     private Cursor createCursor(final String locale) {
@@ -170,7 +165,7 @@
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         MenuItem actionItem =
                 menu.add(0, OPTIONS_MENU_ADD, 0, R.string.user_dict_settings_add_menu_title)
-                .setIcon(R.drawable.ic_menu_add);
+                .setIcon(R.drawable.ic_menu_add_dark);
         actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
                 MenuItem.SHOW_AS_ACTION_WITH_TEXT);
     }
@@ -241,8 +236,9 @@
 
         private AlphabetIndexer mIndexer;
 
-        private ViewBinder mViewBinder = new ViewBinder() {
+        private final ViewBinder mViewBinder = new ViewBinder() {
 
+            @Override
             public boolean setViewValue(View v, Cursor c, int columnIndex) {
                 if (columnIndex == INDEX_SHORTCUT) {
                     final String shortcut = c.getString(INDEX_SHORTCUT);
@@ -273,14 +269,17 @@
             setViewBinder(mViewBinder);
         }
 
+        @Override
         public int getPositionForSection(int section) {
             return null == mIndexer ? 0 : mIndexer.getPositionForSection(section);
         }
 
+        @Override
         public int getSectionForPosition(int position) {
             return null == mIndexer ? 0 : mIndexer.getSectionForPosition(position);
         }
 
+        @Override
         public Object[] getSections() {
             return null == mIndexer ? null : mIndexer.getSections();
         }
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index a029342..b9e729c 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -16,32 +16,57 @@
 
 package com.android.settings;
 
+import android.app.Activity;
 import android.app.ActivityManager;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.ContentResolver;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.content.res.Resources.NotFoundException;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
 import android.net.LinkProperties;
+import android.net.Uri;
 import android.os.BatteryManager;
 import android.os.Bundle;
-import android.os.SystemProperties;
+import android.os.ParcelFileDescriptor;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceActivity.Header;
 import android.preference.PreferenceFrameLayout;
 import android.preference.PreferenceGroup;
+import android.provider.ContactsContract.CommonDataKinds;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Data;
+import android.provider.ContactsContract.Profile;
+import android.provider.ContactsContract.RawContacts;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ListView;
 import android.widget.TabWidget;
 
+import com.android.settings.users.ProfileUpdateReceiver;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.InetAddress;
 import java.util.Iterator;
 import java.util.List;
@@ -55,6 +80,11 @@
     public static final int UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY = 1;
 
     /**
+     * The opacity level of a disabled icon.
+     */
+    public static final float DISABLED_ALPHA = 0.4f;
+
+    /**
      * Name of the meta-data item that should be set in the AndroidManifest.xml
      * to specify the icon that should be displayed for the preference.
      */
@@ -270,7 +300,7 @@
         }
 
         // Did not find a matching activity, so remove the preference
-        if (target.remove(header)) System.err.println("Removed " + header.id);
+        target.remove(header);
 
         return false;
     }
@@ -300,7 +330,7 @@
     /**
      * Returns the WIFI IP Addresses, if any, taking into account IPv4 and IPv6 style addresses.
      * @param context the application context
-     * @return the formatted and comma-separated IP addresses, or null if none.
+     * @return the formatted and newline-separated IP addresses, or null if none.
      */
     public static String getWifiIpAddresses(Context context) {
         ConnectivityManager cm = (ConnectivityManager)
@@ -313,25 +343,23 @@
      * Returns the default link's IP addresses, if any, taking into account IPv4 and IPv6 style
      * addresses.
      * @param context the application context
-     * @return the formatted and comma-separated IP addresses, or null if none.
+     * @return the formatted and newline-separated IP addresses, or null if none.
      */
-    public static String getDefaultIpAddresses(Context context) {
-        ConnectivityManager cm = (ConnectivityManager)
-                context.getSystemService(Context.CONNECTIVITY_SERVICE);
+    public static String getDefaultIpAddresses(ConnectivityManager cm) {
         LinkProperties prop = cm.getActiveLinkProperties();
         return formatIpAddresses(prop);
     }
 
     private static String formatIpAddresses(LinkProperties prop) {
         if (prop == null) return null;
-        Iterator<InetAddress> iter = prop.getAddresses().iterator();
+        Iterator<InetAddress> iter = prop.getAllAddresses().iterator();
         // If there are no entries, return null
         if (!iter.hasNext()) return null;
         // Concatenate all available addresses, comma separated
         String addresses = "";
         while (iter.hasNext()) {
             addresses += iter.next().getHostAddress();
-            if (iter.hasNext()) addresses += ", ";
+            if (iter.hasNext()) addresses += "\n";
         }
         return addresses;
     }
@@ -356,26 +384,35 @@
         }
     }
 
+    public static boolean isBatteryPresent(Intent batteryChangedIntent) {
+        return batteryChangedIntent.getBooleanExtra(BatteryManager.EXTRA_PRESENT, true);
+    }
+
     public static String getBatteryPercentage(Intent batteryChangedIntent) {
-        int level = batteryChangedIntent.getIntExtra("level", 0);
-        int scale = batteryChangedIntent.getIntExtra("scale", 100);
+        int level = batteryChangedIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
+        int scale = batteryChangedIntent.getIntExtra(BatteryManager.EXTRA_SCALE, 100);
         return String.valueOf(level * 100 / scale) + "%";
     }
 
     public static String getBatteryStatus(Resources res, Intent batteryChangedIntent) {
         final Intent intent = batteryChangedIntent;
 
-        int plugType = intent.getIntExtra("plugged", 0);
-        int status = intent.getIntExtra("status", BatteryManager.BATTERY_STATUS_UNKNOWN);
+        int plugType = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0);
+        int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS,
+                BatteryManager.BATTERY_STATUS_UNKNOWN);
         String statusString;
         if (status == BatteryManager.BATTERY_STATUS_CHARGING) {
             statusString = res.getString(R.string.battery_info_status_charging);
             if (plugType > 0) {
-                statusString = statusString
-                        + " "
-                        + res.getString((plugType == BatteryManager.BATTERY_PLUGGED_AC)
-                                ? R.string.battery_info_status_charging_ac
-                                : R.string.battery_info_status_charging_usb);
+                int resId;
+                if (plugType == BatteryManager.BATTERY_PLUGGED_AC) {
+                    resId = R.string.battery_info_status_charging_ac;
+                } else if (plugType == BatteryManager.BATTERY_PLUGGED_USB) {
+                    resId = R.string.battery_info_status_charging_usb;
+                } else {
+                    resId = R.string.battery_info_status_charging_wireless;
+                }
+                statusString = statusString + " " + res.getString(resId);
             }
         } else if (status == BatteryManager.BATTERY_STATUS_DISCHARGING) {
             statusString = res.getString(R.string.battery_info_status_discharging);
@@ -390,25 +427,31 @@
         return statusString;
     }
 
+    public static void forcePrepareCustomPreferencesList(
+            ViewGroup parent, View child, ListView list, boolean ignoreSidePadding) {
+        list.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_OVERLAY);
+        list.setClipToPadding(false);
+        prepareCustomPreferencesList(parent, child, list, ignoreSidePadding);
+    }
+
     /**
      * Prepare a custom preferences layout, moving padding to {@link ListView}
      * when outside scrollbars are requested. Usually used to display
      * {@link ListView} and {@link TabWidget} with correct padding.
      */
     public static void prepareCustomPreferencesList(
-            ViewGroup parent, View child, ListView list, boolean ignoreSidePadding) {
+            ViewGroup parent, View child, View list, boolean ignoreSidePadding) {
         final boolean movePadding = list.getScrollBarStyle() == View.SCROLLBARS_OUTSIDE_OVERLAY;
         if (movePadding && parent instanceof PreferenceFrameLayout) {
             ((PreferenceFrameLayout.LayoutParams) child.getLayoutParams()).removeBorders = true;
 
             final Resources res = list.getResources();
-            final int paddingSide = res.getDimensionPixelSize(
-                    com.android.internal.R.dimen.preference_fragment_padding_side);
+            final int paddingSide = res.getDimensionPixelSize(R.dimen.settings_side_margin);
             final int paddingBottom = res.getDimensionPixelSize(
                     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);
         }
     }
 
@@ -441,4 +484,121 @@
             return R.string.tether_settings_title_bluetooth;
         }
     }
+
+    /* Used by UserSettings as well. Call this on a non-ui thread. */
+    public static boolean copyMeProfilePhoto(Context context, UserInfo user) {
+        Uri contactUri = Profile.CONTENT_URI;
+
+        InputStream avatarDataStream = Contacts.openContactPhotoInputStream(
+                    context.getContentResolver(),
+                    contactUri, true);
+        // If there's no profile photo, assign a default avatar
+        if (avatarDataStream == null) {
+            return false;
+        }
+        int userId = user != null ? user.id : UserHandle.myUserId();
+        UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        Bitmap icon = BitmapFactory.decodeStream(avatarDataStream);
+        um.setUserIcon(userId, icon);
+        try {
+            avatarDataStream.close();
+        } catch (IOException ioe) { }
+        return true;
+    }
+
+    public static String getMeProfileName(Context context, boolean full) {
+        if (full) {
+            return getProfileDisplayName(context);
+        } else {
+            return getShorterNameIfPossible(context);
+        }
+    }
+
+    private static String getShorterNameIfPossible(Context context) {
+        final String given = getLocalProfileGivenName(context);
+        return !TextUtils.isEmpty(given) ? given : getProfileDisplayName(context);
+    }
+
+    private static String getLocalProfileGivenName(Context context) {
+        final ContentResolver cr = context.getContentResolver();
+
+        // Find the raw contact ID for the local ME profile raw contact.
+        final long localRowProfileId;
+        final Cursor localRawProfile = cr.query(
+                Profile.CONTENT_RAW_CONTACTS_URI,
+                new String[] {RawContacts._ID},
+                RawContacts.ACCOUNT_TYPE + " IS NULL AND " +
+                        RawContacts.ACCOUNT_NAME + " IS NULL",
+                null, null);
+        if (localRawProfile == null) return null;
+
+        try {
+            if (!localRawProfile.moveToFirst()) {
+                return null;
+            }
+            localRowProfileId = localRawProfile.getLong(0);
+        } finally {
+            localRawProfile.close();
+        }
+
+        // Find the structured name for the raw contact.
+        final Cursor structuredName = cr.query(
+                Profile.CONTENT_URI.buildUpon().appendPath(Contacts.Data.CONTENT_DIRECTORY).build(),
+                new String[] {CommonDataKinds.StructuredName.GIVEN_NAME,
+                    CommonDataKinds.StructuredName.FAMILY_NAME},
+                Data.RAW_CONTACT_ID + "=" + localRowProfileId,
+                null, null);
+        if (structuredName == null) return null;
+
+        try {
+            if (!structuredName.moveToFirst()) {
+                return null;
+            }
+            String partialName = structuredName.getString(0);
+            if (TextUtils.isEmpty(partialName)) {
+                partialName = structuredName.getString(1);
+            }
+            return partialName;
+        } finally {
+            structuredName.close();
+        }
+    }
+
+    private static final String getProfileDisplayName(Context context) {
+        final ContentResolver cr = context.getContentResolver();
+        final Cursor profile = cr.query(Profile.CONTENT_URI,
+                new String[] {Profile.DISPLAY_NAME}, null, null, null);
+        if (profile == null) return null;
+
+        try {
+            if (!profile.moveToFirst()) {
+                return null;
+            }
+            return profile.getString(0);
+        } finally {
+            profile.close();
+        }
+    }
+
+    /** Not global warming, it's global change warning. */
+    public static Dialog buildGlobalChangeWarningDialog(final Context context, int titleResId,
+            final Runnable positiveAction) {
+        final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        builder.setTitle(titleResId);
+        builder.setMessage(R.string.global_change_warning);
+        builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                positiveAction.run();
+            }
+        });
+        builder.setNegativeButton(android.R.string.cancel, null);
+
+        return builder.create();
+    }
+
+    public static boolean hasMultipleUsers(Context context) {
+        return ((UserManager) context.getSystemService(Context.USER_SERVICE))
+                .getUsers().size() > 1;
+    }
 }
diff --git a/src/com/android/settings/VoiceInputOutputSettings.java b/src/com/android/settings/VoiceInputOutputSettings.java
index 81e624f..b499deda 100644
--- a/src/com/android/settings/VoiceInputOutputSettings.java
+++ b/src/com/android/settings/VoiceInputOutputSettings.java
@@ -183,6 +183,8 @@
     
     private void updateSettingsLink(String currentSetting) {
         ResolveInfo currentRecognizer = mAvailableRecognizersMap.get(currentSetting);
+        if (currentRecognizer == null) return;
+
         ServiceInfo si = currentRecognizer.serviceInfo;
         XmlResourceParser parser = null;
         String settingsActivity = null;
diff --git a/src/com/android/settings/WarnedListPreference.java b/src/com/android/settings/WarnedListPreference.java
new file mode 100644
index 0000000..634986d
--- /dev/null
+++ b/src/com/android/settings/WarnedListPreference.java
@@ -0,0 +1,37 @@
+/*
+ * 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.ListPreference;
+import android.util.AttributeSet;
+
+public class WarnedListPreference extends ListPreference {
+    public WarnedListPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void onClick() {
+        // Ignore this until an explicit call to click()
+    }
+
+    public void click() {
+        super.onClick();
+    }
+}
+
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 347315a..6724cc1 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -16,30 +16,45 @@
 
 package com.android.settings;
 
+
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
 import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
-import android.net.wifi.p2p.WifiP2pManager;
+import android.net.NetworkInfo;
 import android.nfc.NfcAdapter;
 import android.os.Bundle;
 import android.os.SystemProperties;
+import android.os.UserHandle;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Switch;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
 
+import com.android.internal.telephony.SmsApplication;
+import com.android.internal.telephony.SmsApplication.SmsApplicationData;
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.TelephonyProperties;
 import com.android.settings.nfc.NfcEnabler;
-import com.android.settings.NsdEnabler;
 
-public class WirelessSettings extends SettingsPreferenceFragment {
+import java.util.Collection;
+
+public class WirelessSettings extends RestrictedSettingsFragment
+        implements OnPreferenceChangeListener {
+    private static final String TAG = "WirelessSettings";
 
     private static final String KEY_TOGGLE_AIRPLANE = "toggle_airplane";
     private static final String KEY_TOGGLE_NFC = "toggle_nfc";
@@ -49,6 +64,8 @@
     private static final String KEY_TETHER_SETTINGS = "tether_settings";
     private static final String KEY_PROXY_SETTINGS = "proxy_settings";
     private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
+    private static final String KEY_MANAGE_MOBILE_PLAN = "manage_mobile_plan";
+    private static final String KEY_SMS_APPLICATION = "sms_application";
     private static final String KEY_TOGGLE_NSD = "toggle_nsd"; //network service discovery
     private static final String KEY_CELL_BROADCAST_SETTINGS = "cell_broadcast_settings";
 
@@ -61,6 +78,17 @@
     private NfcAdapter mNfcAdapter;
     private NsdEnabler mNsdEnabler;
 
+    private ConnectivityManager mCm;
+    private TelephonyManager mTm;
+
+    private static final int MANAGE_MOBILE_PLAN_DIALOG_ID = 1;
+    private static final String SAVED_MANAGE_MOBILE_PLAN_MSG = "mManageMobilePlanMessage";
+
+    private SmsListPreference mSmsApplicationPreference;
+
+    public WirelessSettings() {
+        super(null);
+    }
     /**
      * Invoked on each preference click in this hierarchy, overrides
      * PreferenceActivity's implementation.  Used to make sure we track the
@@ -68,6 +96,10 @@
      */
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        if (ensurePinRestrictedPreference(preference)) {
+            return true;
+        }
+        log("onPreferenceTreeClick: preference=" + preference);
         if (preference == mAirplaneModePreference && Boolean.parseBoolean(
                 SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) {
             // In ECM mode launch ECM app dialog
@@ -75,27 +107,164 @@
                 new Intent(TelephonyIntents.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS, null),
                 REQUEST_CODE_EXIT_ECM);
             return true;
+        } else if (preference == findPreference(KEY_MANAGE_MOBILE_PLAN)) {
+            onManageMobilePlanClick();
         }
         // Let the intents be launched by the Preference manager
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
+    private String mManageMobilePlanMessage;
+    private static final String CONNECTED_TO_PROVISIONING_NETWORK_ACTION
+            = "com.android.server.connectivityservice.CONNECTED_TO_PROVISIONING_NETWORK_ACTION";
+    public void onManageMobilePlanClick() {
+        log("onManageMobilePlanClick:");
+        mManageMobilePlanMessage = null;
+        Resources resources = getActivity().getResources();
+
+        NetworkInfo ni = mCm.getProvisioningOrActiveNetworkInfo();
+        if (mTm.hasIccCard() && (ni != null)) {
+            // Get provisioning URL
+            String url = mCm.getMobileProvisioningUrl();
+            if (!TextUtils.isEmpty(url)) {
+                Intent intent = new Intent(CONNECTED_TO_PROVISIONING_NETWORK_ACTION);
+                intent.putExtra("EXTRA_URL", url);
+                Context context = getActivity().getBaseContext();
+                context.sendBroadcast(intent);
+                mManageMobilePlanMessage = null;
+            } else {
+                // No provisioning URL
+                String operatorName = mTm.getSimOperatorName();
+                if (TextUtils.isEmpty(operatorName)) {
+                    // Use NetworkOperatorName as second choice in case there is no
+                    // SPN (Service Provider Name on the SIM). Such as with T-mobile.
+                    operatorName = mTm.getNetworkOperatorName();
+                    if (TextUtils.isEmpty(operatorName)) {
+                        mManageMobilePlanMessage = resources.getString(
+                                R.string.mobile_unknown_sim_operator);
+                    } else {
+                        mManageMobilePlanMessage = resources.getString(
+                                R.string.mobile_no_provisioning_url, operatorName);
+                    }
+                } else {
+                    mManageMobilePlanMessage = resources.getString(
+                            R.string.mobile_no_provisioning_url, operatorName);
+                }
+            }
+        } else if (mTm.hasIccCard() == false) {
+            // No sim card
+            mManageMobilePlanMessage = resources.getString(R.string.mobile_insert_sim_card);
+        } else {
+            // NetworkInfo is null, there is no connection
+            mManageMobilePlanMessage = resources.getString(R.string.mobile_connect_to_internet);
+        }
+        if (!TextUtils.isEmpty(mManageMobilePlanMessage)) {
+            log("onManageMobilePlanClick: message=" + mManageMobilePlanMessage);
+            showDialog(MANAGE_MOBILE_PLAN_DIALOG_ID);
+        }
+    }
+
+    private void updateSmsApplicationSetting() {
+        log("updateSmsApplicationSetting:");
+        ComponentName appName = SmsApplication.getDefaultSmsApplication(getActivity(), true);
+        if (appName != null) {
+            String packageName = appName.getPackageName();
+
+            CharSequence[] values = mSmsApplicationPreference.getEntryValues();
+            for (int i = 0; i < values.length; i++) {
+                if (packageName.contentEquals(values[i])) {
+                    mSmsApplicationPreference.setValueIndex(i);
+                    mSmsApplicationPreference.setSummary(mSmsApplicationPreference.getEntries()[i]);
+                    break;
+                }
+            }
+        }
+    }
+
+    private void initSmsApplicationSetting() {
+        log("initSmsApplicationSetting:");
+        Collection<SmsApplicationData> smsApplications =
+                SmsApplication.getApplicationCollection(getActivity());
+
+        // If the list is empty the dialog will be empty, but we will not crash.
+        int count = smsApplications.size();
+        CharSequence[] entries = new CharSequence[count];
+        CharSequence[] entryValues = new CharSequence[count];
+        Drawable[] entryImages = new Drawable[count];
+
+        PackageManager packageManager = getPackageManager();
+        int i = 0;
+        for (SmsApplicationData smsApplicationData : smsApplications) {
+            entries[i] = smsApplicationData.mApplicationName;
+            entryValues[i] = smsApplicationData.mPackageName;
+            try {
+                entryImages[i] = packageManager.getApplicationIcon(smsApplicationData.mPackageName);
+            } catch (NameNotFoundException e) {
+                entryImages[i] = packageManager.getDefaultActivityIcon();
+            }
+            i++;
+        }
+        mSmsApplicationPreference.setEntries(entries);
+        mSmsApplicationPreference.setEntryValues(entryValues);
+        mSmsApplicationPreference.setEntryDrawables(entryImages);
+        updateSmsApplicationSetting();
+    }
+
+    @Override
+    public Dialog onCreateDialog(int dialogId) {
+        log("onCreateDialog: dialogId=" + dialogId);
+        switch (dialogId) {
+            case MANAGE_MOBILE_PLAN_DIALOG_ID:
+                return new AlertDialog.Builder(getActivity())
+                            .setMessage(mManageMobilePlanMessage)
+                            .setCancelable(false)
+                            .setPositiveButton(com.android.internal.R.string.ok,
+                                    new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int id) {
+                                    log("MANAGE_MOBILE_PLAN_DIALOG.onClickListener id=" + id);
+                                    mManageMobilePlanMessage = null;
+                                }
+                            })
+                            .create();
+        }
+        return super.onCreateDialog(dialogId);
+    }
+
+    private void log(String s) {
+        Log.d(TAG, s);
+    }
+
     public static boolean isRadioAllowed(Context context, String type) {
         if (!AirplaneModeEnabler.isAirplaneModeOn(context)) {
             return true;
         }
         // Here we use the same logic in onCreate().
-        String toggleable = Settings.System.getString(context.getContentResolver(),
-                Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
+        String toggleable = Settings.Global.getString(context.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
         return toggleable != null && toggleable.contains(type);
     }
 
+    private boolean isSmsSupported() {
+        // Some tablet has sim card but could not do telephony operations. Skip those.
+        return (mTm.getPhoneType() != TelephonyManager.PHONE_TYPE_NONE);
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (savedInstanceState != null) {
+            mManageMobilePlanMessage = savedInstanceState.getString(SAVED_MANAGE_MOBILE_PLAN_MSG);
+        }
+        log("onCreate: mManageMobilePlanMessage=" + mManageMobilePlanMessage);
+
+        mCm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+        mTm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
 
         addPreferencesFromResource(R.xml.wireless_settings);
 
+        final boolean isSecondaryUser = UserHandle.myUserId() != UserHandle.USER_OWNER;
+
         final Activity activity = getActivity();
         mAirplaneModePreference = (CheckBoxPreference) findPreference(KEY_TOGGLE_AIRPLANE);
         CheckBoxPreference nfc = (CheckBoxPreference) findPreference(KEY_TOGGLE_NFC);
@@ -105,39 +274,48 @@
         mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
         mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam);
 
+        mSmsApplicationPreference = (SmsListPreference) findPreference(KEY_SMS_APPLICATION);
+        mSmsApplicationPreference.setOnPreferenceChangeListener(this);
+        initSmsApplicationSetting();
+
         // Remove NSD checkbox by default
         getPreferenceScreen().removePreference(nsd);
         //mNsdEnabler = new NsdEnabler(activity, nsd);
 
-        String toggleable = Settings.System.getString(activity.getContentResolver(),
-                Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
+        String toggleable = Settings.Global.getString(activity.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
 
         //enable/disable wimax depending on the value in config.xml
-        boolean isWimaxEnabled = this.getResources().getBoolean(
+        boolean isWimaxEnabled = !isSecondaryUser && this.getResources().getBoolean(
                 com.android.internal.R.bool.config_wimaxEnabled);
         if (!isWimaxEnabled) {
             PreferenceScreen root = getPreferenceScreen();
             Preference ps = (Preference) findPreference(KEY_WIMAX_SETTINGS);
             if (ps != null) root.removePreference(ps);
         } else {
-            if (toggleable == null || !toggleable.contains(Settings.System.RADIO_WIMAX )
+            if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_WIMAX )
                     && isWimaxEnabled) {
                 Preference ps = (Preference) findPreference(KEY_WIMAX_SETTINGS);
                 ps.setDependency(KEY_TOGGLE_AIRPLANE);
             }
         }
+        protectByRestrictions(KEY_WIMAX_SETTINGS);
+
         // Manually set dependencies for Wifi when not toggleable.
-        if (toggleable == null || !toggleable.contains(Settings.System.RADIO_WIFI)) {
+        if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_WIFI)) {
             findPreference(KEY_VPN_SETTINGS).setDependency(KEY_TOGGLE_AIRPLANE);
         }
-
+        if (isSecondaryUser) { // Disable VPN
+            removePreference(KEY_VPN_SETTINGS);
+        }
+        protectByRestrictions(KEY_VPN_SETTINGS);
         // Manually set dependencies for Bluetooth when not toggleable.
-        if (toggleable == null || !toggleable.contains(Settings.System.RADIO_BLUETOOTH)) {
+        if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_BLUETOOTH)) {
             // No bluetooth-dependent items in the list. Code kept in case one is added later.
         }
 
         // Manually set dependencies for NFC when not toggleable.
-        if (toggleable == null || !toggleable.contains(Settings.System.RADIO_NFC)) {
+        if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_NFC)) {
             findPreference(KEY_TOGGLE_NFC).setDependency(KEY_TOGGLE_AIRPLANE);
             findPreference(KEY_ANDROID_BEAM_SETTINGS).setDependency(KEY_TOGGLE_AIRPLANE);
         }
@@ -150,9 +328,22 @@
             mNfcEnabler = null;
         }
 
-        // Remove Mobile Network Settings if it's a wifi-only device.
-        if (Utils.isWifiOnly(getActivity())) {
-            getPreferenceScreen().removePreference(findPreference(KEY_MOBILE_NETWORK_SETTINGS));
+        // Remove Mobile Network Settings and Manage Mobile Plan if it's a wifi-only device.
+        if (isSecondaryUser || Utils.isWifiOnly(getActivity())) {
+            removePreference(KEY_MOBILE_NETWORK_SETTINGS);
+            removePreference(KEY_MANAGE_MOBILE_PLAN);
+        }
+        protectByRestrictions(KEY_MOBILE_NETWORK_SETTINGS);
+        protectByRestrictions(KEY_MANAGE_MOBILE_PLAN);
+
+        // Remove SMS Application if the device does not support SMS
+        if (!isSmsSupported()) {
+            removePreference(KEY_SMS_APPLICATION);
+        }
+
+        // Remove Airplane Mode settings if it's a stationary device such as a TV.
+        if (getActivity().getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {
+            removePreference(KEY_TOGGLE_AIRPLANE);
         }
 
         // Enable Proxy selector settings if allowed.
@@ -166,12 +357,13 @@
         // Disable Tethering if it's not allowed or if it's a wifi-only device
         ConnectivityManager cm =
                 (ConnectivityManager) activity.getSystemService(Context.CONNECTIVITY_SERVICE);
-        if (!cm.isTetheringSupported()) {
+        if (isSecondaryUser || !cm.isTetheringSupported()) {
             getPreferenceScreen().removePreference(findPreference(KEY_TETHER_SETTINGS));
         } else {
             Preference p = findPreference(KEY_TETHER_SETTINGS);
             p.setTitle(Utils.getTetheringLabel(cm));
         }
+        protectByRestrictions(KEY_TETHER_SETTINGS);
 
         // Enable link to CMAS app settings depending on the value in config.xml.
         boolean isCellBroadcastAppLinkEnabled = this.getResources().getBoolean(
@@ -187,11 +379,19 @@
         } catch (IllegalArgumentException ignored) {
             isCellBroadcastAppLinkEnabled = false;  // CMAS app not installed
         }
-        if (!isCellBroadcastAppLinkEnabled) {
+        if (isSecondaryUser || !isCellBroadcastAppLinkEnabled) {
             PreferenceScreen root = getPreferenceScreen();
             Preference ps = findPreference(KEY_CELL_BROADCAST_SETTINGS);
             if (ps != null) root.removePreference(ps);
         }
+        protectByRestrictions(KEY_CELL_BROADCAST_SETTINGS);
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        initSmsApplicationSetting();
     }
 
     @Override
@@ -208,6 +408,15 @@
     }
 
     @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        if (!TextUtils.isEmpty(mManageMobilePlanMessage)) {
+            outState.putString(SAVED_MANAGE_MOBILE_PLAN_MSG, mManageMobilePlanMessage);
+        }
+    }
+
+    @Override
     public void onPause() {
         super.onPause();
 
@@ -228,10 +437,21 @@
             mAirplaneModeEnabler.setAirplaneModeInECM(isChoiceYes,
                     mAirplaneModePreference.isChecked());
         }
+        super.onActivityResult(requestCode, resultCode, data);
     }
 
     @Override
     protected int getHelpResource() {
         return R.string.help_url_more_networks;
     }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (preference == mSmsApplicationPreference && newValue != null) {
+            SmsApplication.setDefaultApplication(newValue.toString(), getActivity());
+            updateSmsApplicationSetting();
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/src/com/android/settings/ZonePicker.java b/src/com/android/settings/ZonePicker.java
index 652f3b7..0a9173f 100644
--- a/src/com/android/settings/ZonePicker.java
+++ b/src/com/android/settings/ZonePicker.java
@@ -23,28 +23,36 @@
 import android.content.res.XmlResourceParser;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ListView;
 import android.widget.SimpleAdapter;
 
 import org.xmlpull.v1.XmlPullParserException;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
+import libcore.icu.ICU;
+import libcore.icu.TimeZoneNames;
 
 /**
  * The class displaying a list of time zones that match a filter string
  * such as "Africa", "Europe", etc. Choosing an item from the list will set
- * the time zone. Pressing Back without choosing from the list will not 
+ * the time zone. Pressing Back without choosing from the list will not
  * result in a change in the time zone setting.
  */
 public class ZonePicker extends ListFragment {
@@ -81,7 +89,7 @@
     public static SimpleAdapter constructTimezoneAdapter(Context context,
             boolean sortedByName) {
         return constructTimezoneAdapter(context, sortedByName,
-                android.R.layout.simple_list_item_2);
+                R.layout.date_time_setup_custom_list_item_2);
     }
 
     /**
@@ -96,7 +104,8 @@
 
         final String sortKey = (sortedByName ? KEY_DISPLAYNAME : KEY_OFFSET);
         final MyComparator comparator = new MyComparator(sortKey);
-        final List<HashMap<String, Object>> sortedList = getZones(context);
+        ZoneGetter zoneGetter = new ZoneGetter();
+        final List<HashMap<String, Object>> sortedList = zoneGetter.getZones(context);
         Collections.sort(sortedList, comparator);
         final SimpleAdapter adapter = new SimpleAdapter(context,
                 sortedList,
@@ -142,8 +151,8 @@
     }
 
     @Override
-    public void onActivityCreated(Bundle savedInstanseState) {
-        super.onActivityCreated(savedInstanseState);
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
 
         final Activity activity = getActivity();
         mTimezoneSortedAdapter = constructTimezoneAdapter(activity, false);
@@ -155,6 +164,15 @@
     }
 
     @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        final View view = super.onCreateView(inflater, container, savedInstanceState);
+        final ListView list = (ListView) view.findViewById(android.R.id.list);
+        Utils.forcePrepareCustomPreferencesList(container, view, list, false);
+        return view;
+    }
+
+    @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         menu.add(0, MENU_ALPHABETICAL, 0, R.string.zone_list_menu_sort_alphabetically)
             .setIcon(android.R.drawable.ic_menu_sort_alphabetically);
@@ -206,77 +224,80 @@
         }
     }
 
-    private static List<HashMap<String, Object>> getZones(Context context) {
-        final List<HashMap<String, Object>> myData = new ArrayList<HashMap<String, Object>>();
-        final long date = Calendar.getInstance().getTimeInMillis();
-        try {
-            XmlResourceParser xrp = context.getResources().getXml(R.xml.timezones);
-            while (xrp.next() != XmlResourceParser.START_TAG)
-                continue;
-            xrp.next();
-            while (xrp.getEventType() != XmlResourceParser.END_TAG) {
-                while (xrp.getEventType() != XmlResourceParser.START_TAG) {
-                    if (xrp.getEventType() == XmlResourceParser.END_DOCUMENT) {
-                        return myData;
+    static class ZoneGetter {
+        private final List<HashMap<String, Object>> mZones =
+                new ArrayList<HashMap<String, Object>>();
+        private final HashSet<String> mLocalZones = new HashSet<String>();
+        private final Date mNow = Calendar.getInstance().getTime();
+        private final SimpleDateFormat mZoneNameFormatter = new SimpleDateFormat("zzzz");
+
+        private List<HashMap<String, Object>> getZones(Context context) {
+            for (String olsonId : TimeZoneNames.forLocale(Locale.getDefault())) {
+                mLocalZones.add(olsonId);
+            }
+            try {
+                XmlResourceParser xrp = context.getResources().getXml(R.xml.timezones);
+                while (xrp.next() != XmlResourceParser.START_TAG) {
+                    continue;
+                }
+                xrp.next();
+                while (xrp.getEventType() != XmlResourceParser.END_TAG) {
+                    while (xrp.getEventType() != XmlResourceParser.START_TAG) {
+                        if (xrp.getEventType() == XmlResourceParser.END_DOCUMENT) {
+                            return mZones;
+                        }
+                        xrp.next();
+                    }
+                    if (xrp.getName().equals(XMLTAG_TIMEZONE)) {
+                        String olsonId = xrp.getAttributeValue(0);
+                        addTimeZone(olsonId);
+                    }
+                    while (xrp.getEventType() != XmlResourceParser.END_TAG) {
+                        xrp.next();
                     }
                     xrp.next();
                 }
-                if (xrp.getName().equals(XMLTAG_TIMEZONE)) {
-                    String id = xrp.getAttributeValue(0);
-                    String displayName = xrp.nextText();
-                    addItem(myData, id, displayName, date);
-                }
-                while (xrp.getEventType() != XmlResourceParser.END_TAG) {
-                    xrp.next();
-                }
-                xrp.next();
+                xrp.close();
+            } catch (XmlPullParserException xppe) {
+                Log.e(TAG, "Ill-formatted timezones.xml file");
+            } catch (java.io.IOException ioe) {
+                Log.e(TAG, "Unable to read timezones.xml file");
             }
-            xrp.close();
-        } catch (XmlPullParserException xppe) {
-            Log.e(TAG, "Ill-formatted timezones.xml file");
-        } catch (java.io.IOException ioe) {
-            Log.e(TAG, "Unable to read timezones.xml file");
+            return mZones;
         }
 
-        return myData;
-    }
+        private void addTimeZone(String olsonId) {
+            // We always need the "GMT-07:00" string.
+            final TimeZone tz = TimeZone.getTimeZone(olsonId);
 
-    private static void addItem(
-            List<HashMap<String, Object>> myData, String id, String displayName, long date) {
-        final HashMap<String, Object> map = new HashMap<String, Object>();
-        map.put(KEY_ID, id);
-        map.put(KEY_DISPLAYNAME, displayName);
-        final TimeZone tz = TimeZone.getTimeZone(id);
-        final int offset = tz.getOffset(date);
-        final int p = Math.abs(offset);
-        final StringBuilder name = new StringBuilder();
-        name.append("GMT");
+            // For the display name, we treat time zones within the country differently
+            // from other countries' time zones. So in en_US you'd get "Pacific Daylight Time"
+            // but in de_DE you'd get "Los Angeles" for the same time zone.
+            String displayName;
+            if (mLocalZones.contains(olsonId)) {
+                // Within a country, we just use the local name for the time zone.
+                mZoneNameFormatter.setTimeZone(tz);
+                displayName = mZoneNameFormatter.format(mNow);
+            } else {
+                // For other countries' time zones, we use the exemplar location.
+                final String localeName = Locale.getDefault().toString();
+                displayName = TimeZoneNames.getExemplarLocation(localeName, olsonId);
+            }
 
-        if (offset < 0) {
-            name.append('-');
-        } else {
-            name.append('+');
+            final HashMap<String, Object> map = new HashMap<String, Object>();
+            map.put(KEY_ID, olsonId);
+            map.put(KEY_DISPLAYNAME, displayName);
+            map.put(KEY_GMT, DateTimeSettings.getTimeZoneText(tz, false));
+            map.put(KEY_OFFSET, tz.getOffset(mNow.getTime()));
+
+            mZones.add(map);
         }
-
-        name.append(p / (HOURS_1));
-        name.append(':');
-
-        int min = p / 60000;
-        min %= 60;
-
-        if (min < 10) {
-            name.append('0');
-        }
-        name.append(min);
-
-        map.put(KEY_GMT, name.toString());
-        map.put(KEY_OFFSET, offset);
-
-        myData.add(map);
     }
 
     @Override
     public void onListItemClick(ListView listView, View v, int position, long id) {
+        // Ignore extra clicks
+        if (!isResumed()) return;
         final Map<?, ?> map = (Map<?, ?>)listView.getItemAtPosition(position);
         final String tzId = (String) map.get(KEY_ID);
 
@@ -321,7 +342,7 @@
         }
 
         private boolean isComparable(Object value) {
-            return (value != null) && (value instanceof Comparable); 
+            return (value != null) && (value instanceof Comparable);
         }
     }
 }
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
new file mode 100644
index 0000000..4d24d09
--- /dev/null
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -0,0 +1,647 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.app.ActivityManagerNative;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.content.res.Configuration;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.RemoteException;
+import android.os.SystemProperties;
+import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.text.TextUtils.SimpleStringSplitter;
+import android.util.Log;
+import android.view.KeyCharacterMap;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.accessibility.AccessibilityManager;
+import android.widget.TextView;
+
+import com.android.internal.content.PackageMonitor;
+import com.android.internal.view.RotationPolicy;
+import com.android.internal.view.RotationPolicy.RotationPolicyListener;
+import com.android.settings.DialogCreatable;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Activity with the accessibility settings.
+ */
+public class AccessibilitySettings extends SettingsPreferenceFragment implements DialogCreatable,
+        Preference.OnPreferenceChangeListener {
+    private static final String LOG_TAG = "AccessibilitySettings";
+
+    private static final String DEFAULT_SCREENREADER_MARKET_LINK =
+            "market://search?q=pname:com.google.android.marvin.talkback";
+
+    private static final float LARGE_FONT_SCALE = 1.3f;
+
+    private static final String SYSTEM_PROPERTY_MARKET_URL = "ro.screenreader.market";
+
+    static final char ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR = ':';
+
+    private static final String KEY_INSTALL_ACCESSIBILITY_SERVICE_OFFERED_ONCE =
+            "key_install_accessibility_service_offered_once";
+
+    // Preference categories
+    private static final String SERVICES_CATEGORY = "services_category";
+    private static final String SYSTEM_CATEGORY = "system_category";
+
+    // Preferences
+    private static final String TOGGLE_LARGE_TEXT_PREFERENCE =
+            "toggle_large_text_preference";
+    private static final String TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE =
+            "toggle_power_button_ends_call_preference";
+    private static final String TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE =
+            "toggle_lock_screen_rotation_preference";
+    private static final String TOGGLE_SPEAK_PASSWORD_PREFERENCE =
+            "toggle_speak_password_preference";
+    private static final String SELECT_LONG_PRESS_TIMEOUT_PREFERENCE =
+            "select_long_press_timeout_preference";
+    private static final String ENABLE_ACCESSIBILITY_GESTURE_PREFERENCE_SCREEN =
+            "enable_global_gesture_preference_screen";
+    private static final String CAPTIONING_PREFERENCE_SCREEN =
+            "captioning_preference_screen";
+    private static final String DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN =
+            "screen_magnification_preference_screen";
+
+    // Extras passed to sub-fragments.
+    static final String EXTRA_PREFERENCE_KEY = "preference_key";
+    static final String EXTRA_CHECKED = "checked";
+    static final String EXTRA_TITLE = "title";
+    static final String EXTRA_SUMMARY = "summary";
+    static final String EXTRA_SETTINGS_TITLE = "settings_title";
+    static final String EXTRA_COMPONENT_NAME = "component_name";
+    static final String EXTRA_SETTINGS_COMPONENT_NAME = "settings_component_name";
+
+    // Timeout before we update the services if packages are added/removed
+    // since the AccessibilityManagerService has to do that processing first
+    // to generate the AccessibilityServiceInfo we need for proper
+    // presentation.
+    private static final long DELAY_UPDATE_SERVICES_MILLIS = 1000;
+
+    // Dialog IDs.
+    private static final int DIALOG_ID_NO_ACCESSIBILITY_SERVICES = 1;
+
+    // Auxiliary members.
+    final static SimpleStringSplitter sStringColonSplitter =
+            new SimpleStringSplitter(ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR);
+
+    static final Set<ComponentName> sInstalledServices = new HashSet<ComponentName>();
+
+    private final Map<String, String> mLongPressTimeoutValuetoTitleMap =
+            new HashMap<String, String>();
+
+    private final Configuration mCurConfig = new Configuration();
+
+    private final Handler mHandler = new Handler();
+
+    private final Runnable mUpdateRunnable = new Runnable() {
+        @Override
+        public void run() {
+            loadInstalledServices();
+            updateServicesPreferences();
+        }
+    };
+
+    private final PackageMonitor mSettingsPackageMonitor = new PackageMonitor() {
+        @Override
+        public void onPackageAdded(String packageName, int uid) {
+            sendUpdate();
+        }
+
+        @Override
+        public void onPackageAppeared(String packageName, int reason) {
+            sendUpdate();
+        }
+
+        @Override
+        public void onPackageDisappeared(String packageName, int reason) {
+            sendUpdate();
+        }
+
+        @Override
+        public void onPackageRemoved(String packageName, int uid) {
+            sendUpdate();
+        }
+
+        private void sendUpdate() {
+            mHandler.postDelayed(mUpdateRunnable, DELAY_UPDATE_SERVICES_MILLIS);
+        }
+    };
+
+    private final SettingsContentObserver mSettingsContentObserver =
+            new SettingsContentObserver(mHandler) {
+                @Override
+                public void onChange(boolean selfChange, Uri uri) {
+                    loadInstalledServices();
+                    updateServicesPreferences();
+                }
+            };
+
+    private final RotationPolicyListener mRotationPolicyListener = new RotationPolicyListener() {
+        @Override
+        public void onChange() {
+            updateLockScreenRotationCheckbox();
+        }
+    };
+
+    // Preference controls.
+    private PreferenceCategory mServicesCategory;
+    private PreferenceCategory mSystemsCategory;
+
+    private CheckBoxPreference mToggleLargeTextPreference;
+    private CheckBoxPreference mTogglePowerButtonEndsCallPreference;
+    private CheckBoxPreference mToggleLockScreenRotationPreference;
+    private CheckBoxPreference mToggleSpeakPasswordPreference;
+    private ListPreference mSelectLongPressTimeoutPreference;
+    private Preference mNoServicesMessagePreference;
+    private PreferenceScreen mCaptioningPreferenceScreen;
+    private PreferenceScreen mDisplayMagnificationPreferenceScreen;
+    private PreferenceScreen mGlobalGesturePreferenceScreen;
+
+    private int mLongPressTimeoutDefault;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        addPreferencesFromResource(R.xml.accessibility_settings);
+        initializeAllPreferences();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        loadInstalledServices();
+        updateAllPreferences();
+
+        offerInstallAccessibilitySerivceOnce();
+
+        mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
+        mSettingsContentObserver.register(getContentResolver());
+        if (RotationPolicy.isRotationSupported(getActivity())) {
+            RotationPolicy.registerRotationPolicyListener(getActivity(),
+                    mRotationPolicyListener);
+        }
+    }
+
+    @Override
+    public void onPause() {
+        mSettingsPackageMonitor.unregister();
+        mSettingsContentObserver.unregister(getContentResolver());
+        if (RotationPolicy.isRotationSupported(getActivity())) {
+            RotationPolicy.unregisterRotationPolicyListener(getActivity(),
+                    mRotationPolicyListener);
+        }
+        super.onPause();
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (preference == mSelectLongPressTimeoutPreference) {
+            String stringValue = (String) newValue;
+            Settings.Secure.putInt(getContentResolver(),
+                    Settings.Secure.LONG_PRESS_TIMEOUT, Integer.parseInt(stringValue));
+            mSelectLongPressTimeoutPreference.setSummary(
+                    mLongPressTimeoutValuetoTitleMap.get(stringValue));
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        if (mToggleLargeTextPreference == preference) {
+            handleToggleLargeTextPreferenceClick();
+            return true;
+        } else if (mTogglePowerButtonEndsCallPreference == preference) {
+            handleTogglePowerButtonEndsCallPreferenceClick();
+            return true;
+        } else if (mToggleLockScreenRotationPreference == preference) {
+            handleLockScreenRotationPreferenceClick();
+            return true;
+        } else if (mToggleSpeakPasswordPreference == preference) {
+            handleToggleSpeakPasswordPreferenceClick();
+            return true;
+        } else if (mGlobalGesturePreferenceScreen == preference) {
+            handleTogglEnableAccessibilityGesturePreferenceClick();
+            return true;
+        } else if (mDisplayMagnificationPreferenceScreen == preference) {
+            handleDisplayMagnificationPreferenceScreenClick();
+            return true;
+        }
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    }
+
+    private void handleToggleLargeTextPreferenceClick() {
+        try {
+            mCurConfig.fontScale = mToggleLargeTextPreference.isChecked() ? LARGE_FONT_SCALE : 1;
+            ActivityManagerNative.getDefault().updatePersistentConfiguration(mCurConfig);
+        } catch (RemoteException re) {
+            /* ignore */
+        }
+    }
+
+    private void handleTogglePowerButtonEndsCallPreferenceClick() {
+        Settings.Secure.putInt(getContentResolver(),
+                Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
+                (mTogglePowerButtonEndsCallPreference.isChecked()
+                        ? Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP
+                        : Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF));
+    }
+
+    private void handleLockScreenRotationPreferenceClick() {
+        RotationPolicy.setRotationLockForAccessibility(getActivity(),
+                !mToggleLockScreenRotationPreference.isChecked());
+    }
+
+    private void handleToggleSpeakPasswordPreferenceClick() {
+        Settings.Secure.putInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD,
+                mToggleSpeakPasswordPreference.isChecked() ? 1 : 0);
+    }
+
+    private void handleTogglEnableAccessibilityGesturePreferenceClick() {
+        Bundle extras = mGlobalGesturePreferenceScreen.getExtras();
+        extras.putString(EXTRA_TITLE, getString(
+                R.string.accessibility_global_gesture_preference_title));
+        extras.putString(EXTRA_SUMMARY, getString(
+                R.string.accessibility_global_gesture_preference_description));
+        extras.putBoolean(EXTRA_CHECKED, Settings.Global.getInt(getContentResolver(),
+                Settings.Global.ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED, 0) == 1);
+        super.onPreferenceTreeClick(mGlobalGesturePreferenceScreen,
+                mGlobalGesturePreferenceScreen);
+    }
+
+    private void handleDisplayMagnificationPreferenceScreenClick() {
+        Bundle extras = mDisplayMagnificationPreferenceScreen.getExtras();
+        extras.putString(EXTRA_TITLE, getString(
+                R.string.accessibility_screen_magnification_title));
+        extras.putCharSequence(EXTRA_SUMMARY, getActivity().getResources().getText(
+                R.string.accessibility_screen_magnification_summary));
+        extras.putBoolean(EXTRA_CHECKED, Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1);
+        super.onPreferenceTreeClick(mDisplayMagnificationPreferenceScreen,
+                mDisplayMagnificationPreferenceScreen);
+    }
+
+    private void initializeAllPreferences() {
+        mServicesCategory = (PreferenceCategory) findPreference(SERVICES_CATEGORY);
+        mSystemsCategory = (PreferenceCategory) findPreference(SYSTEM_CATEGORY);
+
+        // Large text.
+        mToggleLargeTextPreference =
+                (CheckBoxPreference) findPreference(TOGGLE_LARGE_TEXT_PREFERENCE);
+
+        // Power button ends calls.
+        mTogglePowerButtonEndsCallPreference =
+                (CheckBoxPreference) findPreference(TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE);
+        if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
+                || !Utils.isVoiceCapable(getActivity())) {
+            mSystemsCategory.removePreference(mTogglePowerButtonEndsCallPreference);
+        }
+
+        // Lock screen rotation.
+        mToggleLockScreenRotationPreference =
+                (CheckBoxPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE);
+        if (!RotationPolicy.isRotationSupported(getActivity())) {
+            mSystemsCategory.removePreference(mToggleLockScreenRotationPreference);
+        }
+
+        // Speak passwords.
+        mToggleSpeakPasswordPreference =
+                (CheckBoxPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE);
+
+        // Long press timeout.
+        mSelectLongPressTimeoutPreference =
+                (ListPreference) findPreference(SELECT_LONG_PRESS_TIMEOUT_PREFERENCE);
+        mSelectLongPressTimeoutPreference.setOnPreferenceChangeListener(this);
+        if (mLongPressTimeoutValuetoTitleMap.size() == 0) {
+            String[] timeoutValues = getResources().getStringArray(
+                    R.array.long_press_timeout_selector_values);
+            mLongPressTimeoutDefault = Integer.parseInt(timeoutValues[0]);
+            String[] timeoutTitles = getResources().getStringArray(
+                    R.array.long_press_timeout_selector_titles);
+            final int timeoutValueCount = timeoutValues.length;
+            for (int i = 0; i < timeoutValueCount; i++) {
+                mLongPressTimeoutValuetoTitleMap.put(timeoutValues[i], timeoutTitles[i]);
+            }
+        }
+
+        // Captioning.
+        mCaptioningPreferenceScreen = (PreferenceScreen) findPreference(
+                CAPTIONING_PREFERENCE_SCREEN);
+
+        // Display magnification.
+        mDisplayMagnificationPreferenceScreen = (PreferenceScreen) findPreference(
+                DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN);
+
+        // Global gesture.
+        mGlobalGesturePreferenceScreen =
+                (PreferenceScreen) findPreference(ENABLE_ACCESSIBILITY_GESTURE_PREFERENCE_SCREEN);
+        final int longPressOnPowerBehavior = getActivity().getResources().getInteger(
+                com.android.internal.R.integer.config_longPressOnPowerBehavior);
+        final int LONG_PRESS_POWER_GLOBAL_ACTIONS = 1;
+        if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
+                || longPressOnPowerBehavior != LONG_PRESS_POWER_GLOBAL_ACTIONS) {
+            // Remove accessibility shortcut if power key is not present
+            // nor long press power does not show global actions menu.
+            mSystemsCategory.removePreference(mGlobalGesturePreferenceScreen);
+        }
+    }
+
+    private void updateAllPreferences() {
+        updateServicesPreferences();
+        updateSystemPreferences();
+    }
+
+    private void updateServicesPreferences() {
+        // Since services category is auto generated we have to do a pass
+        // to generate it since services can come and go and then based on
+        // the global accessibility state to decided whether it is enabled.
+
+        // Generate.
+        mServicesCategory.removeAll();
+
+        AccessibilityManager accessibilityManager = AccessibilityManager.getInstance(getActivity());
+
+        List<AccessibilityServiceInfo> installedServices =
+                accessibilityManager.getInstalledAccessibilityServiceList();
+        Set<ComponentName> enabledServices = AccessibilityUtils.getEnabledServicesFromSettings(
+                getActivity());
+
+        final boolean accessibilityEnabled = Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_ENABLED, 0) == 1;
+
+        for (int i = 0, count = installedServices.size(); i < count; ++i) {
+            AccessibilityServiceInfo info = installedServices.get(i);
+
+            PreferenceScreen preference = getPreferenceManager().createPreferenceScreen(
+                    getActivity());
+            String title = info.getResolveInfo().loadLabel(getPackageManager()).toString();
+
+            ServiceInfo serviceInfo = info.getResolveInfo().serviceInfo;
+            ComponentName componentName = new ComponentName(serviceInfo.packageName,
+                    serviceInfo.name);
+
+            preference.setKey(componentName.flattenToString());
+
+            preference.setTitle(title);
+            final boolean serviceEnabled = accessibilityEnabled
+                    && enabledServices.contains(componentName);
+            if (serviceEnabled) {
+                preference.setSummary(getString(R.string.accessibility_feature_state_on));
+            } else {
+                preference.setSummary(getString(R.string.accessibility_feature_state_off));
+            }
+
+            preference.setOrder(i);
+            preference.setFragment(ToggleAccessibilityServicePreferenceFragment.class.getName());
+            preference.setPersistent(true);
+
+            Bundle extras = preference.getExtras();
+            extras.putString(EXTRA_PREFERENCE_KEY, preference.getKey());
+            extras.putBoolean(EXTRA_CHECKED, serviceEnabled);
+            extras.putString(EXTRA_TITLE, title);
+
+            String description = info.loadDescription(getPackageManager());
+            if (TextUtils.isEmpty(description)) {
+                description = getString(R.string.accessibility_service_default_description);
+            }
+            extras.putString(EXTRA_SUMMARY, description);
+
+            String settingsClassName = info.getSettingsActivityName();
+            if (!TextUtils.isEmpty(settingsClassName)) {
+                extras.putString(EXTRA_SETTINGS_TITLE,
+                        getString(R.string.accessibility_menu_item_settings));
+                extras.putString(EXTRA_SETTINGS_COMPONENT_NAME,
+                        new ComponentName(info.getResolveInfo().serviceInfo.packageName,
+                                settingsClassName).flattenToString());
+            }
+
+            extras.putParcelable(EXTRA_COMPONENT_NAME, componentName);
+
+            mServicesCategory.addPreference(preference);
+        }
+
+        if (mServicesCategory.getPreferenceCount() == 0) {
+            if (mNoServicesMessagePreference == null) {
+                mNoServicesMessagePreference = new Preference(getActivity()) {
+                        @Override
+                    protected void onBindView(View view) {
+                        super.onBindView(view);
+                        TextView summaryView = (TextView) view.findViewById(R.id.summary);
+                        String title = getString(R.string.accessibility_no_services_installed);
+                        summaryView.setText(title);
+                    }
+                };
+                mNoServicesMessagePreference.setPersistent(false);
+                mNoServicesMessagePreference.setLayoutResource(
+                        R.layout.text_description_preference);
+                mNoServicesMessagePreference.setSelectable(false);
+            }
+            mServicesCategory.addPreference(mNoServicesMessagePreference);
+        }
+    }
+
+    private void updateSystemPreferences() {
+        // Large text.
+        try {
+            mCurConfig.updateFrom(ActivityManagerNative.getDefault().getConfiguration());
+        } catch (RemoteException re) {
+            /* ignore */
+        }
+        mToggleLargeTextPreference.setChecked(mCurConfig.fontScale == LARGE_FONT_SCALE);
+
+        // Power button ends calls.
+        if (KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
+                && Utils.isVoiceCapable(getActivity())) {
+            final int incallPowerBehavior = Settings.Secure.getInt(getContentResolver(),
+                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
+                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT);
+            final boolean powerButtonEndsCall =
+                    (incallPowerBehavior == Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP);
+            mTogglePowerButtonEndsCallPreference.setChecked(powerButtonEndsCall);
+        }
+
+        // Auto-rotate screen
+        updateLockScreenRotationCheckbox();
+
+        // Speak passwords.
+        final boolean speakPasswordEnabled = Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0) != 0;
+        mToggleSpeakPasswordPreference.setChecked(speakPasswordEnabled);
+
+        // Long press timeout.
+        final int longPressTimeout = Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.LONG_PRESS_TIMEOUT, mLongPressTimeoutDefault);
+        String value = String.valueOf(longPressTimeout);
+        mSelectLongPressTimeoutPreference.setValue(value);
+        mSelectLongPressTimeoutPreference.setSummary(mLongPressTimeoutValuetoTitleMap.get(value));
+
+        // Captioning.
+        final boolean captioningEnabled = Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, 0) == 1;
+        if (captioningEnabled) {
+            mCaptioningPreferenceScreen.setSummary(R.string.accessibility_feature_state_on);
+        } else {
+            mCaptioningPreferenceScreen.setSummary(R.string.accessibility_feature_state_off);
+        }
+
+        // Screen magnification.
+        final boolean magnificationEnabled = Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1;
+        if (magnificationEnabled) {
+            mDisplayMagnificationPreferenceScreen.setSummary(
+                    R.string.accessibility_feature_state_on);
+        } else {
+            mDisplayMagnificationPreferenceScreen.setSummary(
+                    R.string.accessibility_feature_state_off);
+        }
+
+        // Global gesture
+        final boolean globalGestureEnabled = Settings.Global.getInt(getContentResolver(),
+                Settings.Global.ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED, 0) == 1;
+        if (globalGestureEnabled) {
+            mGlobalGesturePreferenceScreen.setSummary(
+                    R.string.accessibility_global_gesture_preference_summary_on);
+        } else {
+            mGlobalGesturePreferenceScreen.setSummary(
+                    R.string.accessibility_global_gesture_preference_summary_off);
+        }
+    }
+
+    private void updateLockScreenRotationCheckbox() {
+        Context context = getActivity();
+        if (context != null) {
+            mToggleLockScreenRotationPreference.setChecked(
+                    !RotationPolicy.isRotationLocked(context));
+        }
+    }
+
+    private void offerInstallAccessibilitySerivceOnce() {
+        // There is always one preference - if no services it is just a message.
+        if (mServicesCategory.getPreference(0) != mNoServicesMessagePreference) {
+            return;
+        }
+        SharedPreferences preferences = getActivity().getPreferences(Context.MODE_PRIVATE);
+        final boolean offerInstallService = !preferences.getBoolean(
+                KEY_INSTALL_ACCESSIBILITY_SERVICE_OFFERED_ONCE, false);
+        if (offerInstallService) {
+            String screenreaderMarketLink = SystemProperties.get(
+                    SYSTEM_PROPERTY_MARKET_URL,
+                    DEFAULT_SCREENREADER_MARKET_LINK);
+            Uri marketUri = Uri.parse(screenreaderMarketLink);
+            Intent marketIntent = new Intent(Intent.ACTION_VIEW, marketUri);
+
+            if (getPackageManager().resolveActivity(marketIntent, 0) == null) {
+                // Don't show the dialog if no market app is found/installed.
+                return;
+            }
+
+            preferences.edit().putBoolean(KEY_INSTALL_ACCESSIBILITY_SERVICE_OFFERED_ONCE,
+                    true).commit();
+            // Notify user that they do not have any accessibility
+            // services installed and direct them to Market to get TalkBack.
+            showDialog(DIALOG_ID_NO_ACCESSIBILITY_SERVICES);
+        }
+    }
+
+    @Override
+    public Dialog onCreateDialog(int dialogId) {
+        switch (dialogId) {
+            case DIALOG_ID_NO_ACCESSIBILITY_SERVICES:
+                return new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.accessibility_service_no_apps_title)
+                        .setMessage(R.string.accessibility_service_no_apps_message)
+                        .setPositiveButton(android.R.string.ok,
+                                new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        // dismiss the dialog before launching
+                                        // the activity otherwise the dialog
+                                        // removal occurs after
+                                        // onSaveInstanceState which triggers an
+                                        // exception
+                                        removeDialog(DIALOG_ID_NO_ACCESSIBILITY_SERVICES);
+                                        String screenreaderMarketLink = SystemProperties.get(
+                                                SYSTEM_PROPERTY_MARKET_URL,
+                                                DEFAULT_SCREENREADER_MARKET_LINK);
+                                        Uri marketUri = Uri.parse(screenreaderMarketLink);
+                                        Intent marketIntent = new Intent(Intent.ACTION_VIEW,
+                                                marketUri);
+                                        try {
+                                            startActivity(marketIntent);
+                                        } catch (ActivityNotFoundException anfe) {
+                                            Log.w(LOG_TAG, "Couldn't start play store activity",
+                                                    anfe);
+                                        }
+                                    }
+                                })
+                        .setNegativeButton(android.R.string.cancel, null)
+                        .create();
+            default:
+                return null;
+        }
+    }
+
+    private void loadInstalledServices() {
+        Set<ComponentName> installedServices = sInstalledServices;
+        installedServices.clear();
+
+        List<AccessibilityServiceInfo> installedServiceInfos =
+                AccessibilityManager.getInstance(getActivity())
+                        .getInstalledAccessibilityServiceList();
+        if (installedServiceInfos == null) {
+            return;
+        }
+
+        final int installedServiceInfoCount = installedServiceInfos.size();
+        for (int i = 0; i < installedServiceInfoCount; i++) {
+            ResolveInfo resolveInfo = installedServiceInfos.get(i).getResolveInfo();
+            ComponentName installedService = new ComponentName(
+                    resolveInfo.serviceInfo.packageName,
+                    resolveInfo.serviceInfo.name);
+            installedServices.add(installedService);
+        }
+    }
+}
diff --git a/src/com/android/settings/accessibility/AccessibilityUtils.java b/src/com/android/settings/accessibility/AccessibilityUtils.java
new file mode 100644
index 0000000..7282bce
--- /dev/null
+++ b/src/com/android/settings/accessibility/AccessibilityUtils.java
@@ -0,0 +1,78 @@
+/*
+ * 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.accessibility;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.provider.Settings;
+import android.text.TextUtils.SimpleStringSplitter;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+
+/**
+ * Utility methods used within accessibility settings.
+ */
+class AccessibilityUtils {
+    /**
+     * @return the set of enabled accessibility services. If there are not services
+     * it returned the unmodifiable {@link Collections#emptySet()}.
+     */
+    static Set<ComponentName> getEnabledServicesFromSettings(Context context) {
+        final String enabledServicesSetting = Settings.Secure.getString(
+                context.getContentResolver(), Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
+        if (enabledServicesSetting == null) {
+            return Collections.emptySet();
+        }
+
+        final Set<ComponentName> enabledServices = new HashSet<ComponentName>();
+        final SimpleStringSplitter colonSplitter = AccessibilitySettings.sStringColonSplitter;
+        colonSplitter.setString(enabledServicesSetting);
+
+        while (colonSplitter.hasNext()) {
+            final String componentNameString = colonSplitter.next();
+            final ComponentName enabledService = ComponentName.unflattenFromString(
+                    componentNameString);
+            if (enabledService != null) {
+                enabledServices.add(enabledService);
+            }
+        }
+
+        return enabledServices;
+    }
+
+    /**
+     * @return a localized version of the text resource specified by resId
+     */
+    static CharSequence getTextForLocale(Context context, Locale locale, int resId) {
+        final Resources res = context.getResources();
+        final Configuration config = res.getConfiguration();
+        final Locale prevLocale = config.locale;
+        try {
+            config.locale = locale;
+            res.updateConfiguration(config, null);
+            return res.getText(resId);
+        } finally {
+            config.locale = prevLocale;
+            res.updateConfiguration(config, null);
+        }
+    }
+}
diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
new file mode 100644
index 0000000..b010ca8
--- /dev/null
+++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
@@ -0,0 +1,238 @@
+/*
+ * 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.accessibility;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.provider.Settings;
+import android.view.accessibility.CaptioningManager;
+import android.view.accessibility.CaptioningManager.CaptionStyle;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
+
+/**
+ * Settings fragment containing captioning properties.
+ */
+public class CaptionPropertiesFragment extends SettingsPreferenceFragment
+        implements OnPreferenceChangeListener, OnValueChangedListener {
+    private ToggleCaptioningPreferenceFragment mParent;
+    private CaptioningManager mCaptioningManager;
+
+    // Standard options.
+    private LocalePreference mLocale;
+    private ListPreference mFontSize;
+    private PresetPreference mPreset;
+
+    // Custom options.
+    private ListPreference mTypeface;
+    private ColorPreference mForegroundColor;
+    private EdgeTypePreference mEdgeType;
+    private ColorPreference mEdgeColor;
+    private ColorPreference mBackgroundColor;
+    private ColorPreference mBackgroundOpacity;
+    private PreferenceCategory mCustom;
+
+    private boolean mShowingCustom;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mCaptioningManager = (CaptioningManager) getSystemService(Context.CAPTIONING_SERVICE);
+
+        addPreferencesFromResource(R.xml.captioning_settings);
+        initializeAllPreferences();
+        updateAllPreferences();
+        refreshShowingCustom();
+        installUpdateListeners();
+    }
+
+    /**
+     * Sets the parent fragment, which is used to update the live preview.
+     *
+     * @param parent the parent fragment
+     */
+    public void setParent(ToggleCaptioningPreferenceFragment parent) {
+        mParent = parent;
+    }
+
+    private void initializeAllPreferences() {
+        mLocale = (LocalePreference) findPreference("captioning_locale");
+        mFontSize = (ListPreference) findPreference("captioning_font_size");
+
+        final Resources res = getResources();
+        final int[] presetValues = res.getIntArray(R.array.captioning_preset_selector_values);
+        final String[] presetTitles = res.getStringArray(R.array.captioning_preset_selector_titles);
+        mPreset = (PresetPreference) findPreference("captioning_preset");
+        mPreset.setValues(presetValues);
+        mPreset.setTitles(presetTitles);
+
+        mCustom = (PreferenceCategory) findPreference("custom");
+        mShowingCustom = true;
+
+        final int[] colorValues = res.getIntArray(R.array.captioning_color_selector_values);
+        final String[] colorTitles = res.getStringArray(R.array.captioning_color_selector_titles);
+        mForegroundColor = (ColorPreference) mCustom.findPreference("captioning_foreground_color");
+        mForegroundColor.setTitles(colorTitles);
+        mForegroundColor.setValues(colorValues);
+        mEdgeColor = (ColorPreference) mCustom.findPreference("captioning_edge_color");
+        mEdgeColor.setTitles(colorTitles);
+        mEdgeColor.setValues(colorValues);
+
+        // Add "none" as an additional option for backgrounds.
+        final int[] bgColorValues = new int[colorValues.length + 1];
+        final String[] bgColorTitles = new String[colorTitles.length + 1];
+        System.arraycopy(colorValues, 0, bgColorValues, 1, colorValues.length);
+        System.arraycopy(colorTitles, 0, bgColorTitles, 1, colorTitles.length);
+        bgColorValues[0] = Color.TRANSPARENT;
+        bgColorTitles[0] = getString(R.string.color_none);
+        mBackgroundColor = (ColorPreference) mCustom.findPreference("captioning_background_color");
+        mBackgroundColor.setTitles(bgColorTitles);
+        mBackgroundColor.setValues(bgColorValues);
+
+        final int[] opacityValues = res.getIntArray(R.array.captioning_opacity_selector_values);
+        final String[] opacityTitles = res.getStringArray(
+                R.array.captioning_opacity_selector_titles);
+        mBackgroundOpacity = (ColorPreference) mCustom.findPreference(
+                "captioning_background_opacity");
+        mBackgroundOpacity.setTitles(opacityTitles);
+        mBackgroundOpacity.setValues(opacityValues);
+
+        mEdgeType = (EdgeTypePreference) mCustom.findPreference("captioning_edge_type");
+        mTypeface = (ListPreference) mCustom.findPreference("captioning_typeface");
+    }
+
+    private void installUpdateListeners() {
+        mPreset.setOnValueChangedListener(this);
+        mForegroundColor.setOnValueChangedListener(this);
+        mEdgeColor.setOnValueChangedListener(this);
+        mBackgroundColor.setOnValueChangedListener(this);
+        mBackgroundOpacity.setOnValueChangedListener(this);
+        mEdgeType.setOnValueChangedListener(this);
+
+        mTypeface.setOnPreferenceChangeListener(this);
+        mFontSize.setOnPreferenceChangeListener(this);
+        mLocale.setOnPreferenceChangeListener(this);
+    }
+
+    private void updateAllPreferences() {
+        final int preset = mCaptioningManager.getRawUserStyle();
+        mPreset.setValue(preset);
+
+        final float fontSize = mCaptioningManager.getFontScale();
+        mFontSize.setValue(Float.toString(fontSize));
+
+        final ContentResolver cr = getContentResolver();
+        final CaptionStyle attrs = CaptionStyle.getCustomStyle(cr);
+        mForegroundColor.setValue(attrs.foregroundColor);
+        mEdgeType.setValue(attrs.edgeType);
+        mEdgeColor.setValue(attrs.edgeColor);
+
+        final int backgroundColor = attrs.backgroundColor;
+        final int bgColor;
+        final int bgAlpha;
+        if (Color.alpha(backgroundColor) == 0) {
+            bgColor = Color.TRANSPARENT;
+            bgAlpha = (backgroundColor & 0xFF) << 24;
+        } else {
+            bgColor = backgroundColor | 0xFF000000;
+            bgAlpha = backgroundColor & 0xFF000000;
+        }
+        mBackgroundColor.setValue(bgColor);
+        mBackgroundOpacity.setValue(bgAlpha | 0xFFFFFF);
+
+        final String rawTypeface = attrs.mRawTypeface;
+        mTypeface.setValue(rawTypeface == null ? "" : rawTypeface);
+
+        final String rawLocale = mCaptioningManager.getRawLocale();
+        mLocale.setValue(rawLocale == null ? "" : rawLocale);
+    }
+
+    private void refreshPreviewText() {
+        if (mParent != null) {
+            mParent.refreshPreviewText();
+        }
+    }
+
+    private void refreshShowingCustom() {
+        final boolean customPreset = mPreset.getValue() == CaptionStyle.PRESET_CUSTOM;
+        if (!customPreset && mShowingCustom) {
+            getPreferenceScreen().removePreference(mCustom);
+            mShowingCustom = false;
+        } else if (customPreset && !mShowingCustom) {
+            getPreferenceScreen().addPreference(mCustom);
+            mShowingCustom = true;
+        }
+    }
+
+    @Override
+    public void onValueChanged(ListDialogPreference preference, int value) {
+        final ContentResolver cr = getActivity().getContentResolver();
+        if (mForegroundColor == preference) {
+            Settings.Secure.putInt(
+                    cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_FOREGROUND_COLOR, value);
+        } else if (mBackgroundColor == preference || mBackgroundOpacity == preference) {
+            final int bgColor = mBackgroundColor.getValue();
+            final int bgAlpha = mBackgroundOpacity.getValue();
+            final int argb;
+            if (Color.alpha(bgColor) == 0) {
+                argb = Color.alpha(bgAlpha);
+            } else {
+                argb = bgColor & 0x00FFFFFF | bgAlpha & 0xFF000000;
+            }
+            Settings.Secure.putInt(
+                    cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_BACKGROUND_COLOR, argb);
+        } else if (mEdgeColor == preference) {
+            Settings.Secure.putInt(cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_EDGE_COLOR, value);
+        } else if (mPreset == preference) {
+            Settings.Secure.putInt(cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_PRESET, value);
+            refreshShowingCustom();
+        } else if (mEdgeType == preference) {
+            Settings.Secure.putInt(cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_EDGE_TYPE, value);
+        }
+
+        refreshPreviewText();
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object value) {
+        final ContentResolver cr = getActivity().getContentResolver();
+        if (mTypeface == preference) {
+            Settings.Secure.putString(
+                    cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_TYPEFACE, (String) value);
+        } else if (mFontSize == preference) {
+            Settings.Secure.putFloat(
+                    cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_FONT_SCALE,
+                    Float.parseFloat((String) value));
+        } else if (mLocale == preference) {
+            Settings.Secure.putString(
+                    cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_LOCALE, (String) value);
+        }
+
+        refreshPreviewText();
+        return true;
+    }
+}
diff --git a/src/com/android/settings/accessibility/ColorPreference.java b/src/com/android/settings/accessibility/ColorPreference.java
new file mode 100644
index 0000000..f4a5ba7
--- /dev/null
+++ b/src/com/android/settings/accessibility/ColorPreference.java
@@ -0,0 +1,137 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.settings.R;
+
+/**
+ * Grid preference that allows the user to pick a color from a predefined set of
+ * colors. Optionally shows a preview in the preference item.
+ */
+public class ColorPreference extends ListDialogPreference {
+    private ColorDrawable mPreviewColor;
+    private boolean mPreviewEnabled;
+
+    public ColorPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        setDialogLayoutResource(R.layout.grid_picker_dialog);
+        setListItemLayoutResource(R.layout.color_picker_item);
+    }
+
+    /**
+     * @param enabled whether to show a preview in the preference item
+     */
+    public void setPreviewEnabled(boolean enabled) {
+        if (mPreviewEnabled != enabled) {
+            mPreviewEnabled = enabled;
+
+            if (enabled) {
+                setWidgetLayoutResource(R.layout.preference_color);
+            } else {
+                setWidgetLayoutResource(0);
+            }
+        }
+    }
+
+    @Override
+    public boolean shouldDisableDependents() {
+        return getValue() == Color.TRANSPARENT || super.shouldDisableDependents();
+    }
+
+    @Override
+    protected CharSequence getTitleAt(int index) {
+        final CharSequence title = super.getTitleAt(index);
+        if (title != null) {
+            return title;
+        }
+
+        // If no title was supplied, format title using RGB values.
+        final int value = getValueAt(index);
+        final int r = Color.red(value);
+        final int g = Color.green(value);
+        final int b = Color.blue(value);
+        return getContext().getString(R.string.color_custom, r, g, b);
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        if (mPreviewEnabled) {
+            final ImageView previewImage = (ImageView) view.findViewById(R.id.color_preview);
+            final int argb = getValue();
+            if (Color.alpha(argb) < 255) {
+                previewImage.setBackgroundResource(R.drawable.transparency_tileable);
+            } else {
+                previewImage.setBackground(null);
+            }
+
+            if (mPreviewColor == null) {
+                mPreviewColor = new ColorDrawable(argb);
+                previewImage.setImageDrawable(mPreviewColor);
+            } else {
+                mPreviewColor.setColor(argb);
+            }
+
+            final CharSequence summary = getSummary();
+            if (!TextUtils.isEmpty(summary)) {
+                previewImage.setContentDescription(summary);
+            } else {
+                previewImage.setContentDescription(null);
+            }
+
+            previewImage.setAlpha(isEnabled() ? 1f : 0.2f);
+        }
+    }
+
+    @Override
+    protected void onBindListItem(View view, int index) {
+        final int argb = getValueAt(index);
+        final int alpha = Color.alpha(argb);
+
+        final ImageView swatch = (ImageView) view.findViewById(R.id.color_swatch);
+        if (alpha < 255) {
+            swatch.setBackgroundResource(R.drawable.transparency_tileable);
+        } else {
+            swatch.setBackground(null);
+        }
+
+        final Drawable foreground = swatch.getDrawable();
+        if (foreground instanceof ColorDrawable) {
+            ((ColorDrawable) foreground).setColor(argb);
+        } else {
+            swatch.setImageDrawable(new ColorDrawable(argb));
+        }
+
+        final CharSequence title = getTitleAt(index);
+        if (title != null) {
+            final TextView summary = (TextView) view.findViewById(R.id.summary);
+            summary.setText(title);
+        }
+    }
+}
diff --git a/src/com/android/settings/accessibility/EdgeTypePreference.java b/src/com/android/settings/accessibility/EdgeTypePreference.java
new file mode 100644
index 0000000..ad71a76
--- /dev/null
+++ b/src/com/android/settings/accessibility/EdgeTypePreference.java
@@ -0,0 +1,72 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.accessibility.CaptioningManager.CaptionStyle;
+import android.widget.TextView;
+
+import com.android.internal.widget.SubtitleView;
+import com.android.settings.R;
+
+/**
+ * Grid preference that allows the user to pick a captioning edge type.
+ */
+public class EdgeTypePreference extends ListDialogPreference {
+    private static final int DEFAULT_FOREGROUND_COLOR = Color.WHITE;
+    private static final int DEFAULT_BACKGROUND_COLOR = Color.TRANSPARENT;
+    private static final int DEFAULT_EDGE_COLOR = Color.BLACK;
+    private static final float DEFAULT_FONT_SIZE = 96f;
+
+    public EdgeTypePreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        final Resources res = context.getResources();
+        setValues(res.getIntArray(R.array.captioning_edge_type_selector_values));
+        setTitles(res.getStringArray(R.array.captioning_edge_type_selector_titles));
+        setDialogLayoutResource(R.layout.grid_picker_dialog);
+        setListItemLayoutResource(R.layout.preset_picker_item);
+    }
+
+    @Override
+    public boolean shouldDisableDependents() {
+        return getValue() == CaptionStyle.EDGE_TYPE_NONE || super.shouldDisableDependents();
+    }
+
+    @Override
+    protected void onBindListItem(View view, int index) {
+        final SubtitleView preview = (SubtitleView) view.findViewById(R.id.preview);
+
+        preview.setForegroundColor(DEFAULT_FOREGROUND_COLOR);
+        preview.setBackgroundColor(DEFAULT_BACKGROUND_COLOR);
+        preview.setTextSize(DEFAULT_FONT_SIZE);
+
+        final int value = getValueAt(index);
+        preview.setEdgeType(value);
+        preview.setEdgeColor(DEFAULT_EDGE_COLOR);
+
+        final CharSequence title = getTitleAt(index);
+        if (title != null) {
+            final TextView summary = (TextView) view.findViewById(R.id.summary);
+            summary.setText(title);
+        }
+    }
+}
diff --git a/src/com/android/settings/accessibility/ListDialogPreference.java b/src/com/android/settings/accessibility/ListDialogPreference.java
new file mode 100644
index 0000000..a252454
--- /dev/null
+++ b/src/com/android/settings/accessibility/ListDialogPreference.java
@@ -0,0 +1,322 @@
+/*
+ * 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.accessibility;
+
+import android.app.AlertDialog.Builder;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.preference.DialogPreference;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AbsListView;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.BaseAdapter;
+
+/**
+ * Abstract dialog preference that displays a set of values and optional titles.
+ */
+public abstract class ListDialogPreference extends DialogPreference {
+    private CharSequence[] mEntryTitles;
+    private int[] mEntryValues;
+
+    private OnValueChangedListener mOnValueChangedListener;
+
+    /** The layout resource to use for grid items. */
+    private int mListItemLayout;
+
+    /** The current value of this preference. */
+    private int mValue;
+
+    /** The index within the value set of the current value. */
+    private int mValueIndex;
+
+    /** Whether the value had been set using {@link #setValue}. */
+    private boolean mValueSet;
+
+    public ListDialogPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    /**
+     * Sets a listened to invoke when the value of this preference changes.
+     *
+     * @param listener the listener to invoke
+     */
+    public void setOnValueChangedListener(OnValueChangedListener listener) {
+        mOnValueChangedListener = listener;
+    }
+
+    /**
+     * Sets the layout to use for grid items.
+     *
+     * @param layoutResId the layout to use for displaying grid items
+     */
+    public void setListItemLayoutResource(int layoutResId) {
+        mListItemLayout = layoutResId;
+    }
+
+    /**
+     * Sets the list of item values. Values must be distinct.
+     *
+     * @param values the list of item values
+     */
+    public void setValues(int[] values) {
+        mEntryValues = values;
+    }
+
+    /**
+     * Sets the list of item titles. May be null if no titles are specified, or
+     * may be shorter than the list of values to leave some titles unspecified.
+     *
+     * @param titles the list of item titles
+     */
+    public void setTitles(CharSequence[] titles) {
+        mEntryTitles = titles;
+    }
+
+    /**
+     * Populates a list item view with data for the specified index.
+     *
+     * @param view the view to populate
+     * @param index the index for which to populate the view
+     * @see #setListItemLayoutResource(int)
+     * @see #getValueAt(int)
+     * @see #getTitleAt(int)
+     */
+    protected abstract void onBindListItem(View view, int index);
+
+    /**
+     * @return the title at the specified index, or null if none specified
+     */
+    protected CharSequence getTitleAt(int index) {
+        if (mEntryTitles == null || mEntryTitles.length <= index) {
+            return null;
+        }
+
+        return mEntryTitles[index];
+    }
+
+    /**
+     * @return the value at the specified index
+     */
+    protected int getValueAt(int index) {
+        return mEntryValues[index];
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        if (mValueIndex >= 0) {
+            return getTitleAt(mValueIndex);
+        }
+
+        return null;
+    }
+
+    @Override
+    protected void onPrepareDialogBuilder(Builder builder) {
+        super.onPrepareDialogBuilder(builder);
+
+        final Context context = getContext();
+        final int dialogLayout = getDialogLayoutResource();
+        final View picker = LayoutInflater.from(context).inflate(dialogLayout, null);
+        final ListPreferenceAdapter adapter = new ListPreferenceAdapter();
+        final AbsListView list = (AbsListView) picker.findViewById(android.R.id.list);
+        list.setAdapter(adapter);
+        list.setOnItemClickListener(new OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> adapter, View v, int position, long id) {
+                if (callChangeListener((int) id)) {
+                    setValue((int) id);
+                }
+
+                final Dialog dialog = getDialog();
+                if (dialog != null) {
+                    dialog.dismiss();
+                }
+            }
+        });
+
+        // Set initial selection.
+        final int selectedPosition = getIndexForValue(mValue);
+        if (selectedPosition != AbsListView.INVALID_POSITION) {
+            list.setSelection(selectedPosition);
+        }
+
+        builder.setView(picker);
+        builder.setPositiveButton(null, null);
+    }
+
+    /**
+     * @return the index of the specified value within the list of entry values,
+     *         or {@link AbsListView#INVALID_POSITION} if not found
+     */
+    protected int getIndexForValue(int value) {
+        final int[] values = mEntryValues;
+        final int count = values.length;
+        for (int i = 0; i < count; i++) {
+            if (values[i] == value) {
+                return i;
+            }
+        }
+
+        return AbsListView.INVALID_POSITION;
+    }
+
+    /**
+     * Sets the current value. If the value exists within the set of entry
+     * values, updates the selection index.
+     *
+     * @param value the value to set
+     */
+    public void setValue(int value) {
+        final boolean changed = mValue != value;
+        if (changed || !mValueSet) {
+            mValue = value;
+            mValueIndex = getIndexForValue(value);
+            mValueSet = true;
+            persistInt(value);
+            if (changed) {
+                notifyDependencyChange(shouldDisableDependents());
+                notifyChanged();
+            }
+            if (mOnValueChangedListener != null) {
+                mOnValueChangedListener.onValueChanged(this, value);
+            }
+        }
+    }
+
+    /**
+     * @return the current value
+     */
+    public int getValue() {
+        return mValue;
+    }
+
+    @Override
+    protected Object onGetDefaultValue(TypedArray a, int index) {
+        return a.getInt(index, 0);
+    }
+
+    @Override
+    protected void onSetInitialValue(boolean restoreValue, Object defaultValue) {
+        setValue(restoreValue ? getPersistedInt(mValue) : (Integer) defaultValue);
+    }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        final Parcelable superState = super.onSaveInstanceState();
+        if (isPersistent()) {
+            // No need to save instance state since it's persistent
+            return superState;
+        }
+
+        final SavedState myState = new SavedState(superState);
+        myState.value = getValue();
+        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());
+        setValue(myState.value);
+    }
+
+    private class ListPreferenceAdapter extends BaseAdapter {
+        private LayoutInflater mInflater;
+
+        @Override
+        public int getCount() {
+            return mEntryValues.length;
+        }
+
+        @Override
+        public Integer getItem(int position) {
+            return mEntryValues[position];
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return mEntryValues[position];
+        }
+
+        @Override
+        public boolean hasStableIds() {
+            return true;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            if (convertView == null) {
+                if (mInflater == null) {
+                    mInflater = LayoutInflater.from(parent.getContext());
+                }
+                convertView = mInflater.inflate(mListItemLayout, parent, false);
+            }
+            onBindListItem(convertView, position);
+            return convertView;
+        }
+    }
+
+    private static class SavedState extends BaseSavedState {
+        public int value;
+
+        public SavedState(Parcel source) {
+            super(source);
+            value = source.readInt();
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            super.writeToParcel(dest, flags);
+            dest.writeInt(value);
+        }
+
+        public SavedState(Parcelable superState) {
+            super(superState);
+        }
+
+        @SuppressWarnings({ "hiding", "unused" })
+        public static final Creator<SavedState> CREATOR = new Creator<SavedState>() {
+            @Override
+            public SavedState createFromParcel(Parcel in) {
+                return new SavedState(in);
+            }
+
+            @Override
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+    }
+
+    public interface OnValueChangedListener {
+        public void onValueChanged(ListDialogPreference preference, int value);
+    }
+}
diff --git a/src/com/android/settings/accessibility/LocalePreference.java b/src/com/android/settings/accessibility/LocalePreference.java
new file mode 100644
index 0000000..41cb1e5
--- /dev/null
+++ b/src/com/android/settings/accessibility/LocalePreference.java
@@ -0,0 +1,150 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.preference.ListPreference;
+import android.util.AttributeSet;
+
+import com.android.settings.R;
+
+import java.text.Collator;
+import java.util.Arrays;
+import java.util.Locale;
+
+/**
+ * List preference that allows the user to pick a locale from the list of
+ * supported device locales.
+ */
+public class LocalePreference extends ListPreference {
+    public LocalePreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public LocalePreference(Context context) {
+        super(context);
+        init(context);
+    }
+
+    public void init(Context context) {
+        final String[] systemLocales = Resources.getSystem().getAssets().getLocales();
+        Arrays.sort(systemLocales);
+
+        final Resources resources = context.getResources();
+        final String[] specialLocaleCodes = resources.getStringArray(
+                com.android.internal.R.array.special_locale_codes);
+        final String[] specialLocaleNames = resources.getStringArray(
+                com.android.internal.R.array.special_locale_names);
+
+        int finalSize = 0;
+
+        final int origSize = systemLocales.length;
+        final LocaleInfo[] localeInfos = new LocaleInfo[origSize];
+        for (int i = 0; i < origSize; i++) {
+            final String localeStr = systemLocales[i];
+            final int len = localeStr.length();
+            if (len != 5) {
+                continue;
+            }
+
+            final String language = localeStr.substring(0, 2);
+            final String country = localeStr.substring(3, 5);
+            final Locale l = new Locale(language, country);
+
+            if (finalSize == 0) {
+                localeInfos[finalSize++] = new LocaleInfo(l.getDisplayLanguage(l), l);
+            } else {
+                // check previous entry:
+                // same lang and a country -> upgrade to full name and
+                // insert ours with full name
+                // diff lang -> insert ours with lang-only name
+                final LocaleInfo previous = localeInfos[finalSize - 1];
+                if (previous.locale.getLanguage().equals(language)
+                        && !previous.locale.getLanguage().equals("zz")) {
+                    previous.label = getDisplayName(
+                            localeInfos[finalSize - 1].locale, specialLocaleCodes,
+                            specialLocaleNames);
+                    localeInfos[finalSize++] = new LocaleInfo(getDisplayName(l,
+                            specialLocaleCodes, specialLocaleNames), l);
+                } else {
+                    final String displayName;
+                    if (localeStr.equals("zz_ZZ")) {
+                        displayName = "[Developer] Accented English";
+                    } else if (localeStr.equals("zz_ZY")) {
+                        displayName = "[Developer] Fake Bi-Directional";
+                    } else {
+                        displayName = l.getDisplayLanguage(l);
+                    }
+                    localeInfos[finalSize++] = new LocaleInfo(displayName, l);
+                }
+            }
+        }
+
+        final CharSequence[] entries = new CharSequence[finalSize + 1];
+        final CharSequence[] entryValues = new CharSequence[finalSize + 1];
+        Arrays.sort(localeInfos, 0, finalSize);
+
+        entries[0] = resources.getString(R.string.locale_default);
+        entryValues[0] = "";
+
+        for (int i = 0; i < finalSize; i++) {
+            final LocaleInfo info = localeInfos[i];
+            entries[i + 1] = info.toString();
+            entryValues[i + 1] = info.locale.toString();
+        }
+
+        setEntries(entries);
+        setEntryValues(entryValues);
+    }
+
+    private static String getDisplayName(
+            Locale l, String[] specialLocaleCodes, String[] specialLocaleNames) {
+        String code = l.toString();
+
+        for (int i = 0; i < specialLocaleCodes.length; i++) {
+            if (specialLocaleCodes[i].equals(code)) {
+                return specialLocaleNames[i];
+            }
+        }
+
+        return l.getDisplayName(l);
+    }
+
+    private static class LocaleInfo implements Comparable<LocaleInfo> {
+        private static final Collator sCollator = Collator.getInstance();
+
+        public String label;
+        public Locale locale;
+
+        public LocaleInfo(String label, Locale locale) {
+            this.label = label;
+            this.locale = locale;
+        }
+
+        @Override
+        public String toString() {
+            return label;
+        }
+
+        @Override
+        public int compareTo(LocaleInfo another) {
+            return sCollator.compare(this.label, another.label);
+        }
+    }
+}
diff --git a/src/com/android/settings/accessibility/PresetPreference.java b/src/com/android/settings/accessibility/PresetPreference.java
new file mode 100644
index 0000000..c091f71
--- /dev/null
+++ b/src/com/android/settings/accessibility/PresetPreference.java
@@ -0,0 +1,65 @@
+/*
+ * 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.accessibility;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.accessibility.CaptioningManager;
+import android.view.accessibility.CaptioningManager.CaptionStyle;
+import android.widget.TextView;
+
+import com.android.internal.widget.SubtitleView;
+import com.android.settings.R;
+
+public class PresetPreference extends ListDialogPreference {
+    private static final float DEFAULT_FONT_SIZE = 96f;
+
+    private final CaptioningManager mCaptioningManager;
+
+    public PresetPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        setDialogLayoutResource(R.layout.grid_picker_dialog);
+        setListItemLayoutResource(R.layout.preset_picker_item);
+
+        mCaptioningManager = (CaptioningManager) context.getSystemService(
+                Context.CAPTIONING_SERVICE);
+    }
+
+    @Override
+    public boolean shouldDisableDependents() {
+        return getValue() != CaptionStyle.PRESET_CUSTOM
+                || super.shouldDisableDependents();
+    }
+
+    @Override
+    protected void onBindListItem(View view, int index) {
+        final SubtitleView previewText = (SubtitleView) view.findViewById(R.id.preview);
+        final int value = getValueAt(index);
+        ToggleCaptioningPreferenceFragment.applyCaptionProperties(
+                mCaptioningManager, previewText, value);
+
+        previewText.setTextSize(DEFAULT_FONT_SIZE);
+
+        final CharSequence title = getTitleAt(index);
+        if (title != null) {
+            final TextView summary = (TextView) view.findViewById(R.id.summary);
+            summary.setText(title);
+        }
+    }
+}
diff --git a/src/com/android/settings/accessibility/SettingsContentObserver.java b/src/com/android/settings/accessibility/SettingsContentObserver.java
new file mode 100644
index 0000000..c3baec5
--- /dev/null
+++ b/src/com/android/settings/accessibility/SettingsContentObserver.java
@@ -0,0 +1,43 @@
+/*
+ * 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.accessibility;
+
+import android.content.ContentResolver;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.provider.Settings;
+
+abstract class SettingsContentObserver extends ContentObserver {
+    public SettingsContentObserver(Handler handler) {
+        super(handler);
+    }
+
+    public void register(ContentResolver contentResolver) {
+        contentResolver.registerContentObserver(Settings.Secure.getUriFor(
+                Settings.Secure.ACCESSIBILITY_ENABLED), false, this);
+        contentResolver.registerContentObserver(Settings.Secure.getUriFor(
+                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES), false, this);
+    }
+
+    public void unregister(ContentResolver contentResolver) {
+        contentResolver.unregisterContentObserver(this);
+    }
+
+    @Override
+    public abstract void onChange(boolean selfChange, Uri uri);
+}
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
new file mode 100644
index 0000000..0c568f0
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -0,0 +1,318 @@
+/*
+ * 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.accessibility;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.accessibility.AccessibilityManager;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class ToggleAccessibilityServicePreferenceFragment
+        extends ToggleFeaturePreferenceFragment implements DialogInterface.OnClickListener {
+
+    private static final int DIALOG_ID_ENABLE_WARNING = 1;
+    private static final int DIALOG_ID_DISABLE_WARNING = 2;
+
+    private final SettingsContentObserver mSettingsContentObserver =
+            new SettingsContentObserver(new Handler()) {
+            @Override
+                public void onChange(boolean selfChange, Uri uri) {
+                    String settingValue = Settings.Secure.getString(getContentResolver(),
+                            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
+                    final boolean enabled = settingValue.contains(mComponentName.flattenToString());
+                    mToggleSwitch.setCheckedInternal(enabled);
+                }
+            };
+
+    private ComponentName mComponentName;
+
+    private int mShownDialogId;
+
+    @Override
+    public void onResume() {
+        mSettingsContentObserver.register(getContentResolver());
+        super.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        mSettingsContentObserver.unregister(getContentResolver());
+        super.onPause();
+    }
+
+    @Override
+    public void onPreferenceToggled(String preferenceKey, boolean enabled) {
+        // Parse the enabled services.
+        Set<ComponentName> enabledServices = AccessibilityUtils.getEnabledServicesFromSettings(
+                getActivity());
+
+        if (enabledServices == (Set<?>) Collections.emptySet()) {
+            enabledServices = new HashSet<ComponentName>();
+        }
+
+        // Determine enabled services and accessibility state.
+        ComponentName toggledService = ComponentName.unflattenFromString(preferenceKey);
+        boolean accessibilityEnabled = false;
+        if (enabled) {
+            enabledServices.add(toggledService);
+            // Enabling at least one service enables accessibility.
+            accessibilityEnabled = true;
+        } else {
+            enabledServices.remove(toggledService);
+            // Check how many enabled and installed services are present.
+            Set<ComponentName> installedServices = AccessibilitySettings.sInstalledServices;
+            for (ComponentName enabledService : enabledServices) {
+                if (installedServices.contains(enabledService)) {
+                    // Disabling the last service disables accessibility.
+                    accessibilityEnabled = true;
+                    break;
+                }
+            }
+        }
+
+        // Update the enabled services setting.
+        StringBuilder enabledServicesBuilder = new StringBuilder();
+        // Keep the enabled services even if they are not installed since we
+        // have no way to know whether the application restore process has
+        // completed. In general the system should be responsible for the
+        // clean up not settings.
+        for (ComponentName enabledService : enabledServices) {
+            enabledServicesBuilder.append(enabledService.flattenToString());
+            enabledServicesBuilder.append(
+                    AccessibilitySettings.ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR);
+        }
+        final int enabledServicesBuilderLength = enabledServicesBuilder.length();
+        if (enabledServicesBuilderLength > 0) {
+            enabledServicesBuilder.deleteCharAt(enabledServicesBuilderLength - 1);
+        }
+        Settings.Secure.putString(getContentResolver(),
+                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
+                enabledServicesBuilder.toString());
+
+        // Update accessibility enabled.
+        Settings.Secure.putInt(getContentResolver(),
+                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) {
+        switch (dialogId) {
+            case DIALOG_ID_ENABLE_WARNING: {
+            mShownDialogId = DIALOG_ID_ENABLE_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;
+            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();
+        }
+        }
+    }
+
+    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
+    public void onClick(DialogInterface dialog, int which) {
+        final boolean checked;
+        switch (which) {
+            case DialogInterface.BUTTON_POSITIVE:
+                checked = (mShownDialogId == DIALOG_ID_ENABLE_WARNING);
+                mToggleSwitch.setCheckedInternal(checked);
+                getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, checked);
+                onPreferenceToggled(mPreferenceKey, checked);
+                break;
+            case DialogInterface.BUTTON_NEGATIVE:
+                checked = (mShownDialogId == DIALOG_ID_DISABLE_WARNING);
+                mToggleSwitch.setCheckedInternal(checked);
+                getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, checked);
+                onPreferenceToggled(mPreferenceKey, checked);
+                break;
+            default:
+                throw new IllegalArgumentException();
+        }
+    }
+
+    @Override
+    protected void onInstallActionBarToggleSwitch() {
+        super.onInstallActionBarToggleSwitch();
+        mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
+                @Override
+            public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
+                if (checked) {
+                    toggleSwitch.setCheckedInternal(false);
+                    getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, false);
+                    showDialog(DIALOG_ID_ENABLE_WARNING);
+                } else {
+                    toggleSwitch.setCheckedInternal(true);
+                    getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, true);
+                    showDialog(DIALOG_ID_DISABLE_WARNING);
+                }
+                return true;
+            }
+        });
+    }
+
+    @Override
+    protected void onProcessArguments(Bundle arguments) {
+        super.onProcessArguments(arguments);
+        // Settings title and intent.
+        String settingsTitle = arguments.getString(AccessibilitySettings.EXTRA_SETTINGS_TITLE);
+        String settingsComponentName = arguments.getString(
+                AccessibilitySettings.EXTRA_SETTINGS_COMPONENT_NAME);
+        if (!TextUtils.isEmpty(settingsTitle) && !TextUtils.isEmpty(settingsComponentName)) {
+            Intent settingsIntent = new Intent(Intent.ACTION_MAIN).setComponent(
+                    ComponentName.unflattenFromString(settingsComponentName.toString()));
+            if (!getPackageManager().queryIntentActivities(settingsIntent, 0).isEmpty()) {
+                mSettingsTitle = settingsTitle;
+                mSettingsIntent = settingsIntent;
+                setHasOptionsMenu(true);
+            }
+        }
+
+        mComponentName = arguments.getParcelable(AccessibilitySettings.EXTRA_COMPONENT_NAME);
+    }
+}
diff --git a/src/com/android/settings/accessibility/ToggleCaptioningPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleCaptioningPreferenceFragment.java
new file mode 100644
index 0000000..f3c8b1c
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleCaptioningPreferenceFragment.java
@@ -0,0 +1,152 @@
+/*
+ * 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.accessibility;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.os.Bundle;
+import android.preference.PreferenceFrameLayout;
+import android.provider.Settings;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.accessibility.CaptioningManager;
+
+import com.android.internal.widget.SubtitleView;
+import com.android.settings.R;
+import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener;
+
+import java.util.Locale;
+
+public class ToggleCaptioningPreferenceFragment extends Fragment {
+    private static final float DEFAULT_FONT_SIZE = 48f;
+
+    private CaptionPropertiesFragment mPropsFragment;
+    private SubtitleView mPreviewText;
+    private CaptioningManager mCaptioningManager;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mCaptioningManager = (CaptioningManager) getActivity()
+                .getSystemService(Context.CAPTIONING_SERVICE);
+    }
+
+    @Override
+    public View onCreateView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        final View rootView = inflater.inflate(R.layout.captioning_preview, container, false);
+
+        // We have to do this now because PreferenceFrameLayout looks at it
+        // only when the view is added.
+        if (container instanceof PreferenceFrameLayout) {
+            ((PreferenceFrameLayout.LayoutParams) rootView.getLayoutParams()).removeBorders = true;
+        }
+
+        return rootView;
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        mPropsFragment = ((CaptionPropertiesFragment) getFragmentManager()
+                .findFragmentById(R.id.properties_fragment));
+        mPropsFragment.setParent(this);
+
+        mPreviewText = (SubtitleView) view.findViewById(R.id.preview_text);
+
+        installActionBarToggleSwitch();
+        refreshPreviewText();
+    }
+
+    public void refreshPreviewText() {
+        final SubtitleView preview = mPreviewText;
+        if (preview != null) {
+            final Activity activity = getActivity();
+            final ContentResolver cr = activity.getContentResolver();
+            final int styleId = mCaptioningManager.getRawUserStyle();
+            applyCaptionProperties(mCaptioningManager, preview, styleId);
+
+            final Locale locale = mCaptioningManager.getLocale();
+            if (locale != null) {
+                final CharSequence localizedText = AccessibilityUtils.getTextForLocale(
+                        activity, locale, R.string.captioning_preview_text);
+                preview.setText(localizedText);
+            } else {
+                preview.setText(R.string.captioning_preview_text);
+            }
+        }
+    }
+
+    public static void applyCaptionProperties(
+            CaptioningManager manager, SubtitleView previewText, int styleId) {
+        previewText.setStyle(styleId);
+
+        final Context context = previewText.getContext();
+        final ContentResolver cr = context.getContentResolver();
+        final float fontScale = manager.getFontScale();
+        previewText.setTextSize(fontScale * DEFAULT_FONT_SIZE);
+
+        final Locale locale = manager.getLocale();
+        if (locale != null) {
+            final CharSequence localizedText = AccessibilityUtils.getTextForLocale(
+                    context, locale, R.string.captioning_preview_characters);
+            previewText.setText(localizedText);
+        } else {
+            previewText.setText(R.string.captioning_preview_characters);
+        }
+    }
+
+    private void installActionBarToggleSwitch() {
+        final Activity activity = getActivity();
+        final ToggleSwitch toggleSwitch = new ToggleSwitch(activity);
+
+        final int padding = getResources().getDimensionPixelSize(
+                R.dimen.action_bar_switch_padding);
+        toggleSwitch.setPaddingRelative(0, 0, padding, 0);
+
+        final ActionBar actionBar = activity.getActionBar();
+        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, ActionBar.DISPLAY_SHOW_CUSTOM);
+
+        final ActionBar.LayoutParams params = new ActionBar.LayoutParams(
+                ActionBar.LayoutParams.WRAP_CONTENT, ActionBar.LayoutParams.WRAP_CONTENT,
+                        Gravity.CENTER_VERTICAL | Gravity.END);
+        actionBar.setCustomView(toggleSwitch, params);
+
+        final boolean enabled = mCaptioningManager.isEnabled();
+        mPropsFragment.getPreferenceScreen().setEnabled(enabled);
+        mPreviewText.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
+        toggleSwitch.setCheckedInternal(enabled);
+        toggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
+            @Override
+            public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
+                toggleSwitch.setCheckedInternal(checked);
+                Settings.Secure.putInt(getActivity().getContentResolver(),
+                        Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, checked ? 1 : 0);
+                mPropsFragment.getPreferenceScreen().setEnabled(checked);
+                mPreviewText.setVisibility(checked ? View.VISIBLE : View.INVISIBLE);
+                return false;
+            }
+        });
+    }
+}
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
new file mode 100644
index 0000000..2fbbabd
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -0,0 +1,147 @@
+/*
+ * 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.accessibility;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceScreen;
+import android.view.Gravity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityManager;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+public abstract class ToggleFeaturePreferenceFragment
+        extends SettingsPreferenceFragment {
+
+    protected ToggleSwitch mToggleSwitch;
+
+    protected String mPreferenceKey;
+    protected Preference mSummaryPreference;
+
+    protected CharSequence mSettingsTitle;
+    protected Intent mSettingsIntent;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(
+                getActivity());
+        setPreferenceScreen(preferenceScreen);
+        mSummaryPreference = new Preference(getActivity()) {
+                @Override
+            protected void onBindView(View view) {
+                super.onBindView(view);
+                TextView summaryView = (TextView) view.findViewById(R.id.summary);
+                summaryView.setText(getSummary());
+                sendAccessibilityEvent(summaryView);
+            }
+
+            private void sendAccessibilityEvent(View view) {
+                // Since the view is still not attached we create, populate,
+                // and send the event directly since we do not know when it
+                // will be attached and posting commands is not as clean.
+                AccessibilityManager accessibilityManager =
+                        AccessibilityManager.getInstance(getActivity());
+                if (accessibilityManager.isEnabled()) {
+                    AccessibilityEvent event = AccessibilityEvent.obtain();
+                    event.setEventType(AccessibilityEvent.TYPE_VIEW_FOCUSED);
+                    view.onInitializeAccessibilityEvent(event);
+                    view.dispatchPopulateAccessibilityEvent(event);
+                    accessibilityManager.sendAccessibilityEvent(event);
+                }
+            }
+        };
+        mSummaryPreference.setPersistent(false);
+        mSummaryPreference.setLayoutResource(R.layout.text_description_preference);
+        preferenceScreen.addPreference(mSummaryPreference);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        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);
+    }
+
+    @Override
+    public void onDestroyView() {
+        getActivity().getActionBar().setCustomView(null);
+        mToggleSwitch.setOnBeforeCheckedChangeListener(null);
+        super.onDestroyView();
+    }
+
+    protected abstract void onPreferenceToggled(String preferenceKey, boolean enabled);
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        MenuItem menuItem = menu.add(mSettingsTitle);
+        menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        menuItem.setIntent(mSettingsIntent);
+    }
+
+    protected void onInstallActionBarToggleSwitch() {
+        mToggleSwitch = createAndAddActionBarToggleSwitch(getActivity());
+    }
+
+    private ToggleSwitch createAndAddActionBarToggleSwitch(Activity activity) {
+        ToggleSwitch toggleSwitch = new ToggleSwitch(activity);
+        final int padding = activity.getResources().getDimensionPixelSize(
+                R.dimen.action_bar_switch_padding);
+        toggleSwitch.setPaddingRelative(0, 0, padding, 0);
+        activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                ActionBar.DISPLAY_SHOW_CUSTOM);
+        activity.getActionBar().setCustomView(toggleSwitch,
+                new ActionBar.LayoutParams(ActionBar.LayoutParams.WRAP_CONTENT,
+                        ActionBar.LayoutParams.WRAP_CONTENT,
+                                Gravity.CENTER_VERTICAL | Gravity.END));
+        return toggleSwitch;
+    }
+
+    protected void onProcessArguments(Bundle arguments) {
+        // Key.
+        mPreferenceKey = arguments.getString(AccessibilitySettings.EXTRA_PREFERENCE_KEY);
+        // Enabled.
+        final boolean enabled = arguments.getBoolean(AccessibilitySettings.EXTRA_CHECKED);
+        mToggleSwitch.setCheckedInternal(enabled);
+        // Title.
+        PreferenceActivity activity = (PreferenceActivity) getActivity();
+        if (!activity.onIsMultiPane() || activity.onIsHidingHeaders()) {
+            String title = arguments.getString(AccessibilitySettings.EXTRA_TITLE);
+            getActivity().setTitle(title);
+        }
+        // Summary.
+        CharSequence summary = arguments.getCharSequence(AccessibilitySettings.EXTRA_SUMMARY);
+        mSummaryPreference.setSummary(summary);
+    }
+}
diff --git a/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
new file mode 100644
index 0000000..f4ac2cc
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
@@ -0,0 +1,44 @@
+/*
+ * 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.accessibility;
+
+import android.provider.Settings;
+
+import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener;
+
+public class ToggleGlobalGesturePreferenceFragment
+        extends ToggleFeaturePreferenceFragment {
+    @Override
+    protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
+        Settings.Global.putInt(getContentResolver(),
+                Settings.Global.ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED, enabled ? 1 : 0);
+    }
+
+    @Override
+    protected void onInstallActionBarToggleSwitch() {
+        super.onInstallActionBarToggleSwitch();
+        mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
+                @Override
+            public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
+                toggleSwitch.setCheckedInternal(checked);
+                getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, checked);
+                onPreferenceToggled(mPreferenceKey, checked);
+                return false;
+            }
+        });
+    }
+}
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
new file mode 100644
index 0000000..27d07d2
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -0,0 +1,44 @@
+/*
+ * 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.accessibility;
+
+import android.provider.Settings;
+
+import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener;
+
+public class ToggleScreenMagnificationPreferenceFragment
+        extends ToggleFeaturePreferenceFragment {
+    @Override
+    protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
+        Settings.Secure.putInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, enabled ? 1 : 0);
+    }
+
+    @Override
+    protected void onInstallActionBarToggleSwitch() {
+        super.onInstallActionBarToggleSwitch();
+        mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
+                @Override
+            public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
+                toggleSwitch.setCheckedInternal(checked);
+                getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, checked);
+                onPreferenceToggled(mPreferenceKey, checked);
+                return false;
+            }
+        });
+    }
+}
diff --git a/src/com/android/settings/accessibility/ToggleSwitch.java b/src/com/android/settings/accessibility/ToggleSwitch.java
new file mode 100644
index 0000000..e7c39e4
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleSwitch.java
@@ -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.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.Context;
+import android.widget.Switch;
+
+public class ToggleSwitch extends Switch {
+    private ToggleSwitch.OnBeforeCheckedChangeListener mOnBeforeListener;
+
+    public static interface OnBeforeCheckedChangeListener {
+        public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked);
+    }
+
+    public ToggleSwitch(Context context) {
+        super(context);
+    }
+
+    public void setOnBeforeCheckedChangeListener(OnBeforeCheckedChangeListener listener) {
+        mOnBeforeListener = listener;
+    }
+
+    @Override
+    public void setChecked(boolean checked) {
+        if (mOnBeforeListener != null
+                && mOnBeforeListener.onBeforeCheckedChanged(this, checked)) {
+            return;
+        }
+        super.setChecked(checked);
+    }
+
+    public void setCheckedInternal(boolean checked) {
+        super.setChecked(checked);
+    }
+}
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index 196908e..c14dbbe 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;
@@ -47,9 +46,11 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.ListView;
 import android.widget.TextView;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 import com.google.android.collect.Lists;
 import com.google.android.collect.Maps;
 
@@ -91,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()) {
@@ -112,7 +115,8 @@
                                 } catch (AuthenticatorException e) {
                                     // handled below
                                 }
-                                if (failed) {
+                                if (failed && getActivity() != null &&
+                                        !getActivity().isFinishing()) {
                                     showDialog(FAILED_REMOVAL_DIALOG);
                                 } else {
                                     finish();
@@ -149,7 +153,10 @@
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         final View view = inflater.inflate(R.layout.account_sync_screen, container, false);
-        
+
+        final ListView list = (ListView) view.findViewById(android.R.id.list);
+        Utils.prepareCustomPreferencesList(container, view, list, false);
+
         initializeUi(view);
 
         return view;
@@ -228,12 +235,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 382481e..39906eb 100644
--- a/src/com/android/settings/accounts/AddAccountSettings.java
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
@@ -23,9 +23,15 @@
 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;
 
@@ -46,7 +52,7 @@
  */
 public class AddAccountSettings extends Activity {
     /**
-     * 
+     *
      */
     private static final String KEY_ADD_CALLED = "AddAccountCalled";
 
@@ -61,19 +67,36 @@
 
     /* package */ static final String EXTRA_SELECTED_ACCOUNT = "selected_account";
 
+    // show additional info regarding the use of a device with multiple users
+    static final String EXTRA_HAS_MULTIPLE_USERS = "hasMultipleUsers";
+
     private static final int CHOOSE_ACCOUNT_REQUEST = 1;
+    private static final int ADD_ACCOUNT_REQUEST = 2;
 
     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 {
                 Bundle bundle = future.getResult();
-                bundle.keySet();
-                setResult(RESULT_OK);
-
-                if (mPendingIntent != null) {
-                    mPendingIntent.cancel();
+                //bundle.keySet();
+                Intent intent = (Intent) bundle.get(AccountManager.KEY_INTENT);
+                if (intent != null) {
+                    done = false;
+                    Bundle addAccountOptions = new Bundle();
+                    addAccountOptions.putParcelable(KEY_CALLER_IDENTITY, mPendingIntent);
+                    addAccountOptions.putBoolean(EXTRA_HAS_MULTIPLE_USERS,
+                            Utils.hasMultipleUsers(AddAccountSettings.this));
+                    intent.putExtras(addAccountOptions);
+                    startActivityForResult(intent, ADD_ACCOUNT_REQUEST);
+                } else {
+                    setResult(RESULT_OK);
+                    if (mPendingIntent != null) {
+                        mPendingIntent.cancel();
+                        mPendingIntent = null;
+                    }
                 }
 
                 if (Log.isLoggable(TAG, Log.VERBOSE)) Log.v(TAG, "account added: " + bundle);
@@ -84,7 +107,9 @@
             } catch (AuthenticatorException e) {
                 if (Log.isLoggable(TAG, Log.VERBOSE)) Log.v(TAG, "addAccount failed: " + e);
             } finally {
-                finish();
+                if (done) {
+                    finish();
+                }
             }
         }
     };
@@ -100,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();
@@ -131,9 +164,18 @@
             // Go to account setup screen. finish() is called inside mCallback.
             addAccount(data.getStringExtra(EXTRA_SELECTED_ACCOUNT));
             break;
+        case ADD_ACCOUNT_REQUEST:
+            setResult(resultCode);
+            if (mPendingIntent != null) {
+                mPendingIntent.cancel();
+                mPendingIntent = null;
+            }
+            finish();
+            break;
         }
     }
 
+    @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putBoolean(KEY_ADD_CALLED, mAddAccountCalled);
@@ -144,12 +186,13 @@
         Bundle addAccountOptions = new Bundle();
         mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(), 0);
         addAccountOptions.putParcelable(KEY_CALLER_IDENTITY, mPendingIntent);
+        addAccountOptions.putBoolean(EXTRA_HAS_MULTIPLE_USERS, Utils.hasMultipleUsers(this));
         AccountManager.get(this).addAccount(
                 accountType,
                 null, /* authTokenType */
                 null, /* requiredFeatures */
                 addAccountOptions,
-                this,
+                null,
                 mCallback,
                 null /* handler */);
         mAddAccountCalled  = true;
diff --git a/src/com/android/settings/accounts/AuthenticatorHelper.java b/src/com/android/settings/accounts/AuthenticatorHelper.java
index eba785b..a164b8b 100644
--- a/src/com/android/settings/accounts/AuthenticatorHelper.java
+++ b/src/com/android/settings/accounts/AuthenticatorHelper.java
@@ -23,6 +23,7 @@
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
 import android.util.Log;
 
 import java.util.ArrayList;
@@ -45,6 +46,16 @@
         return mEnabledAccountTypes.toArray(new String[mEnabledAccountTypes.size()]);
     }
 
+    public void preloadDrawableForType(final Context context, final String accountType) {
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... params) {
+                getDrawableForType(context, accountType);
+                return null;
+            }
+        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
+    }
+
     /**
      * Gets an icon associated with a particular account type. If none found, return null.
      * @param accountType the type of account
@@ -52,15 +63,19 @@
      */
     public Drawable getDrawableForType(Context context, final String accountType) {
         Drawable icon = null;
-        if (mAccTypeIconCache.containsKey(accountType)) {
-            return mAccTypeIconCache.get(accountType);
+        synchronized (mAccTypeIconCache) {
+            if (mAccTypeIconCache.containsKey(accountType)) {
+                return mAccTypeIconCache.get(accountType);
+            }
         }
         if (mTypeToAuthDescription.containsKey(accountType)) {
             try {
                 AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
                 Context authContext = context.createPackageContext(desc.packageName, 0);
                 icon = authContext.getResources().getDrawable(desc.iconId);
-                mAccTypeIconCache.put(accountType, icon);
+                synchronized (mAccTypeIconCache) {
+                    mAccTypeIconCache.put(accountType, icon);
+                }
             } catch (PackageManager.NameNotFoundException e) {
             } catch (Resources.NotFoundException e) {
             }
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index a27fbbd..a7f0f30 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -21,10 +21,7 @@
 import android.accounts.OnAccountsUpdateListener;
 import android.app.ActionBar;
 import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.ActivityManagerNative;
 import android.content.ContentResolver;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SyncAdapterType;
 import android.content.SyncInfo;
@@ -36,27 +33,26 @@
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
-import android.text.format.DateFormat;
 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.CompoundButton;
-import android.widget.Switch;
+import android.widget.ListView;
 import android.widget.TextView;
 
 import com.android.settings.AccountPreference;
 import com.android.settings.R;
-import com.android.settings.Settings;
+import com.android.settings.Utils;
+import com.android.settings.location.LocationSettings;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
 
+/** Manages settings for Google Account. */
 public class ManageAccountsSettings extends AccountPreferenceBase
         implements OnAccountsUpdateListener {
 
@@ -72,7 +68,6 @@
     private String[] mAuthorities;
     private TextView mErrorInfoView;
 
-    private SettingsDialogFragment mDialogFragment;
     // If an account type is set, then show only accounts of that type
     private String mAccountType;
     // Temporary hack, to deal with backward compatibility 
@@ -101,6 +96,8 @@
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         final View view = inflater.inflate(R.layout.manage_accounts_screen, container, false);
+        final ListView list = (ListView) view.findViewById(android.R.id.list);
+        Utils.prepareCustomPreferencesList(container, view, list, false);
         return view;
     }
 
@@ -328,6 +325,7 @@
                 getPreferenceScreen().addPreference(preference);
                 if (mFirstAccount == null) {
                     mFirstAccount = account;
+                    getActivity().invalidateOptionsMenu();
                 }
             }
         }
@@ -349,18 +347,71 @@
         }
     }
 
+    /** Listens to a preference click event and starts a fragment */
+    private class FragmentStarter
+            implements Preference.OnPreferenceClickListener {
+        private final String mClass;
+        private final int mTitleRes;
+
+        /**
+         * @param className the class name of the fragment to be started.
+         * @param title the title resource id of the started preference panel.
+         */
+        public FragmentStarter(String className, int title) {
+            mClass = className;
+            mTitleRes = title;
+        }
+
+        @Override
+        public boolean onPreferenceClick(Preference preference) {
+            ((PreferenceActivity) getActivity()).startPreferencePanel(
+                    mClass, null, mTitleRes, null, null, 0);
+            return true;
+        }
+    }
+
+    /**
+     * Filters through the preference list provided by GoogleLoginService.
+     *
+     * This method removes all the invalid intent from the list, adds account name as extra into the
+     * intent, and hack the location settings to start it as a fragment.
+     */
     private void updatePreferenceIntents(PreferenceScreen prefs) {
         PackageManager pm = getActivity().getPackageManager();
         for (int i = 0; i < prefs.getPreferenceCount();) {
-            Intent intent = prefs.getPreference(i).getIntent();
+            Preference pref = prefs.getPreference(i);
+            Intent intent = pref.getIntent();
             if (intent != null) {
-                ResolveInfo ri = pm.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);
-                if (ri == null) {
-                    prefs.removePreference(prefs.getPreference(i));
-                    continue;
+                // Hack. Launch "Location" as fragment instead of as activity.
+                //
+                // When "Location" is launched as activity via Intent, there's no "Up" button at the
+                // top left, and if there's another running instance of "Location" activity, the
+                // back stack would usually point to some other place so the user won't be able to
+                // go back to the previous page by "back" key. Using fragment is a much easier
+                // solution to those problems.
+                //
+                // If we set Intent to null and assign a fragment to the PreferenceScreen item here,
+                // in order to make it work as expected, we still need to modify the container
+                // PreferenceActivity, override onPreferenceStartFragment() and call
+                // startPreferencePanel() there. In order to inject the title string there, more
+                // dirty further hack is still needed. It's much easier and cleaner to listen to
+                // preference click event here directly.
+                if (intent.getAction().equals(
+                        android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS)) {
+                    // The OnPreferenceClickListener overrides the click event completely. No intent
+                    // will get fired.
+                    pref.setOnPreferenceClickListener(new FragmentStarter(
+                            LocationSettings.class.getName(),
+                            R.string.location_settings_title));
                 } else {
-                    intent.putExtra(ACCOUNT_KEY, mFirstAccount);
-                    intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK);
+                    ResolveInfo ri = pm.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);
+                    if (ri == null) {
+                        prefs.removePreference(pref);
+                        continue;
+                    } else {
+                        intent.putExtra(ACCOUNT_KEY, mFirstAccount);
+                        intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK);
+                    }
                 }
             }
             i++;
diff --git a/src/com/android/settings/accounts/SyncSettings.java b/src/com/android/settings/accounts/SyncSettings.java
index 20c296a..3248113 100644
--- a/src/com/android/settings/accounts/SyncSettings.java
+++ b/src/com/android/settings/accounts/SyncSettings.java
@@ -20,6 +20,7 @@
 import android.accounts.AccountManager;
 import android.accounts.OnAccountsUpdateListener;
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.content.ContentResolver;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
@@ -56,7 +57,11 @@
         mAutoSyncPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
-                ContentResolver.setMasterSyncAutomatically((Boolean) newValue);
+                if (ActivityManager.isUserAMonkey()) {
+                    Log.d("SyncSettings", "ignoring monkey's attempt to flip sync state");
+                } else {
+                    ContentResolver.setMasterSyncAutomatically((Boolean) newValue);
+                }
                 return true;
             }
         });
diff --git a/src/com/android/settings/accounts/SyncSettingsActivity.java b/src/com/android/settings/accounts/SyncSettingsActivity.java
index ed0089e..96f16d6 100644
--- a/src/com/android/settings/accounts/SyncSettingsActivity.java
+++ b/src/com/android/settings/accounts/SyncSettingsActivity.java
@@ -16,9 +16,12 @@
 
 package com.android.settings.accounts;
 
+import android.app.Fragment;
 import android.content.Intent;
 import android.preference.PreferenceActivity;
 
+import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
+
 /**
  * Launcher activity for the SyncSettings fragment.
  *
@@ -31,4 +34,10 @@
         modIntent.putExtra(EXTRA_NO_HEADERS, true);
         return modIntent;
     }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (SyncSettings.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java b/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java
index 13081dd..db746ee 100644
--- a/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java
+++ b/src/com/android/settings/accounts/SyncStateCheckBoxPreference.java
@@ -17,9 +17,11 @@
 package com.android.settings.accounts;
 
 import android.accounts.Account;
+import android.app.ActivityManager;
 import android.content.Context;
 import android.preference.CheckBoxPreference;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
@@ -131,7 +133,11 @@
         // When we're in one-time sync mode, we don't want a click to change the
         // checkbox state
         if (!mOneTimeSyncMode) {
-            super.onClick();
+            if (ActivityManager.isUserAMonkey()) {
+                Log.d("SyncState", "ignoring monkey's attempt to flip sync state");
+            } else {
+                super.onClick();
+            }
         }
     }
 
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..c396479
--- /dev/null
+++ b/src/com/android/settings/applications/AppOpsState.java
@@ -0,0 +1,592 @@
+/**
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.format.DateUtils;
+
+import android.util.Log;
+import android.util.SparseArray;
+import com.android.settings.R;
+
+import java.io.File;
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+
+public class AppOpsState {
+    static final String TAG = "AppOpsState";
+    static final boolean DEBUG = false;
+
+    final Context mContext;
+    final AppOpsManager mAppOps;
+    final PackageManager mPm;
+    final CharSequence[] mOpSummaries;
+    final CharSequence[] mOpLabels;
+
+    List<AppOpEntry> mApps;
+
+    public AppOpsState(Context context) {
+        mContext = context;
+        mAppOps = (AppOpsManager)context.getSystemService(Context.APP_OPS_SERVICE);
+        mPm = context.getPackageManager();
+        mOpSummaries = context.getResources().getTextArray(R.array.app_ops_summaries);
+        mOpLabels = context.getResources().getTextArray(R.array.app_ops_labels);
+    }
+
+    public static class OpsTemplate implements Parcelable {
+        public final int[] ops;
+        public final boolean[] showPerms;
+
+        public OpsTemplate(int[] _ops, boolean[] _showPerms) {
+            ops = _ops;
+            showPerms = _showPerms;
+        }
+
+        OpsTemplate(Parcel src) {
+            ops = src.createIntArray();
+            showPerms = src.createBooleanArray();
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeIntArray(ops);
+            dest.writeBooleanArray(showPerms);
+        }
+
+        public static final Creator<OpsTemplate> CREATOR = new Creator<OpsTemplate>() {
+            @Override public OpsTemplate createFromParcel(Parcel source) {
+                return new OpsTemplate(source);
+            }
+
+            @Override public OpsTemplate[] newArray(int size) {
+                return new OpsTemplate[size];
+            }
+        };
+    }
+
+    public static final OpsTemplate LOCATION_TEMPLATE = new OpsTemplate(
+            new int[] { AppOpsManager.OP_COARSE_LOCATION,
+                    AppOpsManager.OP_FINE_LOCATION,
+                    AppOpsManager.OP_GPS,
+                    AppOpsManager.OP_WIFI_SCAN,
+                    AppOpsManager.OP_NEIGHBORING_CELLS,
+                    AppOpsManager.OP_MONITOR_LOCATION,
+                    AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION},
+            new boolean[] { true,
+                    true,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false}
+            );
+
+    public static final OpsTemplate PERSONAL_TEMPLATE = new OpsTemplate(
+            new int[] { AppOpsManager.OP_READ_CONTACTS,
+                    AppOpsManager.OP_WRITE_CONTACTS,
+                    AppOpsManager.OP_READ_CALL_LOG,
+                    AppOpsManager.OP_WRITE_CALL_LOG,
+                    AppOpsManager.OP_READ_CALENDAR,
+                    AppOpsManager.OP_WRITE_CALENDAR,
+                    AppOpsManager.OP_READ_CLIPBOARD,
+                    AppOpsManager.OP_WRITE_CLIPBOARD },
+            new boolean[] { true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    false,
+                    false }
+            );
+
+    public static final OpsTemplate MESSAGING_TEMPLATE = new OpsTemplate(
+            new int[] { AppOpsManager.OP_READ_SMS,
+                    AppOpsManager.OP_RECEIVE_SMS,
+                    AppOpsManager.OP_RECEIVE_EMERGECY_SMS,
+                    AppOpsManager.OP_RECEIVE_MMS,
+                    AppOpsManager.OP_RECEIVE_WAP_PUSH,
+                    AppOpsManager.OP_WRITE_SMS,
+                    AppOpsManager.OP_SEND_SMS,
+                    AppOpsManager.OP_READ_ICC_SMS,
+                    AppOpsManager.OP_WRITE_ICC_SMS },
+            new boolean[] { true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true }
+            );
+
+    public static final OpsTemplate MEDIA_TEMPLATE = new OpsTemplate(
+            new int[] { AppOpsManager.OP_VIBRATE,
+                    AppOpsManager.OP_CAMERA,
+                    AppOpsManager.OP_RECORD_AUDIO,
+                    AppOpsManager.OP_PLAY_AUDIO,
+                    AppOpsManager.OP_TAKE_MEDIA_BUTTONS,
+                    AppOpsManager.OP_TAKE_AUDIO_FOCUS,
+                    AppOpsManager.OP_AUDIO_MASTER_VOLUME,
+                    AppOpsManager.OP_AUDIO_VOICE_VOLUME,
+                    AppOpsManager.OP_AUDIO_RING_VOLUME,
+                    AppOpsManager.OP_AUDIO_MEDIA_VOLUME,
+                    AppOpsManager.OP_AUDIO_ALARM_VOLUME,
+                    AppOpsManager.OP_AUDIO_NOTIFICATION_VOLUME,
+                    AppOpsManager.OP_AUDIO_BLUETOOTH_VOLUME, },
+            new boolean[] { false,
+                    true,
+                    true,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false }
+            );
+
+    public static final OpsTemplate DEVICE_TEMPLATE = new OpsTemplate(
+            new int[] { AppOpsManager.OP_POST_NOTIFICATION,
+                    AppOpsManager.OP_ACCESS_NOTIFICATIONS,
+                    AppOpsManager.OP_CALL_PHONE,
+                    AppOpsManager.OP_WRITE_SETTINGS,
+                    AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
+                    AppOpsManager.OP_WAKE_LOCK },
+            new boolean[] { false,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,  }
+            );
+
+    public static final OpsTemplate[] ALL_TEMPLATES = new OpsTemplate[] {
+            LOCATION_TEMPLATE, PERSONAL_TEMPLATE, MESSAGING_TEMPLATE,
+            MEDIA_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");
+                            continue;
+                        }
+                    }
+                    if (DEBUG) Log.d(TAG, "Pkg " + appInfo.packageName + ": requested perm "
+                            + appInfo.requestedPermissions[j]);
+                    for (int k=0; k<perms.size(); k++) {
+                        if (!perms.get(k).equals(appInfo.requestedPermissions[j])) {
+                            continue;
+                        }
+                        if (DEBUG) Log.d(TAG, "Pkg " + appInfo.packageName + " perm " + perms.get(k)
+                                + " has op " + permOps.get(k) + ": " + appEntry.hasOp(permOps.get(k)));
+                        if (appEntry.hasOp(permOps.get(k))) {
+                            continue;
+                        }
+                        if (dummyOps == null) {
+                            dummyOps = new ArrayList<AppOpsManager.OpEntry>();
+                            pkgOps = new AppOpsManager.PackageOps(
+                                    appInfo.packageName, appInfo.applicationInfo.uid, dummyOps);
+
+                        }
+                        AppOpsManager.OpEntry opEntry = new AppOpsManager.OpEntry(
+                                permOps.get(k), AppOpsManager.MODE_ALLOWED, 0, 0, 0);
+                        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..4cee8e5
--- /dev/null
+++ b/src/com/android/settings/applications/AppOpsSummary.java
@@ -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.
+ */
+
+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.MEDIA_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 3256fb2..1c2eb2c 100644
--- a/src/com/android/settings/applications/ApplicationsState.java
+++ b/src/com/android/settings/applications/ApplicationsState.java
@@ -18,6 +18,7 @@
 import android.os.Message;
 import android.os.Process;
 import android.os.SystemClock;
+import android.os.UserHandle;
 import android.text.format.Formatter;
 import android.util.Log;
 
@@ -163,8 +164,12 @@
         private final Collator sCollator = Collator.getInstance();
         @Override
         public int compare(AppEntry object1, AppEntry object2) {
-            if (object1.info.enabled != object2.info.enabled) {
-                return object1.info.enabled ? -1 : 1;
+            final boolean normal1 = object1.info.enabled
+                    && (object1.info.flags&ApplicationInfo.FLAG_INSTALLED) != 0;
+            final boolean normal2 = object2.info.enabled
+                    && (object2.info.flags&ApplicationInfo.FLAG_INSTALLED) != 0;
+            if (normal1 != normal2) {
+                return normal1 ? -1 : 1;
             }
             return sCollator.compare(object1.label, object2.label);
         }
@@ -232,11 +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.
@@ -397,7 +430,17 @@
                 Process.THREAD_PRIORITY_BACKGROUND);
         mThread.start();
         mBackgroundHandler = new BackgroundHandler(mThread.getLooper());
-        
+
+        // Only the owner can see all apps.
+        if (UserHandle.myUserId() == 0) {
+            mRetrieveFlags = PackageManager.GET_UNINSTALLED_PACKAGES |
+                    PackageManager.GET_DISABLED_COMPONENTS |
+                    PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS;
+        } else {
+            mRetrieveFlags = PackageManager.GET_DISABLED_COMPONENTS |
+                    PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS;
+        }
+
         /**
          * This is a trick to prevent the foreground thread from being delayed.
          * The problem is that Dalvik monitors are initially spin locks, to keep
@@ -587,9 +630,7 @@
             mPackageIntentReceiver = new PackageIntentReceiver();
             mPackageIntentReceiver.registerReceiver();
         }
-        mApplications = mPm.getInstalledApplications(
-                PackageManager.GET_UNINSTALLED_PACKAGES |
-                PackageManager.GET_DISABLED_COMPONENTS);
+        mApplications = mPm.getInstalledApplications(mRetrieveFlags);
         if (mApplications == null) {
             mApplications = new ArrayList<ApplicationInfo>();
         }
@@ -605,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) {
@@ -626,6 +670,10 @@
         }
     }
 
+    public boolean haveDisabledApps() {
+        return mHaveDisabledApps;
+    }
+
     void doPauseIfNeededLocked() {
         if (!mResumed) {
             return;
@@ -719,9 +767,14 @@
                     if (DEBUG_LOCKING) Log.v(TAG, "addPackage release lock: already exists");
                     return;
                 }
-                ApplicationInfo info = mPm.getApplicationInfo(pkgName,
-                        PackageManager.GET_UNINSTALLED_PACKAGES |
-                        PackageManager.GET_DISABLED_COMPONENTS);
+                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);
@@ -747,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);
                 }
@@ -786,7 +849,10 @@
 
     private long getTotalExternalSize(PackageStats ps) {
         if (ps != null) {
+            // We also include the cache size here because for non-emulated
+            // we don't automtically clean cache files.
             return ps.externalCodeSize + ps.externalDataSize
+                    + ps.externalCacheSize
                     + ps.externalMediaSize + ps.externalObbSize;
         }
         return SIZE_INVALID;
@@ -822,7 +888,7 @@
                             long externalCodeSize = stats.externalCodeSize
                                     + stats.externalObbSize;
                             long externalDataSize = stats.externalDataSize
-                                    + stats.externalMediaSize + stats.externalCacheSize;
+                                    + stats.externalMediaSize;
                             long newSize = externalCodeSize + externalDataSize
                                     + getTotalInternalSize(stats);
                             if (entry.size != newSize ||
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 7fe3711..1b3938c 100644
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.applications;
 
+import com.android.internal.telephony.ISms;
+import com.android.internal.telephony.SmsUsageMonitor;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.applications.ApplicationsState.AppEntry;
@@ -53,6 +55,8 @@
 import android.os.Message;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.PreferenceActivity;
 import android.text.SpannableString;
 import android.text.TextUtils;
@@ -62,16 +66,23 @@
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.AppSecurityPermissions;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.Spinner;
 import android.widget.TextView;
 
 /**
@@ -87,22 +98,27 @@
         implements View.OnClickListener, CompoundButton.OnCheckedChangeListener,
         ApplicationsState.Callbacks {
     private static final String TAG="InstalledAppDetails";
-    static final boolean SUPPORT_DISABLE_APPS = true;
     private static final boolean localLOGV = false;
     
     public static final String ARG_PACKAGE_NAME = "package";
 
     private PackageManager mPm;
+    private UserManager mUserManager;
     private IUsbManager mUsbManager;
     private AppWidgetManager mAppWidgetManager;
     private DevicePolicyManager mDpm;
+    private ISms mSmsManager;
     private ApplicationsState mState;
     private ApplicationsState.Session mSession;
     private ApplicationsState.AppEntry mAppEntry;
+    private boolean mInitialized;
+    private boolean mShowUninstalled;
     private PackageInfo mPackageInfo;
     private CanBeOnSdCardChecker mCanBeOnSdCardChecker;
     private View mRootView;
     private Button mUninstallButton;
+    private View mMoreControlButtons;
+    private Button mSpecialDisableButton;
     private boolean mMoveInProgress = false;
     private boolean mUpdatedSysApp = false;
     private Button mActivitiesButton;
@@ -127,7 +143,11 @@
     private CompoundButton mNotificationSwitch;
 
     private PackageMoveObserver mPackageMoveObserver;
-    
+
+    private final HashSet<String> mHomePackages = new HashSet<String>();
+
+    private boolean mDisableAfterUninstall;
+
     private boolean mHaveSizes = false;
     private long mLastCodeSize = -1;
     private long mLastDataSize = -1;
@@ -161,7 +181,15 @@
     private static final int DLG_MOVE_FAILED = DLG_BASE + 6;
     private static final int DLG_DISABLE = DLG_BASE + 7;
     private static final int DLG_DISABLE_NOTIFICATIONS = DLG_BASE + 8;
-    
+    private static final int DLG_SPECIAL_DISABLE = DLG_BASE + 9;
+
+    // Menu identifiers
+    public static final int UNINSTALL_ALL_USERS_MENU = 1;
+
+    // Result code identifiers
+    public static final int REQUEST_UNINSTALL = 1;
+    public static final int REQUEST_MANAGE_SPACE = 2;
+
     private Handler mHandler = new Handler() {
         public void handleMessage(Message msg) {
             // If the fragment is gone, don't process any more messages.
@@ -217,10 +245,14 @@
     }
     
     private void initDataButtons() {
-        if ((mAppEntry.info.flags&(ApplicationInfo.FLAG_SYSTEM
-                | ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA))
-                == ApplicationInfo.FLAG_SYSTEM
-                || mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
+        // If the app doesn't have its own space management UI
+        // And it's a system app that doesn't allow clearing user data or is an active admin
+        // Then disable the Clear Data button.
+        if (mAppEntry.info.manageSpaceActivityName == null
+                && ((mAppEntry.info.flags&(ApplicationInfo.FLAG_SYSTEM
+                        | ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA))
+                        == ApplicationInfo.FLAG_SYSTEM
+                        || mDpm.packageHasActiveAdmins(mPackageInfo.packageName))) {
             mClearDataButton.setText(R.string.clear_user_data_text);
             mClearDataButton.setEnabled(false);
             mCanClearData = false;
@@ -289,39 +321,47 @@
         }
     }
 
+    private boolean handleDisableable(Button button) {
+        boolean disableable = false;
+        // Try to prevent the user from bricking their phone
+        // by not allowing disabling of apps signed with the
+        // system cert and any launcher app in the system.
+        if (mHomePackages.contains(mAppEntry.info.packageName) || isThisASystemPackage()) {
+            // Disable button for core system applications.
+            button.setText(R.string.disable_text);
+        } else if (mAppEntry.info.enabled) {
+            button.setText(R.string.disable_text);
+            disableable = true;
+        } else {
+            button.setText(R.string.enable_text);
+            disableable = true;
+        }
+
+        return disableable;
+    }
+
     private void initUninstallButtons() {
         mUpdatedSysApp = (mAppEntry.info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
         boolean enabled = true;
         if (mUpdatedSysApp) {
             mUninstallButton.setText(R.string.app_factory_reset);
-        } else {
+            boolean specialDisable = false;
             if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+                specialDisable = handleDisableable(mSpecialDisableButton);
+                mSpecialDisableButton.setOnClickListener(this);
+            }
+            mMoreControlButtons.setVisibility(specialDisable ? View.VISIBLE : View.GONE);
+        } else {
+            mMoreControlButtons.setVisibility(View.GONE);
+            if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+                enabled = handleDisableable(mUninstallButton);
+            } else if ((mPackageInfo.applicationInfo.flags
+                    & ApplicationInfo.FLAG_INSTALLED) == 0
+                    && mUserManager.getUsers().size() >= 2) {
+                // When we have multiple users, there is a separate menu
+                // to uninstall for all users.
+                mUninstallButton.setText(R.string.uninstall_text);
                 enabled = false;
-                if (SUPPORT_DISABLE_APPS) {
-                    try {
-                        // Try to prevent the user from bricking their phone
-                        // by not allowing disabling of apps signed with the
-                        // system cert and any launcher app in the system.
-                        PackageInfo sys = mPm.getPackageInfo("android",
-                                PackageManager.GET_SIGNATURES);
-                        Intent intent = new Intent(Intent.ACTION_MAIN);
-                        intent.addCategory(Intent.CATEGORY_HOME);
-                        intent.setPackage(mAppEntry.info.packageName);
-                        List<ResolveInfo> homes = mPm.queryIntentActivities(intent, 0);
-                        if ((homes != null && homes.size() > 0) || isThisASystemPackage()) {
-                            // Disable button for core system applications.
-                            mUninstallButton.setText(R.string.disable_text);
-                        } else if (mAppEntry.info.enabled) {
-                            mUninstallButton.setText(R.string.disable_text);
-                            enabled = true;
-                        } else {
-                            mUninstallButton.setText(R.string.enable_text);
-                            enabled = true;
-                        }
-                    } catch (PackageManager.NameNotFoundException e) {
-                        Log.w(TAG, "Unable to get package info", e);
-                    }
-                }
             } else {
                 mUninstallButton.setText(R.string.uninstall_text);
             }
@@ -343,7 +383,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
         }
@@ -360,22 +401,34 @@
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        
+
         mState = ApplicationsState.getInstance(getActivity().getApplication());
         mSession = mState.newSession(this);
         mPm = getActivity().getPackageManager();
+        mUserManager = (UserManager)getActivity().getSystemService(Context.USER_SERVICE);
         IBinder b = ServiceManager.getService(Context.USB_SERVICE);
         mUsbManager = IUsbManager.Stub.asInterface(b);
         mAppWidgetManager = AppWidgetManager.getInstance(getActivity());
         mDpm = (DevicePolicyManager)getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
+        mSmsManager = ISms.Stub.asInterface(ServiceManager.getService("isms"));
 
         mCanBeOnSdCardChecker = new CanBeOnSdCardChecker();
+
+        // Need to make sure we have loaded applications at this point.
+        mSession.resume();
+
+        retrieveAppEntry();
+
+        setHasOptionsMenu(true);
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = mRootView = inflater.inflate(R.layout.installed_app_details, null);
-        
+    public View onCreateView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        final View view = inflater.inflate(R.layout.installed_app_details, container, false);
+        Utils.prepareCustomPreferencesList(container, view, view, false);
+
+        mRootView = view;
         mComputingStr = getActivity().getText(R.string.computing_size);
         
         // Set default values on sizes
@@ -384,7 +437,12 @@
         mDataSize = (TextView)view.findViewById(R.id.data_size_text);
         mExternalCodeSize = (TextView)view.findViewById(R.id.external_code_size_text);
         mExternalDataSize = (TextView)view.findViewById(R.id.external_data_size_text);
-        
+
+        if (Environment.isExternalStorageEmulated()) {
+            ((View)mExternalCodeSize.getParent()).setVisibility(View.GONE);
+            ((View)mExternalDataSize.getParent()).setVisibility(View.GONE);
+        }
+
         // Get Control button panel
         View btnPanel = view.findViewById(R.id.control_buttons_panel);
         mForceStopButton = (Button) btnPanel.findViewById(R.id.left_button);
@@ -392,6 +450,12 @@
         mUninstallButton = (Button)btnPanel.findViewById(R.id.right_button);
         mForceStopButton.setEnabled(false);
         
+        // Get More Control button panel
+        mMoreControlButtons = view.findViewById(R.id.more_control_buttons_panel);
+        mMoreControlButtons.findViewById(R.id.left_button).setVisibility(View.INVISIBLE);
+        mSpecialDisableButton = (Button)mMoreControlButtons.findViewById(R.id.right_button);
+        mMoreControlButtons.setVisibility(View.GONE);
+        
         // Initialize clear data and move install location buttons
         View data_buttons_panel = view.findViewById(R.id.data_buttons_panel);
         mClearDataButton = (Button) data_buttons_panel.findViewById(R.id.right_button);
@@ -413,9 +477,70 @@
         return view;
     }
 
-    // Utility method to set applicaiton label and icon.
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        menu.add(0, UNINSTALL_ALL_USERS_MENU, 1, R.string.uninstall_all_users_text)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        boolean showIt = true;
+        if (mUpdatedSysApp) {
+            showIt = false;
+        } else if (mAppEntry == null) {
+            showIt = false;
+        } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+            showIt = false;
+        } else if (mPackageInfo == null || mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
+            showIt = false;
+        } else if (UserHandle.myUserId() != 0) {
+            showIt = false;
+        } else if (mUserManager.getUsers().size() < 2) {
+            showIt = false;
+        }
+        menu.findItem(UNINSTALL_ALL_USERS_MENU).setVisible(showIt);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int menuId = item.getItemId();
+        if (menuId == UNINSTALL_ALL_USERS_MENU) {
+            uninstallPkg(mAppEntry.info.packageName, true, false);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_UNINSTALL) {
+            if (mDisableAfterUninstall) {
+                mDisableAfterUninstall = false;
+                try {
+                    ApplicationInfo ainfo = getActivity().getPackageManager().getApplicationInfo(
+                            mAppEntry.info.packageName, PackageManager.GET_UNINSTALLED_PACKAGES
+                            | PackageManager.GET_DISABLED_COMPONENTS);
+                    if ((ainfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) == 0) {
+                        new DisableChanger(this, mAppEntry.info,
+                                PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER)
+                                .execute((Object)null);
+                    }
+                } catch (NameNotFoundException e) {
+                }
+            }
+            if (!refreshUi()) {
+                setIntentAndFinish(true, true);
+            }
+        }
+    }
+
+    // Utility method to set application label and icon.
     private void setAppLabelAndIcon(PackageInfo pkgInfo) {
-        View appSnippet = mRootView.findViewById(R.id.app_snippet);
+        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);
         mState.ensureIcon(mAppEntry);
         icon.setImageDrawable(mAppEntry.icon);
@@ -478,10 +603,7 @@
     public void onRunningStateChanged(boolean running) {
     }
 
-    private boolean refreshUi() {
-        if (mMoveInProgress) {
-            return true;
-        }
+    private String retrieveAppEntry() {
         final Bundle args = getArguments();
         String packageName = (args != null) ? args.getString(ARG_PACKAGE_NAME) : null;
         if (packageName == null) {
@@ -492,22 +614,72 @@
             }
         }
         mAppEntry = mState.getEntry(packageName);
-        
+        if (mAppEntry != null) {
+            // Get application info again to refresh changed properties of application
+            try {
+                mPackageInfo = mPm.getPackageInfo(mAppEntry.info.packageName,
+                        PackageManager.GET_DISABLED_COMPONENTS |
+                        PackageManager.GET_UNINSTALLED_PACKAGES |
+                        PackageManager.GET_SIGNATURES);
+            } catch (NameNotFoundException e) {
+                Log.e(TAG, "Exception when retrieving package:" + mAppEntry.info.packageName, e);
+            }
+        } else {
+            Log.w(TAG, "Missing AppEntry; maybe reinstalling?");
+            mPackageInfo = null;
+        }
+
+        return packageName;
+    }
+
+    private boolean signaturesMatch(String pkg1, String pkg2) {
+        if (pkg1 != null && pkg2 != null) {
+            try {
+                final int match = mPm.checkSignatures(pkg1, pkg2);
+                if (match >= PackageManager.SIGNATURE_MATCH) {
+                    return true;
+                }
+            } catch (Exception e) {
+                // e.g. named alternate package not found during lookup;
+                // this is an expected case sometimes
+            }
+        }
+        return false;
+    }
+
+    private boolean refreshUi() {
+        if (mMoveInProgress) {
+            return true;
+        }
+        final String packageName = retrieveAppEntry();
+
         if (mAppEntry == null) {
             return false; // onCreate must have failed, make sure to exit
         }
-        
-        // Get application info again to refresh changed properties of application
-        try {
-            mPackageInfo = mPm.getPackageInfo(mAppEntry.info.packageName,
-                    PackageManager.GET_DISABLED_COMPONENTS |
-                    PackageManager.GET_UNINSTALLED_PACKAGES |
-                    PackageManager.GET_SIGNATURES);
-        } catch (NameNotFoundException e) {
-            Log.e(TAG, "Exception when retrieving package:" + mAppEntry.info.packageName, e);
+
+        if (mPackageInfo == null) {
             return false; // onCreate must have failed, make sure to exit
         }
-        
+
+        // Get list of "home" apps and trace through any meta-data references
+        List<ResolveInfo> homeActivities = new ArrayList<ResolveInfo>();
+        mPm.getHomeActivities(homeActivities);
+        mHomePackages.clear();
+        for (int i = 0; i< homeActivities.size(); i++) {
+            ResolveInfo ri = homeActivities.get(i);
+            final String activityPkg = ri.activityInfo.packageName;
+            mHomePackages.add(activityPkg);
+
+            // Also make sure to include anything proxying for the home app
+            final Bundle metadata = ri.activityInfo.metaData;
+            if (metadata != null) {
+                final String metaPkg = metadata.getString(ActivityManager.META_HOME_ALTERNATE);
+                if (signaturesMatch(metaPkg, activityPkg)) {
+                    mHomePackages.add(metaPkg);
+                }
+            }
+        }
+
         // Get list of preferred activities
         List<ComponentName> prefActList = new ArrayList<ComponentName>();
         
@@ -518,7 +690,7 @@
             Log.i(TAG, "Have " + prefActList.size() + " number of activities in preferred list");
         boolean hasUsbDefaults = false;
         try {
-            hasUsbDefaults = mUsbManager.hasDefaults(packageName);
+            hasUsbDefaults = mUsbManager.hasDefaults(packageName, UserHandle.myUserId());
         } catch (RemoteException e) {
             Log.e(TAG, "mUsbManager.hasDefaults", e);
         }
@@ -587,13 +759,48 @@
         // Security permissions section
         LinearLayout permsView = (LinearLayout) mRootView.findViewById(R.id.permissions_section);
         AppSecurityPermissions asp = new AppSecurityPermissions(getActivity(), packageName);
-        if (asp.getPermissionCount() > 0) {
+        int premiumSmsPermission = getPremiumSmsPermission(packageName);
+        // Premium SMS permission implies the app also has SEND_SMS permission, so the original
+        // application permissions list doesn't have to be shown/hidden separately. The premium
+        // SMS subsection should only be visible if the app has tried to send to a premium SMS.
+        if (asp.getPermissionCount() > 0
+                || premiumSmsPermission != SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN) {
             permsView.setVisibility(View.VISIBLE);
+        } else {
+            permsView.setVisibility(View.GONE);
+        }
+        // Premium SMS permission subsection
+        TextView securityBillingDesc = (TextView) permsView.findViewById(
+                R.id.security_settings_billing_desc);
+        LinearLayout securityBillingList = (LinearLayout) permsView.findViewById(
+                R.id.security_settings_billing_list);
+        if (premiumSmsPermission != SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN) {
+            // Show the premium SMS permission selector
+            securityBillingDesc.setVisibility(View.VISIBLE);
+            securityBillingList.setVisibility(View.VISIBLE);
+            Spinner spinner = (Spinner) permsView.findViewById(
+                    R.id.security_settings_premium_sms_list);
+            ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(getActivity(),
+                    R.array.security_settings_premium_sms_values,
+                    android.R.layout.simple_spinner_item);
+            adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+            spinner.setAdapter(adapter);
+            // List items are in the same order as SmsUsageMonitor constants, offset by 1.
+            spinner.setSelection(premiumSmsPermission - 1);
+            spinner.setOnItemSelectedListener(new PremiumSmsSelectionListener(
+                    packageName, mSmsManager));
+        } else {
+            // Hide the premium SMS permission selector
+            securityBillingDesc.setVisibility(View.GONE);
+            securityBillingList.setVisibility(View.GONE);
+        }
+        // App permissions subsection
+        if (asp.getPermissionCount() > 0) {
             // Make the security sections header visible
             LinearLayout securityList = (LinearLayout) permsView.findViewById(
                     R.id.security_settings_list);
             securityList.removeAllViews();
-            securityList.addView(asp.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);
@@ -634,16 +841,73 @@
                             mPackageInfo.applicationInfo.loadLabel(mPm), appListStr));
                 }
             }
-        } else {
-            permsView.setVisibility(View.GONE);
         }
         
         checkForceStop();
         setAppLabelAndIcon(mPackageInfo);
         refreshButtons();
         refreshSizeInfo();
+
+        if (!mInitialized) {
+            // First time init: are we displaying an uninstalled app?
+            mInitialized = true;
+            mShowUninstalled = (mAppEntry.info.flags&ApplicationInfo.FLAG_INSTALLED) == 0;
+        } else {
+            // All other times: if the app no longer exists then we want
+            // to go away.
+            try {
+                ApplicationInfo ainfo = getActivity().getPackageManager().getApplicationInfo(
+                        mAppEntry.info.packageName, PackageManager.GET_UNINSTALLED_PACKAGES
+                        | PackageManager.GET_DISABLED_COMPONENTS);
+                if (!mShowUninstalled) {
+                    // If we did not start out with the app uninstalled, then
+                    // it transitioning to the uninstalled state for the current
+                    // user means we should go away as well.
+                    return (ainfo.flags&ApplicationInfo.FLAG_INSTALLED) != 0;
+                }
+            } catch (NameNotFoundException e) {
+                return false;
+            }
+        }
+
         return true;
     }
+
+    private static class PremiumSmsSelectionListener implements AdapterView.OnItemSelectedListener {
+        private final String mPackageName;
+        private final ISms mSmsManager;
+
+        PremiumSmsSelectionListener(String packageName, ISms smsManager) {
+            mPackageName = packageName;
+            mSmsManager = smsManager;
+        }
+
+        @Override
+        public void onItemSelected(AdapterView<?> parent, View view, int position,
+                long id) {
+            if (position >= 0 && position < 3) {
+                Log.d(TAG, "Selected premium SMS policy " + position);
+                setPremiumSmsPermission(mPackageName, (position + 1));
+            } else {
+                Log.e(TAG, "Error: unknown premium SMS policy " + position);
+            }
+        }
+
+        @Override
+        public void onNothingSelected(AdapterView<?> parent) {
+            // Ignored
+        }
+
+        private void setPremiumSmsPermission(String packageName, int permission) {
+            try {
+                if (mSmsManager != null) {
+                    mSmsManager.setPremiumSmsPermission(packageName, permission);
+                }
+            } catch (RemoteException ex) {
+                // ignored
+            }
+        }
+    }
     
     private void resetLaunchDefaultsUi(TextView title, TextView autoLaunchView) {
         title.setText(R.string.auto_launch_label);
@@ -675,22 +939,28 @@
             
         } else {
             mHaveSizes = true;
-            if (mLastCodeSize != mAppEntry.codeSize) {
-                mLastCodeSize = mAppEntry.codeSize;
-                mAppSize.setText(getSizeStr(mAppEntry.codeSize));
+            long codeSize = mAppEntry.codeSize;
+            long dataSize = mAppEntry.dataSize;
+            if (Environment.isExternalStorageEmulated()) {
+                codeSize += mAppEntry.externalCodeSize;
+                dataSize +=  mAppEntry.externalDataSize;
+            } else {
+                if (mLastExternalCodeSize != mAppEntry.externalCodeSize) {
+                    mLastExternalCodeSize = mAppEntry.externalCodeSize;
+                    mExternalCodeSize.setText(getSizeStr(mAppEntry.externalCodeSize));
+                }
+                if (mLastExternalDataSize !=  mAppEntry.externalDataSize) {
+                    mLastExternalDataSize =  mAppEntry.externalDataSize;
+                    mExternalDataSize.setText(getSizeStr( mAppEntry.externalDataSize));
+                }
             }
-            if (mLastDataSize != mAppEntry.dataSize) {
-                mLastDataSize = mAppEntry.dataSize;
-                mDataSize.setText(getSizeStr(mAppEntry.dataSize));
+            if (mLastCodeSize != codeSize) {
+                mLastCodeSize = codeSize;
+                mAppSize.setText(getSizeStr(codeSize));
             }
-            if (mLastExternalCodeSize != mAppEntry.externalCodeSize) {
-                mLastExternalCodeSize = mAppEntry.externalCodeSize;
-                mExternalCodeSize.setText(getSizeStr(mAppEntry.externalCodeSize));
-            }
-            long nonCacheExtDataSize = mAppEntry.externalDataSize - mAppEntry.externalCacheSize;
-            if (mLastExternalDataSize != nonCacheExtDataSize) {
-                mLastExternalDataSize = nonCacheExtDataSize;
-                mExternalDataSize.setText(getSizeStr(nonCacheExtDataSize));
+            if (mLastDataSize != dataSize) {
+                mLastDataSize = dataSize;
+                mDataSize.setText(getSizeStr(dataSize));
             }
             long cacheSize = mAppEntry.cacheSize + mAppEntry.externalCacheSize;
             if (mLastCacheSize != cacheSize) {
@@ -702,7 +972,7 @@
                 mTotalSize.setText(getSizeStr(mAppEntry.size));
             }
             
-            if ((mAppEntry.dataSize+nonCacheExtDataSize) <= 0 || !mCanClearData) {
+            if ((mAppEntry.dataSize+ mAppEntry.externalDataSize) <= 0 || !mCanClearData) {
                 mClearDataButton.setEnabled(false);
             } else {
                 mClearDataButton.setEnabled(true);
@@ -744,6 +1014,7 @@
             mMoveAppButton.setText(R.string.moving);
             mMoveAppButton.setEnabled(false);
             mUninstallButton.setEnabled(false);
+            mSpecialDisableButton.setEnabled(false);
         }
     }
 
@@ -835,7 +1106,8 @@
                             new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int which) {
                             // Clear user data here
-                            getOwner().uninstallPkg(getOwner().mAppEntry.info.packageName);
+                            getOwner().uninstallPkg(getOwner().mAppEntry.info.packageName,
+                                    false, false);
                         }
                     })
                     .setNegativeButton(R.string.dlg_cancel, null)
@@ -926,17 +1198,33 @@
                         }
                     })
                     .create();
+                case DLG_SPECIAL_DISABLE:
+                    return new AlertDialog.Builder(getActivity())
+                    .setTitle(getActivity().getText(R.string.app_special_disable_dlg_title))
+                    .setIconAttribute(android.R.attr.alertDialogIcon)
+                    .setMessage(getActivity().getText(R.string.app_special_disable_dlg_text))
+                    .setPositiveButton(R.string.dlg_ok,
+                            new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            // Clear user data here
+                            getOwner().uninstallPkg(getOwner().mAppEntry.info.packageName,
+                                    false, true);
+                        }
+                    })
+                    .setNegativeButton(R.string.dlg_cancel, null)
+                    .create();
             }
             throw new IllegalArgumentException("unknown id " + id);
         }
     }
 
-    private void uninstallPkg(String packageName) {
+    private void uninstallPkg(String packageName, boolean allUsers, boolean andDisable) {
          // Create new intent to launch Uninstaller activity
         Uri packageURI = Uri.parse("package:"+packageName);
-        Intent uninstallIntent = new Intent(Intent.ACTION_DELETE, packageURI);
-        startActivity(uninstallIntent);
-        setIntentAndFinish(true, true);
+        Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageURI);
+        uninstallIntent.putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, allUsers);
+        startActivityForResult(uninstallIntent, REQUEST_UNINSTALL);
+        mDisableAfterUninstall = andDisable;
     }
 
     private void forceStopPackage(String pkgName) {
@@ -976,8 +1264,9 @@
                     Uri.fromParts("package", mAppEntry.info.packageName, null));
             intent.putExtra(Intent.EXTRA_PACKAGES, new String[] { mAppEntry.info.packageName });
             intent.putExtra(Intent.EXTRA_UID, mAppEntry.info.uid);
-            getActivity().sendOrderedBroadcast(intent, null, mCheckKillProcessesReceiver, null,
-                    Activity.RESULT_CANCELED, null, null);
+            intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.getUserId(mAppEntry.info.uid));
+            getActivity().sendOrderedBroadcastAsUser(intent, UserHandle.CURRENT, null,
+                    mCheckKillProcessesReceiver, null, Activity.RESULT_CANCELED, null, null);
         }
     }
 
@@ -1007,12 +1296,23 @@
                 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
         }
     }
 
+    private int getPremiumSmsPermission(String packageName) {
+        try {
+            if (mSmsManager != null) {
+                return mSmsManager.getPremiumSmsPermission(packageName);
+            }
+        } catch (RemoteException ex) {
+            // ignored
+        }
+        return SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN;
+    }
+
     /*
      * Method implementing functionality of buttons clicked
      * @see android.view.View.OnClickListener#onClick(android.view.View)
@@ -1031,14 +1331,18 @@
                                 PackageManager.COMPONENT_ENABLED_STATE_DEFAULT)
                         .execute((Object)null);
                     }
+                } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_INSTALLED) == 0) {
+                    uninstallPkg(packageName, true, false);
                 } else {
-                    uninstallPkg(packageName);
+                    uninstallPkg(packageName, false, false);
                 }
             }
+        } else if(v == mSpecialDisableButton) {
+            showDialogInner(DLG_SPECIAL_DISABLE, 0);
         } else if(v == mActivitiesButton) {
             mPm.clearPackagePreferredActivities(packageName);
             try {
-                mUsbManager.clearDefaults(packageName);
+                mUsbManager.clearDefaults(packageName, UserHandle.myUserId());
             } catch (RemoteException e) {
                 Log.e(TAG, "mUsbManager.clearDefaults", e);
             }
@@ -1053,7 +1357,7 @@
                     Intent intent = new Intent(Intent.ACTION_DEFAULT);
                     intent.setClassName(mAppEntry.info.packageName,
                             mAppEntry.info.manageSpaceActivityName);
-                    startActivityForResult(intent, -1);
+                    startActivityForResult(intent, REQUEST_MANAGE_SPACE);
                 }
             } else {
                 showDialogInner(DLG_CLEAR_DATA, 0);
diff --git a/src/com/android/settings/applications/InstalledAppDetailsTop.java b/src/com/android/settings/applications/InstalledAppDetailsTop.java
index 4051aeb..44a88fb 100644
--- a/src/com/android/settings/applications/InstalledAppDetailsTop.java
+++ b/src/com/android/settings/applications/InstalledAppDetailsTop.java
@@ -1,9 +1,13 @@
 package com.android.settings.applications;
 
+import android.app.Fragment;
 import android.content.Intent;
 import android.preference.PreferenceActivity;
 
+import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
+
 public class InstalledAppDetailsTop extends PreferenceActivity {
+
     @Override
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
@@ -11,4 +15,11 @@
         modIntent.putExtra(EXTRA_NO_HEADERS, true);
         return modIntent;
     }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (InstalledAppDetails.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
+
 }
diff --git a/src/com/android/settings/applications/LinearColorBar.java b/src/com/android/settings/applications/LinearColorBar.java
index 74fb02e..f374c29 100644
--- a/src/com/android/settings/applications/LinearColorBar.java
+++ b/src/com/android/settings/applications/LinearColorBar.java
@@ -12,30 +12,53 @@
 import android.graphics.Shader;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
+import android.view.MotionEvent;
 import android.widget.LinearLayout;
 
 public class LinearColorBar extends LinearLayout {
     static final int LEFT_COLOR = 0xff0099cc;
     static final int MIDDLE_COLOR = 0xff0099cc;
     static final int RIGHT_COLOR = 0xff888888;
+    static final int GRAY_COLOR = 0xff555555;
+    static final int WHITE_COLOR = 0xffffffff;
 
     private float mRedRatio;
     private float mYellowRatio;
     private float mGreenRatio;
 
+    private int mLeftColor = LEFT_COLOR;
+    private int mMiddleColor = MIDDLE_COLOR;
+    private int mRightColor = RIGHT_COLOR;
+
+    private boolean mShowIndicator = true;
     private boolean mShowingGreen;
 
+    private OnRegionTappedListener mOnRegionTappedListener;
+    private int mColoredRegions = REGION_RED | REGION_YELLOW | REGION_GREEN;
+
     final Rect mRect = new Rect();
     final Paint mPaint = new Paint();
 
     int mLastInterestingLeft, mLastInterestingRight;
     int mLineWidth;
 
+    int mLastLeftDiv, mLastRightDiv;
+    int mLastRegion;
+
     final Path mColorPath = new Path();
     final Path mEdgePath = new Path();
     final Paint mColorGradientPaint = new Paint();
     final Paint mEdgeGradientPaint = new Paint();
 
+    public static final int REGION_RED = 1<<0;
+    public static final int REGION_YELLOW = 1<<1;
+    public static final int REGION_GREEN = 1<<2;
+    public static final int REGION_ALL = REGION_RED | REGION_YELLOW | REGION_GREEN;
+
+    public interface OnRegionTappedListener {
+        public void onRegionTapped(int region);
+    }
+
     public LinearColorBar(Context context, AttributeSet attrs) {
         super(context, attrs);
         setWillNotDraw(false);
@@ -50,6 +73,18 @@
         
     }
 
+    public void setOnRegionTappedListener(OnRegionTappedListener listener) {
+        if (listener != mOnRegionTappedListener) {
+            mOnRegionTappedListener = listener;
+            setClickable(listener != null);
+        }
+    }
+
+    public void setColoredRegions(int regions) {
+        mColoredRegions = regions;
+        invalidate();
+    }
+
     public void setRatios(float red, float yellow, float green) {
         mRedRatio = red;
         mYellowRatio = yellow;
@@ -57,6 +92,20 @@
         invalidate();
     }
 
+    public void setColors(int red, int yellow, int green) {
+        mLeftColor = red;
+        mMiddleColor = yellow;
+        mRightColor = green;
+        updateIndicator();
+        invalidate();
+    }
+
+    public void setShowIndicator(boolean showIndicator) {
+        mShowIndicator = showIndicator;
+        updateIndicator();
+        invalidate();
+    }
+
     public void setShowingGreen(boolean showingGreen) {
         if (mShowingGreen != showingGreen) {
             mShowingGreen = showingGreen;
@@ -70,12 +119,15 @@
         if (off < 0) off = 0;
         mRect.top = off;
         mRect.bottom = getHeight();
+        if (!mShowIndicator) {
+            return;
+        }
         if (mShowingGreen) {
             mColorGradientPaint.setShader(new LinearGradient(
-                    0, 0, 0, off-2, RIGHT_COLOR&0xffffff, RIGHT_COLOR, Shader.TileMode.CLAMP));
+                    0, 0, 0, off-2, mRightColor &0xffffff, mRightColor, Shader.TileMode.CLAMP));
         } else {
             mColorGradientPaint.setShader(new LinearGradient(
-                    0, 0, 0, off-2, MIDDLE_COLOR&0xffffff, MIDDLE_COLOR, Shader.TileMode.CLAMP));
+                    0, 0, 0, off-2, mMiddleColor&0xffffff, mMiddleColor, Shader.TileMode.CLAMP));
         }
         mEdgeGradientPaint.setShader(new LinearGradient(
                 0, 0, 0, off/2, 0x00a0a0a0, 0xffa0a0a0, Shader.TileMode.CLAMP));
@@ -88,6 +140,50 @@
     }
 
     @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (mOnRegionTappedListener != null) {
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN: {
+                    final int x = (int) event.getX();
+                    if (x < mLastLeftDiv) {
+                        mLastRegion = REGION_RED;
+                    } else if (x < mLastRightDiv) {
+                        mLastRegion = REGION_YELLOW;
+                    } else {
+                        mLastRegion = REGION_GREEN;
+                    }
+                    invalidate();
+                } break;
+            }
+        }
+        return super.onTouchEvent(event);
+    }
+
+    @Override
+    protected void dispatchSetPressed(boolean pressed) {
+        invalidate();
+    }
+
+    @Override
+    public boolean performClick() {
+        if (mOnRegionTappedListener != null && mLastRegion != 0) {
+            mOnRegionTappedListener.onRegionTapped(mLastRegion);
+            mLastRegion = 0;
+        }
+        return super.performClick();
+    }
+
+    private int pickColor(int color, int region) {
+        if (isPressed() && (mLastRegion&region) != 0) {
+            return WHITE_COLOR;
+        }
+        if ((mColoredRegions&region) == 0) {
+            return GRAY_COLOR;
+        }
+        return color;
+    }
+
+    @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
 
@@ -111,7 +207,7 @@
         if (mLastInterestingLeft != indicatorLeft || mLastInterestingRight != indicatorRight) {
             mColorPath.reset();
             mEdgePath.reset();
-            if (indicatorLeft < indicatorRight) {
+            if (mShowIndicator && indicatorLeft < indicatorRight) {
                 final int midTopY = mRect.top;
                 final int midBottomY = 0;
                 final int xoff = 2;
@@ -146,18 +242,21 @@
         if (left < right) {
             mRect.left = left;
             mRect.right = right;
-            mPaint.setColor(LEFT_COLOR);
+            mPaint.setColor(pickColor(mLeftColor, REGION_RED));
             canvas.drawRect(mRect, mPaint);
             width -= (right-left);
             left = right;
         }
 
+        mLastLeftDiv = right;
+        mLastRightDiv = right2;
+
         right = right2;
 
         if (left < right) {
             mRect.left = left;
             mRect.right = right;
-            mPaint.setColor(MIDDLE_COLOR);
+            mPaint.setColor(pickColor(mMiddleColor, REGION_YELLOW));
             canvas.drawRect(mRect, mPaint);
             width -= (right-left);
             left = right;
@@ -168,7 +267,7 @@
         if (left < right) {
             mRect.left = left;
             mRect.right = right;
-            mPaint.setColor(RIGHT_COLOR);
+            mPaint.setColor(pickColor(mRightColor, REGION_GREEN));
             canvas.drawRect(mRect, mPaint);
         }
     }
diff --git a/src/com/android/settings/applications/LinearColorPreference.java b/src/com/android/settings/applications/LinearColorPreference.java
new file mode 100644
index 0000000..8d9fb72
--- /dev/null
+++ b/src/com/android/settings/applications/LinearColorPreference.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.content.Context;
+import android.preference.Preference;
+import android.view.View;
+import com.android.settings.R;
+
+public class LinearColorPreference extends Preference {
+    float mRedRatio;
+    float mYellowRatio;
+    float mGreenRatio;
+    int mColoredRegions = LinearColorBar.REGION_ALL;
+    LinearColorBar.OnRegionTappedListener mOnRegionTappedListener;
+
+    public LinearColorPreference(Context context) {
+        super(context);
+        setLayoutResource(R.layout.preference_linearcolor);
+    }
+
+    public void setRatios(float red, float yellow, float green) {
+        mRedRatio = red;
+        mYellowRatio = yellow;
+        mGreenRatio = green;
+        notifyChanged();
+    }
+
+    public void setOnRegionTappedListener(LinearColorBar.OnRegionTappedListener listener) {
+        mOnRegionTappedListener = listener;
+        notifyChanged();
+    }
+
+    public void setColoredRegions(int regions) {
+        mColoredRegions = regions;
+        notifyChanged();
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        LinearColorBar colors = (LinearColorBar)view.findViewById(
+                R.id.linear_color_bar);
+        colors.setShowIndicator(false);
+        colors.setColors(0xffaa5030, 0xffaaaa30, 0xff30aa50);
+        colors.setRatios(mRedRatio, mYellowRatio, mGreenRatio);
+        colors.setColoredRegions(mColoredRegions);
+        colors.setOnRegionTappedListener(mOnRegionTappedListener);
+    }
+}
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index dfc1a9c..0a1dcb1 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -20,7 +20,9 @@
 import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
 
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.app.AlertDialog;
+import android.app.AppOpsManager;
 import android.app.Fragment;
 import android.app.INotificationManager;
 import android.content.ComponentName;
@@ -41,12 +43,14 @@
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.UserHandle;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFrameLayout;
 import android.provider.Settings;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.PagerTabStrip;
 import android.support.v4.view.ViewPager;
+import android.text.BidiFormatter;
 import android.text.format.Formatter;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -159,6 +163,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;
@@ -219,6 +224,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;
@@ -341,7 +347,8 @@
                     final int N = mApplications.getCount();
                     for (int i=0; i<N; i++) {
                         ApplicationsState.AppEntry ae = mApplications.getAppEntry(i);
-                        mAppStorage += ae.externalCodeSize + ae.externalDataSize;
+                        mAppStorage += ae.externalCodeSize + ae.externalDataSize
+                                + ae.externalCacheSize;
                     }
                 }
             } else {
@@ -379,20 +386,21 @@
                 return;
             }
             if (mTotalStorage > 0) {
+                BidiFormatter bidiFormatter = BidiFormatter.getInstance();
                 mColorBar.setRatios((mTotalStorage-mFreeStorage-mAppStorage)/(float)mTotalStorage,
                         mAppStorage/(float)mTotalStorage, mFreeStorage/(float)mTotalStorage);
                 long usedStorage = mTotalStorage - mFreeStorage;
                 if (mLastUsedStorage != usedStorage) {
                     mLastUsedStorage = usedStorage;
-                    String sizeStr = Formatter.formatShortFileSize(
-                            mOwner.getActivity(), usedStorage);
+                    String sizeStr = bidiFormatter.unicodeWrap(
+                            Formatter.formatShortFileSize(mOwner.getActivity(), usedStorage));
                     mUsedStorageText.setText(mOwner.getActivity().getResources().getString(
                             R.string.service_foreground_processes, sizeStr));
                 }
                 if (mLastFreeStorage != mFreeStorage) {
                     mLastFreeStorage = mFreeStorage;
-                    String sizeStr = Formatter.formatShortFileSize(
-                            mOwner.getActivity(), mFreeStorage);
+                    String sizeStr = bidiFormatter.unicodeWrap(
+                            Formatter.formatShortFileSize(mOwner.getActivity(), mFreeStorage));
                     mFreeStorageText.setText(mOwner.getActivity().getResources().getString(
                             R.string.service_background_processes, sizeStr));
                 }
@@ -424,6 +432,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
@@ -444,6 +453,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;
     
@@ -461,7 +471,7 @@
 
         @Override
         public int getCount() {
-            return mTabs.size();
+            return mNumTabs;
         }
         
         @Override
@@ -469,6 +479,7 @@
             TabInfo tab = mTabs.get(position);
             View root = tab.build(mInflater, mContentContainer, mRootView);
             container.addView(root);
+            root.setTag(R.id.name, tab);
             return root;
         }
 
@@ -483,6 +494,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;
         }
@@ -604,8 +621,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) {
@@ -762,17 +782,18 @@
                 holder.entry = entry;
                 if (entry.label != null) {
                     holder.appName.setText(entry.label);
-                    holder.appName.setTextColor(mContext.getResources().getColorStateList(
-                            entry.info.enabled ? android.R.color.primary_text_dark
-                                    : android.R.color.secondary_text_dark));
                 }
                 mState.ensureIcon(entry);
                 if (entry.icon != null) {
                     holder.appIcon.setImageDrawable(entry.icon);
                 }
                 holder.updateSizeText(mTab.mInvalidSizeStr, mWhichSize);
-                if (InstalledAppDetails.SUPPORT_DISABLE_APPS) {
-                    holder.disabled.setVisibility(entry.info.enabled ? View.GONE : View.VISIBLE);
+                if ((entry.info.flags&ApplicationInfo.FLAG_INSTALLED) == 0) {
+                    holder.disabled.setVisibility(View.VISIBLE);
+                    holder.disabled.setText(R.string.not_installed);
+                } else if (!entry.info.enabled) {
+                    holder.disabled.setVisibility(View.VISIBLE);
+                    holder.disabled.setText(R.string.disabled);
                 } else {
                     holder.disabled.setVisibility(View.GONE);
                 }
@@ -865,6 +886,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();
     }
 
 
@@ -919,6 +947,7 @@
         super.onResume();
         mActivityResumed = true;
         updateCurrentTab(mViewPager.getCurrentItem());
+        updateNumTabs();
         updateOptionsMenu();
     }
 
@@ -971,6 +1000,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);
@@ -994,7 +1033,6 @@
     
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        Log.i(TAG, "onCreateOptionsMenu in " + this + ": " + menu);
         mOptionsMenu = menu;
         // note: icons removed for now because the cause the new action
         // bar UI to be very confusing.
@@ -1081,9 +1119,13 @@
     public void onClick(DialogInterface dialog, int which) {
         if (mResetDialog == dialog) {
             final PackageManager pm = getActivity().getPackageManager();
+            final IPackageManager mIPm = IPackageManager.Stub.asInterface(
+                    ServiceManager.getService("package"));
             final INotificationManager nm = INotificationManager.Stub.asInterface(
                     ServiceManager.getService(Context.NOTIFICATION_SERVICE));
             final NetworkPolicyManager npm = NetworkPolicyManager.from(getActivity());
+            final AppOpsManager aom = (AppOpsManager)getActivity().getSystemService(
+                    Context.APP_OPS_SERVICE);
             final Handler handler = new Handler(getActivity().getMainLooper());
             (new AsyncTask<Void, Void, Void>() {
                 @Override protected Void doInBackground(Void... params) {
@@ -1093,11 +1135,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)
@@ -1108,22 +1148,20 @@
                             }
                         }
                     }
-                    // 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[] restrictedAppIds = npm.getAppsWithPolicy(
+                    aom.resetAllModes();
+                    final int[] restrictedUids = npm.getUidsWithPolicy(
                             POLICY_REJECT_METERED_BACKGROUND);
-                    for (int i : restrictedAppIds) {
-                        if (DEBUG) Log.v(TAG, "Clearing data policy: " + i);
-                        npm.setAppPolicy(i, POLICY_NONE);
+                    final int currentUserId = ActivityManager.getCurrentUser();
+                    for (int uid : restrictedUids) {
+                        // Only reset for current user
+                        if (UserHandle.getUserId(uid) == currentUserId) {
+                            if (DEBUG) Log.v(TAG, "Clearing data policy: " + uid);
+                            npm.setUidPolicy(uid, POLICY_NONE);
+                        }
                     }
                     handler.post(new Runnable() {
                         @Override public void run() {
diff --git a/src/com/android/settings/applications/ProcStatsEntry.java b/src/com/android/settings/applications/ProcStatsEntry.java
new file mode 100644
index 0000000..0821ced
--- /dev/null
+++ b/src/com/android/settings/applications/ProcStatsEntry.java
@@ -0,0 +1,353 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.util.ArrayMap;
+import android.util.Log;
+import com.android.internal.app.ProcessStats;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+
+public final class ProcStatsEntry implements Parcelable {
+    private static final String TAG = "ProcStatsEntry";
+    private static boolean DEBUG = ProcessStatsUi.DEBUG;
+
+    final String mPackage;
+    final int mUid;
+    final String mName;
+    final ArrayList<String> mPackages = new ArrayList<String>();
+    final long mDuration;
+    final long mAvgPss;
+    final long mMaxPss;
+    final long mAvgUss;
+    final long mMaxUss;
+    final long mWeight;
+
+    String mBestTargetPackage;
+
+    ArrayMap<String, ArrayList<Service>> mServices = new ArrayMap<String, ArrayList<Service>>(1);
+
+    public ApplicationInfo mUiTargetApp;
+    public String mUiLabel;
+    public String mUiBaseLabel;
+    public String mUiPackage;
+
+    public ProcStatsEntry(ProcessStats.ProcessState proc, String packageName,
+            ProcessStats.ProcessDataCollection tmpTotals, boolean useUss, boolean weightWithTime) {
+        ProcessStats.computeProcessData(proc, tmpTotals, 0);
+        mPackage = proc.mPackage;
+        mUid = proc.mUid;
+        mName = proc.mName;
+        mPackages.add(packageName);
+        mDuration = tmpTotals.totalTime;
+        mAvgPss = tmpTotals.avgPss;
+        mMaxPss = tmpTotals.maxPss;
+        mAvgUss = tmpTotals.avgUss;
+        mMaxUss = tmpTotals.maxUss;
+        mWeight = (weightWithTime ? mDuration : 1) * (useUss ? mAvgUss : mAvgPss);
+        if (DEBUG) Log.d(TAG, "New proc entry " + proc.mName + ": dur=" + mDuration
+                + " avgpss=" + mAvgPss + " weight=" + mWeight);
+    }
+
+    public ProcStatsEntry(Parcel in) {
+        mPackage = in.readString();
+        mUid = in.readInt();
+        mName = in.readString();
+        in.readStringList(mPackages);
+        mDuration = in.readLong();
+        mAvgPss = in.readLong();
+        mMaxPss = in.readLong();
+        mAvgUss = in.readLong();
+        mMaxUss = in.readLong();
+        mWeight = in.readLong();
+        mBestTargetPackage = in.readString();
+        final int N = in.readInt();
+        if (N > 0) {
+            mServices.ensureCapacity(N);
+            for (int i=0; i<N; i++) {
+                String key = in.readString();
+                ArrayList<Service> value = new ArrayList<Service>();
+                in.readTypedList(value, Service.CREATOR);
+                mServices.append(key, value);
+            }
+        }
+    }
+
+    public void addPackage(String packageName) {
+        mPackages.add(packageName);
+    }
+
+    public void evaluateTargetPackage(PackageManager pm, ProcessStats stats,
+            ProcessStats.ProcessDataCollection totals, Comparator<ProcStatsEntry> compare,
+            boolean useUss, boolean weightWithTime) {
+        mBestTargetPackage = null;
+        if (mPackages.size() == 1) {
+            if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": single pkg " + mPackages.get(0));
+            mBestTargetPackage = mPackages.get(0);
+        } else {
+            // See if there is one significant package that was running here.
+            ArrayList<ProcStatsEntry> subProcs = new ArrayList<ProcStatsEntry>();
+            for (int ipkg=0; ipkg<mPackages.size(); ipkg++) {
+                ProcessStats.PackageState pkgState = stats.mPackages.get(mPackages.get(ipkg), mUid);
+                if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ", pkg "
+                        + mPackages.get(ipkg) + ":");
+                if (pkgState == null) {
+                    Log.w(TAG, "No package state found for " + mPackages.get(ipkg) + "/"
+                            + mUid + " in process " + mName);
+                    continue;
+                }
+                ProcessStats.ProcessState pkgProc = pkgState.mProcesses.get(mName);
+                if (pkgProc == null) {
+                    Log.w(TAG, "No process " + mName + " found in package state "
+                            + mPackages.get(ipkg) + "/" + mUid);
+                    continue;
+                }
+                subProcs.add(new ProcStatsEntry(pkgProc, pkgState.mPackageName, totals, useUss,
+                        weightWithTime));
+            }
+            if (subProcs.size() > 1) {
+                Collections.sort(subProcs, compare);
+                if (subProcs.get(0).mWeight > (subProcs.get(1).mWeight*3)) {
+                    if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": best pkg "
+                            + subProcs.get(0).mPackage + " weight " + subProcs.get(0).mWeight
+                            + " better than " + subProcs.get(1).mPackage
+                            + " weight " + subProcs.get(1).mWeight);
+                    mBestTargetPackage = subProcs.get(0).mPackage;
+                    return;
+                }
+                // Couldn't find one that is best by weight, let's decide on best another
+                // way: the one that has the longest running service, accounts for at least
+                // half of the maximum weight, and has specified an explicit app icon.
+                long maxWeight = subProcs.get(0).mWeight;
+                long bestRunTime = -1;
+                for (int i=0; i<subProcs.size(); i++) {
+                    if (subProcs.get(i).mWeight < (maxWeight/2)) {
+                        if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                                + subProcs.get(i).mPackage + " weight " + subProcs.get(i).mWeight
+                                + " too small");
+                        continue;
+                    }
+                    try {
+                        ApplicationInfo ai = pm.getApplicationInfo(subProcs.get(i).mPackage, 0);
+                        if (ai.icon == 0) {
+                            if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                                    + subProcs.get(i).mPackage + " has no icon");
+                            continue;
+                        }
+                    } catch (PackageManager.NameNotFoundException e) {
+                        if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                                + subProcs.get(i).mPackage + " failed finding app info");
+                        continue;
+                    }
+                    ArrayList<Service> subProcServices = null;
+                    for (int isp=0, NSP=mServices.size(); isp<NSP; isp++) {
+                        ArrayList<Service> subServices = mServices.valueAt(isp);
+                        if (subServices.get(0).mPackage.equals(subProcs.get(i).mPackage)) {
+                            subProcServices = subServices;
+                            break;
+                        }
+                    }
+                    long thisRunTime = 0;
+                    if (subProcServices != null) {
+                        for (int iss=0, NSS=subProcServices.size(); iss<NSS; iss++) {
+                            Service service = subProcServices.get(iss);
+                            if (service.mDuration > thisRunTime) {
+                                if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                                        + subProcs.get(i).mPackage + " service " + service.mName
+                                        + " run time is " + service.mDuration);
+                                thisRunTime = service.mDuration;
+                                break;
+                            }
+                        }
+                    }
+                    if (thisRunTime > bestRunTime) {
+                        if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                                + subProcs.get(i).mPackage + " new best run time " + thisRunTime);
+                        mBestTargetPackage = subProcs.get(i).mPackage;
+                        bestRunTime = thisRunTime;
+                    } else {
+                        if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                                + subProcs.get(i).mPackage + " run time " + thisRunTime
+                                + " not as good as last " + bestRunTime);
+                    }
+                }
+            } else if (subProcs.size() == 1) {
+                mBestTargetPackage = subProcs.get(0).mPackage;
+            }
+        }
+    }
+
+    public void retrieveUiData(PackageManager pm) {
+        mUiTargetApp = null;
+        mUiLabel = mUiBaseLabel = mName;
+        mUiPackage = mBestTargetPackage;
+        if (mUiPackage != null) {
+            // Only one app associated with this process.
+            try {
+                mUiTargetApp = pm.getApplicationInfo(mUiPackage,
+                        PackageManager.GET_DISABLED_COMPONENTS |
+                        PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS |
+                        PackageManager.GET_UNINSTALLED_PACKAGES);
+                String name = mUiBaseLabel = mUiTargetApp.loadLabel(pm).toString();
+                if (mName.equals(mUiPackage)) {
+                    mUiLabel = name;
+                } else {
+                    if (mName.startsWith(mUiPackage)) {
+                        int off = mUiPackage.length();
+                        if (mName.length() > off) {
+                            off++;
+                        }
+                        mUiLabel = name + " (" + mName.substring(off) + ")";
+                    } else {
+                        mUiLabel = name + " (" + mName + ")";
+                    }
+                }
+            } catch (PackageManager.NameNotFoundException e) {
+            }
+        }
+        if (mUiTargetApp == null) {
+            String[] packages = pm.getPackagesForUid(mUid);
+            if (packages != null) {
+                for (String curPkg : packages) {
+                    try {
+                        final PackageInfo pi = pm.getPackageInfo(curPkg,
+                                PackageManager.GET_DISABLED_COMPONENTS |
+                                PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS |
+                                PackageManager.GET_UNINSTALLED_PACKAGES);
+                        if (pi.sharedUserLabel != 0) {
+                            mUiTargetApp = pi.applicationInfo;
+                            final CharSequence nm = pm.getText(curPkg,
+                                    pi.sharedUserLabel, pi.applicationInfo);
+                            if (nm != null) {
+                                mUiBaseLabel = nm.toString();
+                                mUiLabel = mUiBaseLabel + " (" + mName + ")";
+                            } else {
+                                mUiBaseLabel = mUiTargetApp.loadLabel(pm).toString();
+                                mUiLabel = mUiBaseLabel + " (" + mName + ")";
+                            }
+                            break;
+                        }
+                    } catch (PackageManager.NameNotFoundException e) {
+                    }
+                }
+            } else {
+                // no current packages for this uid, typically because of uninstall
+                Log.i(TAG, "No package for uid " + mUid);
+            }
+        }
+    }
+
+    public void addService(ProcessStats.ServiceState svc) {
+        ArrayList<Service> services = mServices.get(svc.mPackage);
+        if (services == null) {
+            services = new ArrayList<Service>();
+            mServices.put(svc.mPackage, services);
+        }
+        services.add(new Service(svc));
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(mPackage);
+        dest.writeInt(mUid);
+        dest.writeString(mName);
+        dest.writeStringList(mPackages);
+        dest.writeLong(mDuration);
+        dest.writeLong(mAvgPss);
+        dest.writeLong(mMaxPss);
+        dest.writeLong(mAvgUss);
+        dest.writeLong(mMaxUss);
+        dest.writeLong(mWeight);
+        dest.writeString(mBestTargetPackage);
+        final int N = mServices.size();
+        dest.writeInt(N);
+        for (int i=0; i<N; i++) {
+            dest.writeString(mServices.keyAt(i));
+            dest.writeTypedList(mServices.valueAt(i));
+        }
+    }
+
+    public static final Parcelable.Creator<ProcStatsEntry> CREATOR
+            = new Parcelable.Creator<ProcStatsEntry>() {
+        public ProcStatsEntry createFromParcel(Parcel in) {
+            return new ProcStatsEntry(in);
+        }
+
+        public ProcStatsEntry[] newArray(int size) {
+            return new ProcStatsEntry[size];
+        }
+    };
+
+    public static final class Service implements Parcelable {
+        final String mPackage;
+        final String mName;
+        final String mProcess;
+        final long mDuration;
+
+        public Service(ProcessStats.ServiceState service) {
+            mPackage = service.mPackage;
+            mName = service.mName;
+            mProcess = service.mProcessName;
+            mDuration = ProcessStats.dumpSingleServiceTime(null, null, service,
+                    ProcessStats.ServiceState.SERVICE_RUN,
+                    ProcessStats.STATE_NOTHING, 0, 0);
+        }
+
+        public Service(Parcel in) {
+            mPackage = in.readString();
+            mName = in.readString();
+            mProcess = in.readString();
+            mDuration = in.readLong();
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeString(mPackage);
+            dest.writeString(mName);
+            dest.writeString(mProcess);
+            dest.writeLong(mDuration);
+        }
+
+        public static final Parcelable.Creator<Service> CREATOR
+                = new Parcelable.Creator<Service>() {
+            public Service createFromParcel(Parcel in) {
+                return new Service(in);
+            }
+
+            public Service[] newArray(int size) {
+                return new Service[size];
+            }
+        };
+    }
+}
diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java
new file mode 100644
index 0000000..326ca7b
--- /dev/null
+++ b/src/com/android/settings/applications/ProcessStatsDetail.java
@@ -0,0 +1,317 @@
+/*
+ * 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.ActivityManager;
+import android.app.Fragment;
+import android.app.admin.DevicePolicyManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Process;
+import android.os.UserHandle;
+import android.preference.PreferenceActivity;
+import android.text.format.Formatter;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import com.android.settings.R;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+
+import static com.android.settings.Utils.prepareCustomPreferencesList;
+
+public class ProcessStatsDetail extends Fragment implements Button.OnClickListener {
+    private static final String TAG = "ProcessStatsDetail";
+
+    public static final int ACTION_FORCE_STOP = 1;
+
+    public static final String EXTRA_ENTRY = "entry";
+    public static final String EXTRA_USE_USS = "use_uss";
+    public static final String EXTRA_MAX_WEIGHT = "max_weight";
+    public static final String EXTRA_TOTAL_TIME = "total_time";
+
+    private PackageManager mPm;
+    private DevicePolicyManager mDpm;
+
+    private ProcStatsEntry mEntry;
+    private boolean mUseUss;
+    private long mMaxWeight;
+    private long mTotalTime;
+
+    private View mRootView;
+    private TextView mTitleView;
+    private ViewGroup mTwoButtonsPanel;
+    private Button mForceStopButton;
+    private Button mReportButton;
+    private ViewGroup mDetailsParent;
+    private ViewGroup mServicesParent;
+
+    public static String makePercentString(Resources res, long amount, long total) {
+        final double percent = (((double)amount) / total) * 100;
+        return res.getString(R.string.percentage, (int) Math.round(percent));
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        mPm = getActivity().getPackageManager();
+        mDpm = (DevicePolicyManager)getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
+        final Bundle args = getArguments();
+        mEntry = (ProcStatsEntry)args.getParcelable(EXTRA_ENTRY);
+        mEntry.retrieveUiData(mPm);
+        mUseUss = args.getBoolean(EXTRA_USE_USS);
+        mMaxWeight = args.getLong(EXTRA_MAX_WEIGHT);
+        mTotalTime = args.getLong(EXTRA_TOTAL_TIME);
+    }
+
+    @Override
+    public View onCreateView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        final View view = inflater.inflate(R.layout.process_stats_details, container, false);
+        prepareCustomPreferencesList(container, view, view, false);
+
+        mRootView = view;
+        createDetails();
+        return view;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        checkForceStop();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+    }
+
+    private void createDetails() {
+        final double percentOfWeight = (((double)mEntry.mWeight) / mMaxWeight) * 100;
+
+        int appLevel = (int) Math.ceil(percentOfWeight);
+        String appLevelText = makePercentString(getResources(), mEntry.mDuration, mTotalTime);
+
+        // Set all values in the header.
+        final TextView summary = (TextView) mRootView.findViewById(android.R.id.summary);
+        summary.setText(mEntry.mName);
+        summary.setVisibility(View.VISIBLE);
+        mTitleView = (TextView) mRootView.findViewById(android.R.id.title);
+        mTitleView.setText(mEntry.mUiBaseLabel);
+        final TextView text1 = (TextView)mRootView.findViewById(android.R.id.text1);
+        text1.setText(appLevelText);
+        final ProgressBar progress = (ProgressBar) mRootView.findViewById(android.R.id.progress);
+        progress.setProgress(appLevel);
+        final ImageView icon = (ImageView) mRootView.findViewById(android.R.id.icon);
+        if (mEntry.mUiTargetApp != null) {
+            icon.setImageDrawable(mEntry.mUiTargetApp.loadIcon(mPm));
+        }
+
+        mTwoButtonsPanel = (ViewGroup)mRootView.findViewById(R.id.two_buttons_panel);
+        mForceStopButton = (Button)mRootView.findViewById(R.id.right_button);
+        mReportButton = (Button)mRootView.findViewById(R.id.left_button);
+        mForceStopButton.setEnabled(false);
+        mReportButton.setVisibility(View.INVISIBLE);
+
+        mDetailsParent = (ViewGroup)mRootView.findViewById(R.id.details);
+        mServicesParent = (ViewGroup)mRootView.findViewById(R.id.services);
+
+        fillDetailsSection();
+        fillServicesSection();
+
+        if (mEntry.mUid >= android.os.Process.FIRST_APPLICATION_UID) {
+            mForceStopButton.setText(R.string.force_stop);
+            mForceStopButton.setTag(ACTION_FORCE_STOP);
+            mForceStopButton.setOnClickListener(this);
+            mTwoButtonsPanel.setVisibility(View.VISIBLE);
+        } else {
+            mTwoButtonsPanel.setVisibility(View.GONE);
+        }
+    }
+
+    public void onClick(View v) {
+        doAction((Integer) v.getTag());
+    }
+
+    private void doAction(int action) {
+        PreferenceActivity pa = (PreferenceActivity)getActivity();
+        switch (action) {
+            case ACTION_FORCE_STOP:
+                killProcesses();
+                break;
+        }
+    }
+
+    private void addPackageHeaderItem(ViewGroup parent, String packageName) {
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        ViewGroup item = (ViewGroup) inflater.inflate(R.layout.running_processes_item,
+                null);
+        parent.addView(item);
+        final ImageView icon = (ImageView) item.findViewById(R.id.icon);
+        TextView nameView = (TextView) item.findViewById(R.id.name);
+        TextView descriptionView = (TextView) item.findViewById(R.id.description);
+        try {
+            ApplicationInfo ai = mPm.getApplicationInfo(packageName, 0);
+            icon.setImageDrawable(ai.loadIcon(mPm));
+            nameView.setText(ai.loadLabel(mPm));
+        } catch (PackageManager.NameNotFoundException e) {
+        }
+        descriptionView.setText(packageName);
+    }
+
+    private void addDetailsItem(ViewGroup parent, CharSequence label, CharSequence value) {
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        ViewGroup item = (ViewGroup) inflater.inflate(R.layout.power_usage_detail_item_text,
+                null);
+        parent.addView(item);
+        TextView labelView = (TextView) item.findViewById(R.id.label);
+        TextView valueView = (TextView) item.findViewById(R.id.value);
+        labelView.setText(label);
+        valueView.setText(value);
+    }
+
+    private void fillDetailsSection() {
+        addDetailsItem(mDetailsParent, getResources().getText(R.string.process_stats_avg_ram_use),
+                Formatter.formatShortFileSize(getActivity(),
+                        (mUseUss ? mEntry.mAvgUss : mEntry.mAvgPss) * 1024));
+        addDetailsItem(mDetailsParent, getResources().getText(R.string.process_stats_max_ram_use),
+                Formatter.formatShortFileSize(getActivity(),
+                        (mUseUss ? mEntry.mMaxUss : mEntry.mMaxPss) * 1024));
+        addDetailsItem(mDetailsParent, getResources().getText(R.string.process_stats_run_time),
+                makePercentString(getResources(), mEntry.mDuration, mTotalTime));
+    }
+
+    final static Comparator<ProcStatsEntry.Service> sServiceCompare
+            = new Comparator<ProcStatsEntry.Service>() {
+        @Override
+        public int compare(ProcStatsEntry.Service lhs, ProcStatsEntry.Service rhs) {
+            if (lhs.mDuration < rhs.mDuration) {
+                return 1;
+            } else if (lhs.mDuration > rhs.mDuration) {
+                return -1;
+            }
+            return 0;
+        }
+    };
+
+    final static Comparator<ArrayList<ProcStatsEntry.Service>> sServicePkgCompare
+            = new Comparator<ArrayList<ProcStatsEntry.Service>>() {
+        @Override
+        public int compare(ArrayList<ProcStatsEntry.Service> lhs,
+                ArrayList<ProcStatsEntry.Service> rhs) {
+            long topLhs = lhs.size() > 0 ? lhs.get(0).mDuration : 0;
+            long topRhs = rhs.size() > 0 ? rhs.get(0).mDuration : 0;
+            if (topLhs < topRhs) {
+                return 1;
+            } else if (topLhs > topRhs) {
+                return -1;
+            }
+            return 0;
+        }
+    };
+
+    private void fillServicesSection() {
+        if (mEntry.mServices.size() > 0) {
+            boolean addPackageSections = false;
+            // Sort it all.
+            ArrayList<ArrayList<ProcStatsEntry.Service>> servicePkgs
+                    = new ArrayList<ArrayList<ProcStatsEntry.Service>>();
+            for (int ip=0; ip<mEntry.mServices.size(); ip++) {
+                ArrayList<ProcStatsEntry.Service> services =
+                        (ArrayList<ProcStatsEntry.Service>)mEntry.mServices.valueAt(ip).clone();
+                Collections.sort(services, sServiceCompare);
+                servicePkgs.add(services);
+            }
+            if (mEntry.mServices.size() > 1
+                    || !mEntry.mServices.valueAt(0).get(0).mPackage.equals(mEntry.mPackage)) {
+                addPackageSections = true;
+                // Sort these so that the one(s) with the longest run durations are on top.
+                Collections.sort(servicePkgs, sServicePkgCompare);
+            }
+            for (int ip=0; ip<servicePkgs.size(); ip++) {
+                ArrayList<ProcStatsEntry.Service> services = servicePkgs.get(ip);
+                if (addPackageSections) {
+                    addPackageHeaderItem(mServicesParent, services.get(0).mPackage);
+                }
+                for (int is=0; is<services.size(); is++) {
+                    ProcStatsEntry.Service service = services.get(is);
+                    String label = service.mName;
+                    int tail = label.lastIndexOf('.');
+                    if (tail >= 0 && tail < (label.length()-1)) {
+                        label = label.substring(tail+1);
+                    }
+                    long duration = service.mDuration;
+                    final double percentOfTime = (((double)duration) / mTotalTime) * 100;
+                    addDetailsItem(mServicesParent, label, getActivity().getResources().getString(
+                            R.string.percentage, (int) Math.ceil(percentOfTime)));
+                }
+            }
+        }
+    }
+
+    private void killProcesses() {
+        ActivityManager am = (ActivityManager)getActivity().getSystemService(
+                Context.ACTIVITY_SERVICE);
+        am.forceStopPackage(mEntry.mUiPackage);
+        checkForceStop();
+    }
+
+    private final BroadcastReceiver mCheckKillProcessesReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            mForceStopButton.setEnabled(getResultCode() != Activity.RESULT_CANCELED);
+        }
+    };
+
+    private void checkForceStop() {
+        if (mEntry.mUiPackage == null || mEntry.mUid < Process.FIRST_APPLICATION_UID) {
+            mForceStopButton.setEnabled(false);
+            return;
+        }
+        if (mDpm.packageHasActiveAdmins(mEntry.mUiPackage)) {
+            mForceStopButton.setEnabled(false);
+            return;
+        }
+        try {
+            ApplicationInfo info = mPm.getApplicationInfo(mEntry.mUiPackage, 0);
+            if ((info.flags&ApplicationInfo.FLAG_STOPPED) == 0) {
+                mForceStopButton.setEnabled(true);
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+        }
+        Intent intent = new Intent(Intent.ACTION_QUERY_PACKAGE_RESTART,
+                Uri.fromParts("package", mEntry.mUiPackage, null));
+        intent.putExtra(Intent.EXTRA_PACKAGES, new String[] { mEntry.mUiPackage });
+        intent.putExtra(Intent.EXTRA_UID, mEntry.mUid);
+        intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.getUserId(mEntry.mUid));
+        getActivity().sendOrderedBroadcast(intent, null, mCheckKillProcessesReceiver, null,
+                Activity.RESULT_CANCELED, null, null);
+    }
+}
diff --git a/src/com/android/settings/applications/ProcessStatsPreference.java b/src/com/android/settings/applications/ProcessStatsPreference.java
new file mode 100644
index 0000000..bf2676d
--- /dev/null
+++ b/src/com/android/settings/applications/ProcessStatsPreference.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.preference.Preference;
+import android.text.format.Formatter;
+import android.view.View;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import com.android.settings.R;
+
+public class ProcessStatsPreference extends Preference {
+    private final ProcStatsEntry mEntry;
+    private int mProgress;
+    private CharSequence mProgressText;
+
+    public ProcessStatsPreference(Context context, Drawable icon, ProcStatsEntry entry) {
+        super(context);
+        mEntry = entry;
+        setLayoutResource(R.layout.app_percentage_item);
+        setIcon(icon != null ? icon : new ColorDrawable(0));
+    }
+
+    public ProcStatsEntry getEntry() {
+        return mEntry;
+    }
+
+    public void setPercent(double percentOfWeight, double percentOfTime) {
+        mProgress = (int) Math.ceil(percentOfWeight);
+        mProgressText = getContext().getResources().getString(
+                R.string.percentage, (int) Math.round(percentOfTime));
+        notifyChanged();
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        final ProgressBar progress = (ProgressBar) view.findViewById(android.R.id.progress);
+        progress.setProgress(mProgress);
+
+        final TextView text1 = (TextView) view.findViewById(android.R.id.text1);
+        text1.setText(mProgressText);
+    }
+}
diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java
new file mode 100644
index 0000000..8322ea3
--- /dev/null
+++ b/src/com/android/settings/applications/ProcessStatsUi.java
@@ -0,0 +1,612 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.ParcelFileDescriptor;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemClock;
+import android.os.UserManager;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceScreen;
+import android.util.Log;
+import android.util.SparseArray;
+import android.util.TimeUtils;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.SubMenu;
+import com.android.internal.app.IProcessStats;
+import com.android.internal.app.ProcessMap;
+import com.android.internal.app.ProcessStats;
+import com.android.settings.R;
+import com.android.settings.fuelgauge.Utils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+
+public class ProcessStatsUi extends PreferenceFragment
+        implements LinearColorBar.OnRegionTappedListener {
+    static final String TAG = "ProcessStatsUi";
+    static final boolean DEBUG = false;
+
+    private static final String KEY_APP_LIST = "app_list";
+    private static final String KEY_MEM_STATUS = "mem_status";
+
+    private static final int NUM_DURATIONS = 4;
+
+    private static final int MENU_STATS_REFRESH = Menu.FIRST;
+    private static final int MENU_DURATION = Menu.FIRST + 1;
+    private static final int MENU_SHOW_SYSTEM = MENU_DURATION + NUM_DURATIONS;
+    private static final int MENU_USE_USS = MENU_SHOW_SYSTEM + 1;
+    private static final int MENU_TYPE_BACKGROUND = MENU_USE_USS + 1;
+    private static final int MENU_TYPE_FOREGROUND = MENU_TYPE_BACKGROUND + 1;
+    private static final int MENU_TYPE_CACHED = MENU_TYPE_FOREGROUND + 1;
+    private static final int MENU_HELP = MENU_TYPE_CACHED + 1;
+
+    static final int MAX_ITEMS_TO_LIST = 60;
+
+    final static Comparator<ProcStatsEntry> sEntryCompare = new Comparator<ProcStatsEntry>() {
+        @Override
+        public int compare(ProcStatsEntry lhs, ProcStatsEntry rhs) {
+            if (lhs.mWeight < rhs.mWeight) {
+                return 1;
+            } else if (lhs.mWeight > rhs.mWeight) {
+                return -1;
+            } else if (lhs.mDuration < rhs.mDuration) {
+                return 1;
+            } else if (lhs.mDuration > rhs.mDuration) {
+                return -1;
+            }
+            return 0;
+        }
+    };
+
+    private static ProcessStats sStatsXfer;
+
+    IProcessStats mProcessStats;
+    UserManager mUm;
+    ProcessStats mStats;
+    int mMemState;
+
+    private long mDuration;
+    private long mLastDuration;
+    private boolean mShowSystem;
+    private boolean mUseUss;
+    private int mStatsType;
+    private int mMemRegion;
+
+    private MenuItem[] mDurationMenus = new MenuItem[NUM_DURATIONS];
+    private MenuItem mShowSystemMenu;
+    private MenuItem mUseUssMenu;
+    private MenuItem mTypeBackgroundMenu;
+    private MenuItem mTypeForegroundMenu;
+    private MenuItem mTypeCachedMenu;
+
+    private PreferenceGroup mAppListGroup;
+    private Preference mMemStatusPref;
+
+    long mMaxWeight;
+    long mTotalTime;
+
+    // The actual duration value to use for each duration option.  Note these
+    // are lower than the actual duration, since our durations are computed in
+    // batches of 3 hours so we want to allow the time we use to be slightly
+    // smaller than the actual time selected instead of bumping up to 3 hours
+    // beyond it.
+    private static final long DURATION_QUANTUM = ProcessStats.COMMIT_PERIOD;
+    private static long[] sDurations = new long[] {
+        3*60*60*1000 - DURATION_QUANTUM/2, 6*60*60*1000 - DURATION_QUANTUM/2,
+        12*60*60*1000 - DURATION_QUANTUM/2, 24*60*60*1000 - DURATION_QUANTUM/2
+    };
+    private static int[] sDurationLabels = new int[] {
+            R.string.menu_duration_3h, R.string.menu_duration_6h,
+            R.string.menu_duration_12h, R.string.menu_duration_1d
+    };
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        if (icicle != null) {
+            mStats = sStatsXfer;
+        }
+
+        addPreferencesFromResource(R.xml.process_stats_summary);
+        mProcessStats = IProcessStats.Stub.asInterface(
+                ServiceManager.getService(ProcessStats.SERVICE_NAME));
+        mUm = (UserManager)getActivity().getSystemService(Context.USER_SERVICE);
+        mAppListGroup = (PreferenceGroup) findPreference(KEY_APP_LIST);
+        mMemStatusPref = mAppListGroup.findPreference(KEY_MEM_STATUS);
+        mDuration = icicle != null ? icicle.getLong("duration", sDurations[0]) : sDurations[0];
+        mShowSystem = icicle != null ? icicle.getBoolean("show_system") : false;
+        mUseUss = icicle != null ? icicle.getBoolean("use_uss") : false;
+        mStatsType = icicle != null ? icicle.getInt("stats_type", MENU_TYPE_BACKGROUND)
+                : MENU_TYPE_BACKGROUND;
+        mMemRegion = icicle != null ? icicle.getInt("mem_region", LinearColorBar.REGION_GREEN)
+                : LinearColorBar.REGION_GREEN;
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        refreshStats();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putLong("duration", mDuration);
+        outState.putBoolean("show_system", mShowSystem);
+        outState.putBoolean("use_uss", mUseUss);
+        outState.putInt("stats_type", mStatsType);
+        outState.putInt("mem_region", mMemRegion);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (getActivity().isChangingConfigurations()) {
+            sStatsXfer = mStats;
+        }
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        if (!(preference instanceof ProcessStatsPreference)) {
+            return false;
+        }
+
+        ProcessStatsPreference pgp = (ProcessStatsPreference) preference;
+        Bundle args = new Bundle();
+        args.putParcelable(ProcessStatsDetail.EXTRA_ENTRY, pgp.getEntry());
+        args.putBoolean(ProcessStatsDetail.EXTRA_USE_USS, mUseUss);
+        args.putLong(ProcessStatsDetail.EXTRA_MAX_WEIGHT, mMaxWeight);
+        args.putLong(ProcessStatsDetail.EXTRA_TOTAL_TIME, mTotalTime);
+        ((PreferenceActivity) getActivity()).startPreferencePanel(
+                ProcessStatsDetail.class.getName(), args, R.string.details_title, null, null, 0);
+
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        MenuItem refresh = menu.add(0, MENU_STATS_REFRESH, 0, R.string.menu_stats_refresh)
+                .setIcon(R.drawable.ic_menu_refresh_holo_dark)
+                .setAlphabeticShortcut('r');
+        refresh.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
+                MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+        SubMenu subMenu = menu.addSubMenu(R.string.menu_proc_stats_duration);
+        for (int i=0; i<NUM_DURATIONS; i++) {
+            mDurationMenus[i] = subMenu.add(0, MENU_DURATION+i, 0, sDurationLabels[i])
+                            .setCheckable(true);
+        }
+        mShowSystemMenu = menu.add(0, MENU_SHOW_SYSTEM, 0, R.string.menu_show_system)
+                .setAlphabeticShortcut('s')
+                .setCheckable(true);
+        mUseUssMenu = menu.add(0, MENU_USE_USS, 0, R.string.menu_use_uss)
+                .setAlphabeticShortcut('u')
+                .setCheckable(true);
+        subMenu = menu.addSubMenu(R.string.menu_proc_stats_type);
+        mTypeBackgroundMenu = subMenu.add(0, MENU_TYPE_BACKGROUND, 0,
+                R.string.menu_proc_stats_type_background)
+                .setAlphabeticShortcut('b')
+                .setCheckable(true);
+        mTypeForegroundMenu = subMenu.add(0, MENU_TYPE_FOREGROUND, 0,
+                R.string.menu_proc_stats_type_foreground)
+                .setAlphabeticShortcut('f')
+                .setCheckable(true);
+        mTypeCachedMenu = subMenu.add(0, MENU_TYPE_CACHED, 0,
+                R.string.menu_proc_stats_type_cached)
+                .setCheckable(true);
+
+        updateMenus();
+
+        /*
+        String helpUrl;
+        if (!TextUtils.isEmpty(helpUrl = getResources().getString(R.string.help_url_battery))) {
+            final MenuItem help = menu.add(0, MENU_HELP, 0, R.string.help_label);
+            HelpUtils.prepareHelpMenuItem(getActivity(), help, helpUrl);
+        }
+        */
+    }
+
+    void updateMenus() {
+        int closestIndex = 0;
+        long closestDelta = Math.abs(sDurations[0]-mDuration);
+        for (int i=1; i<NUM_DURATIONS; i++) {
+            long delta = Math.abs(sDurations[i]-mDuration);
+            if (delta < closestDelta) {
+                closestDelta = delta;
+                closestIndex = i;
+            }
+        }
+        for (int i=0; i<NUM_DURATIONS; i++) {
+            if (mDurationMenus[i] != null) {
+                mDurationMenus[i].setChecked(i == closestIndex);
+            }
+        }
+        mDuration = sDurations[closestIndex];
+        if (mShowSystemMenu != null) {
+            mShowSystemMenu.setChecked(mShowSystem);
+            mShowSystemMenu.setEnabled(mStatsType == MENU_TYPE_BACKGROUND);
+        }
+        if (mUseUssMenu != null) {
+            mUseUssMenu.setChecked(mUseUss);
+        }
+        if (mTypeBackgroundMenu != null) {
+            mTypeBackgroundMenu.setChecked(mStatsType == MENU_TYPE_BACKGROUND);
+        }
+        if (mTypeForegroundMenu != null) {
+            mTypeForegroundMenu.setChecked(mStatsType == MENU_TYPE_FOREGROUND);
+        }
+        if (mTypeCachedMenu != null) {
+            mTypeCachedMenu.setChecked(mStatsType == MENU_TYPE_CACHED);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        final int id = item.getItemId();
+        switch (id) {
+            case MENU_STATS_REFRESH:
+                mStats = null;
+                refreshStats();
+                return true;
+            case MENU_SHOW_SYSTEM:
+                mShowSystem = !mShowSystem;
+                refreshStats();
+                return true;
+            case MENU_USE_USS:
+                mUseUss = !mUseUss;
+                refreshStats();
+                return true;
+            case MENU_TYPE_BACKGROUND:
+            case MENU_TYPE_FOREGROUND:
+            case MENU_TYPE_CACHED:
+                mStatsType = item.getItemId();
+                refreshStats();
+                return true;
+            default:
+                if (id >= MENU_DURATION && id < (MENU_DURATION+NUM_DURATIONS)) {
+                    mDuration = sDurations[id-MENU_DURATION];
+                    refreshStats();
+                }
+                return false;
+        }
+    }
+
+    @Override
+    public void onRegionTapped(int region) {
+        if (mMemRegion != region) {
+            mMemRegion = region;
+            refreshStats();
+        }
+    }
+
+    private void addNotAvailableMessage() {
+        Preference notAvailable = new Preference(getActivity());
+        notAvailable.setTitle(R.string.power_usage_not_available);
+        mAppListGroup.addPreference(notAvailable);
+    }
+
+    public static final int[] BACKGROUND_AND_SYSTEM_PROC_STATES = new int[] {
+            ProcessStats.STATE_PERSISTENT, ProcessStats.STATE_IMPORTANT_FOREGROUND,
+            ProcessStats.STATE_IMPORTANT_BACKGROUND, ProcessStats.STATE_BACKUP,
+            ProcessStats.STATE_HEAVY_WEIGHT, ProcessStats.STATE_SERVICE,
+            ProcessStats.STATE_SERVICE_RESTARTING, ProcessStats.STATE_RECEIVER
+    };
+
+    public static final int[] FOREGROUND_PROC_STATES = new int[] {
+            ProcessStats.STATE_TOP
+    };
+
+    public static final int[] CACHED_PROC_STATES = new int[] {
+            ProcessStats.STATE_CACHED_ACTIVITY, ProcessStats.STATE_CACHED_ACTIVITY_CLIENT,
+            ProcessStats.STATE_CACHED_EMPTY
+    };
+
+    public static final int[] RED_MEM_STATES = new int[] {
+            ProcessStats.ADJ_MEM_FACTOR_CRITICAL
+    };
+
+    public static final int[] YELLOW_MEM_STATES = new int[] {
+            ProcessStats.ADJ_MEM_FACTOR_CRITICAL, ProcessStats.ADJ_MEM_FACTOR_LOW,
+            ProcessStats.ADJ_MEM_FACTOR_MODERATE
+    };
+
+    private String makeDuration(long time) {
+        StringBuilder sb = new StringBuilder(32);
+        TimeUtils.formatDuration(time, sb);
+        return sb.toString();
+    }
+
+    private void refreshStats() {
+        updateMenus();
+
+        if (mStats == null || mLastDuration != mDuration) {
+            load();
+        }
+
+        int[] stats;
+        int statsLabel;
+        if (mStatsType == MENU_TYPE_FOREGROUND) {
+            stats = FOREGROUND_PROC_STATES;
+            statsLabel = R.string.process_stats_type_foreground;
+        } else if (mStatsType == MENU_TYPE_CACHED) {
+            stats = CACHED_PROC_STATES;
+            statsLabel = R.string.process_stats_type_cached;
+        } else {
+            stats = mShowSystem ? BACKGROUND_AND_SYSTEM_PROC_STATES
+                    : ProcessStats.BACKGROUND_PROC_STATES;
+            statsLabel = R.string.process_stats_type_background;
+        }
+
+        mAppListGroup.removeAll();
+        mAppListGroup.setOrderingAsAdded(false);
+
+        mMemStatusPref.setOrder(-2);
+        mAppListGroup.addPreference(mMemStatusPref);
+        String durationString = Utils.formatElapsedTime(getActivity(),
+                mStats.mTimePeriodEndRealtime-mStats.mTimePeriodStartRealtime, false);
+        CharSequence memString;
+        CharSequence[] memStatesStr = getResources().getTextArray(R.array.ram_states);
+        if (mMemState >= 0 && mMemState < memStatesStr.length) {
+            memString = memStatesStr[mMemState];
+        } else {
+            memString = "?";
+        }
+        mMemStatusPref.setTitle(getActivity().getString(R.string.process_stats_total_duration,
+                getActivity().getString(statsLabel), durationString));
+        mMemStatusPref.setSummary(getActivity().getString(R.string.process_stats_memory_status,
+                        memString));
+        /*
+        mMemStatusPref.setTitle(DateFormat.format(DateFormat.getBestDateTimePattern(
+                getActivity().getResources().getConfiguration().locale,
+                "MMMM dd, yyyy h:mm a"), mStats.mTimePeriodStartClock));
+        */
+        /*
+        BatteryHistoryPreference hist = new BatteryHistoryPreference(getActivity(), mStats);
+        hist.setOrder(-1);
+        mAppListGroup.addPreference(hist);
+        */
+
+        long now = SystemClock.uptimeMillis();
+
+        final PackageManager pm = getActivity().getPackageManager();
+
+        mTotalTime = ProcessStats.dumpSingleTime(null, null, mStats.mMemFactorDurations,
+                mStats.mMemFactor, mStats.mStartTime, now);
+        if (DEBUG) Log.d(TAG, "Total time of stats: " + makeDuration(mTotalTime));
+
+        long[] memTimes = new long[ProcessStats.ADJ_MEM_FACTOR_COUNT];
+        for (int iscreen=0; iscreen<ProcessStats.ADJ_COUNT; iscreen+=ProcessStats.ADJ_SCREEN_MOD) {
+            for (int imem=0; imem<ProcessStats.ADJ_MEM_FACTOR_COUNT; imem++) {
+                int state = imem+iscreen;
+                memTimes[imem] += mStats.mMemFactorDurations[state];
+            }
+        }
+
+        long memTotalTime;
+        int[] memStates;
+
+        LinearColorPreference colors = new LinearColorPreference(getActivity());
+        colors.setOrder(-1);
+        colors.setOnRegionTappedListener(this);
+        switch (mMemRegion) {
+            case LinearColorBar.REGION_RED:
+                colors.setColoredRegions(LinearColorBar.REGION_RED);
+                memTotalTime = memTimes[ProcessStats.ADJ_MEM_FACTOR_CRITICAL];
+                memStates = RED_MEM_STATES;
+                break;
+            case LinearColorBar.REGION_YELLOW:
+                colors.setColoredRegions(LinearColorBar.REGION_RED
+                        | LinearColorBar.REGION_YELLOW);
+                memTotalTime = memTimes[ProcessStats.ADJ_MEM_FACTOR_CRITICAL]
+                        + memTimes[ProcessStats.ADJ_MEM_FACTOR_LOW]
+                        + memTimes[ProcessStats.ADJ_MEM_FACTOR_MODERATE];
+                memStates = YELLOW_MEM_STATES;
+                break;
+            default:
+                colors.setColoredRegions(LinearColorBar.REGION_ALL);
+                memTotalTime = mTotalTime;
+                memStates = ProcessStats.ALL_MEM_ADJ;
+                break;
+        }
+        colors.setRatios(memTimes[ProcessStats.ADJ_MEM_FACTOR_CRITICAL] / (float)mTotalTime,
+                (memTimes[ProcessStats.ADJ_MEM_FACTOR_LOW]
+                        + memTimes[ProcessStats.ADJ_MEM_FACTOR_MODERATE]) / (float)mTotalTime,
+                memTimes[ProcessStats.ADJ_MEM_FACTOR_NORMAL] / (float)mTotalTime);
+        mAppListGroup.addPreference(colors);
+
+        ProcessStats.ProcessDataCollection totals = new ProcessStats.ProcessDataCollection(
+                ProcessStats.ALL_SCREEN_ADJ, memStates, stats);
+
+        ArrayList<ProcStatsEntry> entries = new ArrayList<ProcStatsEntry>();
+
+        /*
+        ArrayList<ProcessStats.ProcessState> rawProcs = mStats.collectProcessesLocked(
+                ProcessStats.ALL_SCREEN_ADJ, ProcessStats.ALL_MEM_ADJ,
+                ProcessStats.BACKGROUND_PROC_STATES, now, null);
+        for (int i=0, N=(rawProcs != null ? rawProcs.size() : 0); i<N; i++) {
+            procs.add(new ProcStatsEntry(rawProcs.get(i), totals));
+        }
+        */
+
+        if (DEBUG) Log.d(TAG, "-------------------- PULLING PROCESSES");
+
+        final ProcessMap<ProcStatsEntry> entriesMap = new ProcessMap<ProcStatsEntry>();
+        for (int ipkg=0, N=mStats.mPackages.getMap().size(); ipkg<N; ipkg++) {
+            final SparseArray<ProcessStats.PackageState> pkgUids
+                    = mStats.mPackages.getMap().valueAt(ipkg);
+            for (int iu=0; iu<pkgUids.size(); iu++) {
+                final ProcessStats.PackageState st = pkgUids.valueAt(iu);
+                for (int iproc=0; iproc<st.mProcesses.size(); iproc++) {
+                    final ProcessStats.ProcessState pkgProc = st.mProcesses.valueAt(iproc);
+                    final ProcessStats.ProcessState proc = mStats.mProcesses.get(pkgProc.mName,
+                            pkgProc.mUid);
+                    if (proc == null) {
+                        Log.w(TAG, "No process found for pkg " + st.mPackageName
+                                + "/" + st.mUid + " proc name " + pkgProc.mName);
+                        continue;
+                    }
+                    ProcStatsEntry ent = entriesMap.get(proc.mName, proc.mUid);
+                    if (ent == null) {
+                        ent = new ProcStatsEntry(proc, st.mPackageName, totals, mUseUss,
+                                mStatsType == MENU_TYPE_BACKGROUND);
+                        if (ent.mDuration > 0) {
+                            if (DEBUG) Log.d(TAG, "Adding proc " + proc.mName + "/"
+                                    + proc.mUid + ": time=" + makeDuration(ent.mDuration) + " ("
+                                    + ((((double)ent.mDuration) / memTotalTime) * 100) + "%)"
+                                    + " pss=" + ent.mAvgPss);
+                            entriesMap.put(proc.mName, proc.mUid, ent);
+                            entries.add(ent);
+                        }
+                    }  else {
+                        ent.addPackage(st.mPackageName);
+                    }
+                }
+            }
+        }
+
+        if (DEBUG) Log.d(TAG, "-------------------- MAPPING SERVICES");
+
+        // Add in service info.
+        if (mStatsType == MENU_TYPE_BACKGROUND) {
+            for (int ip=0, N=mStats.mPackages.getMap().size(); ip<N; ip++) {
+                SparseArray<ProcessStats.PackageState> uids = mStats.mPackages.getMap().valueAt(ip);
+                for (int iu=0; iu<uids.size(); iu++) {
+                    ProcessStats.PackageState ps = uids.valueAt(iu);
+                    for (int is=0, NS=ps.mServices.size(); is<NS; is++) {
+                        ProcessStats.ServiceState ss = ps.mServices.valueAt(is);
+                        if (ss.mProcessName != null) {
+                            ProcStatsEntry ent = entriesMap.get(ss.mProcessName, uids.keyAt(iu));
+                            if (ent != null) {
+                                if (DEBUG) Log.d(TAG, "Adding service " + ps.mPackageName
+                                        + "/" + ss.mName + "/" + uids.keyAt(iu) + " to proc "
+                                        + ss.mProcessName);
+                                ent.addService(ss);
+                            } else {
+                                Log.w(TAG, "No process " + ss.mProcessName + "/" + uids.keyAt(iu)
+                                        + " for service " + ss.mName);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        /*
+        SparseArray<ArrayMap<String, ProcStatsEntry>> processes
+                = new SparseArray<ArrayMap<String, ProcStatsEntry>>();
+        for (int ip=0, N=mStats.mProcesses.getMap().size(); ip<N; ip++) {
+            SparseArray<ProcessStats.ProcessState> uids = mStats.mProcesses.getMap().valueAt(ip);
+            for (int iu=0; iu<uids.size(); iu++) {
+                ProcessStats.ProcessState st = uids.valueAt(iu);
+                ProcStatsEntry ent = new ProcStatsEntry(st, totals, mUseUss,
+                        mStatsType == MENU_TYPE_BACKGROUND);
+                if (ent.mDuration > 0) {
+                    if (DEBUG) Log.d(TAG, "Adding proc " + st.mName + "/" + st.mUid + ": time="
+                            + makeDuration(ent.mDuration) + " ("
+                            + ((((double)ent.mDuration) / memTotalTime) * 100) + "%)");
+                    procs.add(ent);
+                    ArrayMap<String, ProcStatsEntry> uidProcs = processes.get(ent.mUid);
+                    if (uidProcs == null) {
+                        uidProcs = new ArrayMap<String, ProcStatsEntry>();
+                        processes.put(ent.mUid, uidProcs);
+                    }
+                    uidProcs.put(ent.mName, ent);
+                }
+            }
+        }
+        */
+
+        Collections.sort(entries, sEntryCompare);
+
+        long maxWeight = 1;
+        for (int i=0, N=(entries != null ? entries.size() : 0); i<N; i++) {
+            ProcStatsEntry proc = entries.get(i);
+            if (maxWeight < proc.mWeight) {
+                maxWeight = proc.mWeight;
+            }
+        }
+        mMaxWeight = maxWeight;
+
+        if (DEBUG) Log.d(TAG, "-------------------- BUILDING UI");
+
+        for (int i=0, N=(entries != null ? entries.size() : 0); i<N; i++) {
+            ProcStatsEntry proc = entries.get(i);
+            final double percentOfWeight = (((double)proc.mWeight) / maxWeight) * 100;
+            final double percentOfTime = (((double)proc.mDuration) / memTotalTime) * 100;
+            if (percentOfWeight < 1 && percentOfTime < 33) {
+                if (DEBUG) Log.d(TAG, "Skipping " + proc.mName + " weight=" + percentOfWeight
+                        + " time=" + percentOfTime);
+                continue;
+            }
+            ProcessStatsPreference pref = new ProcessStatsPreference(getActivity(), null, proc);
+            proc.evaluateTargetPackage(pm, mStats, totals, sEntryCompare, mUseUss,
+                    mStatsType == MENU_TYPE_BACKGROUND);
+            proc.retrieveUiData(pm);
+            pref.setTitle(proc.mUiLabel);
+            if (proc.mUiTargetApp != null) {
+                pref.setIcon(proc.mUiTargetApp.loadIcon(pm));
+            }
+            pref.setOrder(i);
+            pref.setPercent(percentOfWeight, percentOfTime);
+            mAppListGroup.addPreference(pref);
+            if (mAppListGroup.getPreferenceCount() > (MAX_ITEMS_TO_LIST+1)) {
+                if (DEBUG) Log.d(TAG, "Done with UI, hit item limit!");
+                break;
+            }
+        }
+    }
+
+    private void load() {
+        try {
+            mLastDuration = mDuration;
+            mMemState = mProcessStats.getCurrentMemoryState();
+            ParcelFileDescriptor pfd = mProcessStats.getStatsOverTime(mDuration);
+            mStats = new ProcessStats(false);
+            InputStream is = new ParcelFileDescriptor.AutoCloseInputStream(pfd);
+            mStats.read(is);
+            try {
+                is.close();
+            } catch (IOException e) {
+            }
+            if (mStats.mReadError != null) {
+                Log.w(TAG, "Failure reading process stats: " + mStats.mReadError);
+            }
+        } catch (RemoteException e) {
+            Log.e(TAG, "RemoteException:", e);
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java
index bae29c8..8eb0496 100644
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.applications;
 
+import android.text.BidiFormatter;
 import com.android.internal.util.MemInfoReader;
 import com.android.settings.R;
 
@@ -26,6 +27,7 @@
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.SystemClock;
+import android.os.UserHandle;
 import android.preference.PreferenceActivity;
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
@@ -42,6 +44,7 @@
 import android.widget.AbsListView.RecyclerListener;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 
@@ -49,10 +52,12 @@
         implements AdapterView.OnItemClickListener, RecyclerListener,
         RunningState.OnRefreshUiListener {
     
+    final int mMyUserId;
+
     long SECONDARY_SERVER_MEM;
     
     final HashMap<View, ActiveItem> mActiveItems = new HashMap<View, ActiveItem>();
-    
+
     ActivityManager mAm;
     
     RunningState mState;
@@ -167,9 +172,12 @@
                 if (item.mPackageInfo == null && item instanceof RunningState.MergedItem) {
                     // Items for background processes don't normally load
                     // their labels for performance reasons.  Do it now.
-                    ((RunningState.MergedItem)item).mProcess.ensureLabel(pm);
-                    item.mPackageInfo = ((RunningState.MergedItem)item).mProcess.mPackageInfo;
-                    item.mDisplayLabel = ((RunningState.MergedItem)item).mProcess.mDisplayLabel;
+                    RunningState.MergedItem mergedItem = (RunningState.MergedItem)item;
+                    if (mergedItem.mProcess != null) {
+                        ((RunningState.MergedItem)item).mProcess.ensureLabel(pm);
+                        item.mPackageInfo = ((RunningState.MergedItem)item).mProcess.mPackageInfo;
+                        item.mDisplayLabel = ((RunningState.MergedItem)item).mProcess.mDisplayLabel;
+                    }
                 }
                 name.setText(item.mDisplayLabel);
                 ActiveItem ai = new ActiveItem();
@@ -183,9 +191,7 @@
                     description.setText(item.mDescription);
                 }
                 item.mCurSizeStr = null;
-                if (item.mPackageInfo != null) {
-                    icon.setImageDrawable(item.mPackageInfo.loadIcon(pm));
-                }
+                icon.setImageDrawable(item.loadIcon(rootView.getContext(), state));
                 icon.setVisibility(View.VISIBLE);
                 ai.updateTime(rootView.getContext(), builder);
                 return ai;
@@ -203,7 +209,9 @@
         final RunningState mState;
         final LayoutInflater mInflater;
         boolean mShowBackground;
-        ArrayList<RunningState.MergedItem> mItems;
+        ArrayList<RunningState.MergedItem> mOrigItems;
+        final ArrayList<RunningState.MergedItem> mItems
+                = new ArrayList<RunningState.MergedItem>();
         
         ServiceListAdapter(RunningState state) {
             mState = state;
@@ -230,11 +238,17 @@
             ArrayList<RunningState.MergedItem> newItems =
                 mShowBackground ? mState.getCurrentBackgroundItems()
                         : mState.getCurrentMergedItems();
-            if (mItems != newItems) {
-                mItems = newItems;
-            }
-            if (mItems == null) {
-                mItems = new ArrayList<RunningState.MergedItem>();
+            if (mOrigItems != newItems) {
+                mOrigItems = newItems;
+                if (newItems == null) {
+                    mItems.clear();
+                } else {
+                    mItems.clear();
+                    mItems.addAll(newItems);
+                    if (mShowBackground) {
+                        Collections.sort(mItems, mState.mBackgroundComparator);
+                    }
+                }
             }
         }
         
@@ -329,11 +343,14 @@
                 mLastBackgroundProcessMemory = mState.mBackgroundProcessMemory;
                 mLastAvailMemory = availMem;
                 long freeMem = mLastAvailMemory + mLastBackgroundProcessMemory;
-                String sizeStr = Formatter.formatShortFileSize(getContext(), freeMem);
+                BidiFormatter bidiFormatter = BidiFormatter.getInstance();
+                String sizeStr = bidiFormatter.unicodeWrap(
+                        Formatter.formatShortFileSize(getContext(), freeMem));
                 mBackgroundProcessText.setText(getResources().getString(
                         R.string.service_background_processes, sizeStr));
-                sizeStr = Formatter.formatShortFileSize(getContext(),
-                        mMemInfoReader.getTotalSize() - freeMem);
+                sizeStr = bidiFormatter.unicodeWrap(
+                        Formatter.formatShortFileSize(getContext(),
+                                mMemInfoReader.getTotalSize() - freeMem));
                 mForegroundProcessText.setText(getResources().getString(
                         R.string.service_foreground_processes, sizeStr));
             }
@@ -374,8 +391,11 @@
         if (mOwner != null) {
             // start new fragment to display extended information
             Bundle args = new Bundle();
-            args.putInt(RunningServiceDetails.KEY_UID, mi.mProcess.mUid);
-            args.putString(RunningServiceDetails.KEY_PROCESS, mi.mProcess.mProcessName);
+            if (mi.mProcess != null) {
+                args.putInt(RunningServiceDetails.KEY_UID, mi.mProcess.mUid);
+                args.putString(RunningServiceDetails.KEY_PROCESS, mi.mProcess.mProcessName);
+            }
+            args.putInt(RunningServiceDetails.KEY_USER_ID, mi.mUserId);
             args.putBoolean(RunningServiceDetails.KEY_BACKGROUND, mAdapter.mShowBackground);
     
             PreferenceActivity pa = (PreferenceActivity)mOwner.getActivity();
@@ -390,6 +410,7 @@
 
     public RunningProcessesView(Context context, AttributeSet attrs) {
         super(context, attrs);
+        mMyUserId = UserHandle.myUserId();
     }
     
     public void doCreate(Bundle savedInstanceState) {
diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java
index 2087f21..73547f1 100644
--- a/src/com/android/settings/applications/RunningServiceDetails.java
+++ b/src/com/android/settings/applications/RunningServiceDetails.java
@@ -1,7 +1,5 @@
 package com.android.settings.applications;
 
-import com.android.settings.R;
-
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.AlertDialog;
@@ -18,14 +16,15 @@
 import android.content.IntentSender;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ProviderInfo;
 import android.content.pm.ServiceInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Debug;
 import android.os.Handler;
 import android.os.SystemClock;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -34,40 +33,46 @@
 import android.widget.Button;
 import android.widget.TextView;
 
+import com.android.settings.R;
+import com.android.settings.Utils;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 
 public class RunningServiceDetails extends Fragment
         implements RunningState.OnRefreshUiListener {
     static final String TAG = "RunningServicesDetails";
-    
+
     static final String KEY_UID = "uid";
+    static final String KEY_USER_ID = "user_id";
     static final String KEY_PROCESS = "process";
     static final String KEY_BACKGROUND = "background";
-    
+
     static final int DIALOG_CONFIRM_STOP = 1;
-    
+
     ActivityManager mAm;
     LayoutInflater mInflater;
-    
+
     RunningState mState;
     boolean mHaveData;
-    
+
     int mUid;
+    int mUserId;
     String mProcessName;
     boolean mShowBackground;
-    
+
     RunningState.MergedItem mMergedItem;
-    
+
     View mRootView;
     ViewGroup mAllDetails;
     ViewGroup mSnippet;
     RunningProcessesView.ActiveItem mSnippetActiveItem;
     RunningProcessesView.ViewHolder mSnippetViewHolder;
-    
+
     int mNumServices, mNumProcesses;
     
     TextView mServicesHeader;
@@ -195,8 +200,14 @@
         if (newItems != null) {
             for (int i=0; i<newItems.size(); i++) {
                 RunningState.MergedItem mi = newItems.get(i);
-                if (mi.mProcess.mUid == mUid
-                        && mi.mProcess.mProcessName.equals(mProcessName)) {
+                if (mi.mUserId != mUserId) {
+                    continue;
+                }
+                if (mUid >= 0 && mi.mProcess != null && mi.mProcess.mUid != mUid) {
+                    continue;
+                }
+                if (mProcessName == null || (mi.mProcess != null
+                        && mProcessName.equals(mi.mProcess.mProcessName))) {
                     item = mi;
                     break;
                 }
@@ -209,8 +220,8 @@
         }
         return false;
     }
-    
-    void addServiceDetailsView(RunningState.ServiceItem si, RunningState.MergedItem mi) {
+
+    void addServicesHeader() {
         if (mNumServices == 0) {
             mServicesHeader = (TextView)mInflater.inflate(R.layout.separator_label,
                     mAllDetails, false);
@@ -218,7 +229,30 @@
             mAllDetails.addView(mServicesHeader);
         }
         mNumServices++;
-        
+    }
+
+    void addProcessesHeader() {
+        if (mNumProcesses == 0) {
+            mProcessesHeader = (TextView)mInflater.inflate(R.layout.separator_label,
+                    mAllDetails, false);
+            mProcessesHeader.setText(R.string.runningservicedetails_processes_title);
+            mAllDetails.addView(mProcessesHeader);
+        }
+        mNumProcesses++;
+    }
+
+    void addServiceDetailsView(RunningState.ServiceItem si, RunningState.MergedItem mi,
+            boolean isService, boolean inclDetails) {
+        if (isService) {
+            addServicesHeader();
+        } else if (mi.mUserId != UserHandle.myUserId()) {
+            // This is being called for another user, and is not a service...
+            // That is, it is a background processes, being added for the
+            // details of a user.  In this case we want a header for processes,
+            // since the top subject line is for the user.
+            addProcessesHeader();
+        }
+
         RunningState.BaseItem bi = si != null ? si : mi;
         
         ActiveDetail detail = new ActiveDetail();
@@ -229,68 +263,74 @@
         detail.mServiceItem = si;
         detail.mViewHolder = new RunningProcessesView.ViewHolder(root);
         detail.mActiveItem = detail.mViewHolder.bind(mState, bi, mBuilder);
-        
+
+        if (!inclDetails) {
+            root.findViewById(R.id.service).setVisibility(View.GONE);
+        }
+
         if (si != null && si.mRunningService.clientLabel != 0) {
             detail.mManageIntent = mAm.getRunningServiceControlPanel(
                     si.mRunningService.service);
         }
         
         TextView description = (TextView)root.findViewById(R.id.comp_description);
-        if (si != null && si.mServiceInfo.descriptionRes != 0) {
-            description.setText(getActivity().getPackageManager().getText(
-                    si.mServiceInfo.packageName, si.mServiceInfo.descriptionRes,
-                    si.mServiceInfo.applicationInfo));
+        detail.mStopButton = (Button)root.findViewById(R.id.left_button);
+        detail.mReportButton = (Button)root.findViewById(R.id.right_button);
+
+        if (isService && mi.mUserId != UserHandle.myUserId()) {
+            // For services from other users, we don't show any description or
+            // controls, because the current user can not perform
+            // actions on them.
+            description.setVisibility(View.GONE);
+            root.findViewById(R.id.control_buttons_panel).setVisibility(View.GONE);
         } else {
-            if (mi.mBackground) {
-                description.setText(R.string.background_process_stop_description);
-            } else if (detail.mManageIntent != null) {
-                try {
-                    Resources clientr = getActivity().getPackageManager().getResourcesForApplication(
-                            si.mRunningService.clientPackage);
-                    String label = clientr.getString(si.mRunningService.clientLabel);
-                    description.setText(getActivity().getString(R.string.service_manage_description,
-                            label));
-                } catch (PackageManager.NameNotFoundException e) {
-                }
+            if (si != null && si.mServiceInfo.descriptionRes != 0) {
+                description.setText(getActivity().getPackageManager().getText(
+                        si.mServiceInfo.packageName, si.mServiceInfo.descriptionRes,
+                        si.mServiceInfo.applicationInfo));
             } else {
-                description.setText(getActivity().getText(si != null
-                        ? R.string.service_stop_description
-                        : R.string.heavy_weight_stop_description));
+                if (mi.mBackground) {
+                    description.setText(R.string.background_process_stop_description);
+                } else if (detail.mManageIntent != null) {
+                    try {
+                        Resources clientr = getActivity().getPackageManager().getResourcesForApplication(
+                                si.mRunningService.clientPackage);
+                        String label = clientr.getString(si.mRunningService.clientLabel);
+                        description.setText(getActivity().getString(R.string.service_manage_description,
+                                label));
+                    } catch (PackageManager.NameNotFoundException e) {
+                    }
+                } else {
+                    description.setText(getActivity().getText(si != null
+                            ? R.string.service_stop_description
+                            : R.string.heavy_weight_stop_description));
+                }
+            }
+
+            detail.mStopButton.setOnClickListener(detail);
+            detail.mStopButton.setText(getActivity().getText(detail.mManageIntent != null
+                    ? R.string.service_manage : R.string.service_stop));
+            detail.mReportButton.setOnClickListener(detail);
+            detail.mReportButton.setText(com.android.internal.R.string.report);
+            // check if error reporting is enabled in secure settings
+            int enabled = Settings.Global.getInt(getActivity().getContentResolver(),
+                    Settings.Global.SEND_ACTION_APP_ERROR, 0);
+            if (enabled != 0 && si != null) {
+                detail.mInstaller = ApplicationErrorReport.getErrorReportReceiver(
+                        getActivity(), si.mServiceInfo.packageName,
+                        si.mServiceInfo.applicationInfo.flags);
+                detail.mReportButton.setEnabled(detail.mInstaller != null);
+            } else {
+                detail.mReportButton.setEnabled(false);
             }
         }
-        
-        detail.mStopButton = (Button)root.findViewById(R.id.left_button);
-        detail.mStopButton.setOnClickListener(detail);
-        detail.mStopButton.setText(getActivity().getText(detail.mManageIntent != null
-                ? R.string.service_manage : R.string.service_stop));
 
-        detail.mReportButton = (Button)root.findViewById(R.id.right_button);
-        detail.mReportButton.setOnClickListener(detail);
-        detail.mReportButton.setText(com.android.internal.R.string.report);
-        // check if error reporting is enabled in secure settings
-        int enabled = Settings.Secure.getInt(getActivity().getContentResolver(),
-                Settings.Secure.SEND_ACTION_APP_ERROR, 0);
-        if (enabled != 0 && si != null) {
-            detail.mInstaller = ApplicationErrorReport.getErrorReportReceiver(
-                    getActivity(), si.mServiceInfo.packageName,
-                    si.mServiceInfo.applicationInfo.flags);
-            detail.mReportButton.setEnabled(detail.mInstaller != null);
-        } else {
-            detail.mReportButton.setEnabled(false);
-        }
-        
         mActiveDetails.add(detail);
     }
-    
+
     void addProcessDetailsView(RunningState.ProcessItem pi, boolean isMain) {
-        if (mNumProcesses == 0) {
-            mProcessesHeader = (TextView)mInflater.inflate(R.layout.separator_label,
-                    mAllDetails, false);
-            mProcessesHeader.setText(R.string.runningservicedetails_processes_title);
-            mAllDetails.addView(mProcessesHeader);
-        }
-        mNumProcesses++;
-        
+        addProcessesHeader();
+
         ActiveDetail detail = new ActiveDetail();
         View root = mInflater.inflate(R.layout.running_service_details_process,
                 mAllDetails, false);
@@ -300,7 +340,11 @@
         detail.mActiveItem = detail.mViewHolder.bind(mState, pi, mBuilder);
         
         TextView description = (TextView)root.findViewById(R.id.comp_description);
-        if (isMain) {
+        if (pi.mUserId != UserHandle.myUserId()) {
+            // Processes for another user are all shown batched together; there is
+            // no reason to have a description.
+            description.setVisibility(View.GONE);
+        } else if (isMain) {
             description.setText(R.string.main_running_process_description);
         } else {
             int textid = 0;
@@ -342,7 +386,39 @@
         
         mActiveDetails.add(detail);
     }
+
+    void addDetailsViews(RunningState.MergedItem item, boolean inclServices,
+            boolean inclProcesses) {
+        if (item != null) {
+            if (inclServices) {
+                for (int i=0; i<item.mServices.size(); i++) {
+                    addServiceDetailsView(item.mServices.get(i), item, true, true);
+                }
+            }
+
+            if (inclProcesses) {
+                if (item.mServices.size() <= 0) {
+                    // This item does not have any services, so it must be
+                    // another interesting process...  we will put a fake service
+                    // entry for it, to allow the user to "stop" it.
+                    addServiceDetailsView(null, item, false, item.mUserId != UserHandle.myUserId());
+                } else {
+                    // This screen is actually showing services, so also show
+                    // the process details.
+                    for (int i=-1; i<item.mOtherProcesses.size(); i++) {
+                        RunningState.ProcessItem pi = i < 0 ? item.mProcess
+                                : item.mOtherProcesses.get(i);
+                        if (pi != null && pi.mPid <= 0) {
+                            continue;
+                        }
     
+                        addProcessDetailsView(pi, i < 0);
+                    }
+                }
+            }
+        }
+    }
+
     void addDetailViews() {
         for (int i=mActiveDetails.size()-1; i>=0; i--) {
             mAllDetails.removeView(mActiveDetails.get(i).mRootView);
@@ -358,29 +434,26 @@
             mAllDetails.removeView(mProcessesHeader);
             mProcessesHeader = null;
         }
-        
+
         mNumServices = mNumProcesses = 0;
-        
+
         if (mMergedItem != null) {
-            for (int i=0; i<mMergedItem.mServices.size(); i++) {
-                addServiceDetailsView(mMergedItem.mServices.get(i), mMergedItem);
-            }
-            
-            if (mMergedItem.mServices.size() <= 0) {
-                // This item does not have any services, so it must be
-                // another interesting process...  we will put a fake service
-                // entry for it, to allow the user to "stop" it.
-                addServiceDetailsView(null, mMergedItem);
-            }
-            
-            for (int i=-1; i<mMergedItem.mOtherProcesses.size(); i++) {
-                RunningState.ProcessItem pi = i < 0 ? mMergedItem.mProcess
-                        : mMergedItem.mOtherProcesses.get(i);
-                if (pi.mPid <= 0) {
-                    continue;
+            if (mMergedItem.mUser != null) {
+                ArrayList<RunningState.MergedItem> items;
+                if (mShowBackground) {
+                    items = new ArrayList<RunningState.MergedItem>(mMergedItem.mChildren);
+                    Collections.sort(items, mState.mBackgroundComparator);
+                } else {
+                    items = mMergedItem.mChildren;
                 }
-                
-                addProcessDetailsView(pi, i < 0);
+                for (int i=0; i<items.size(); i++) {
+                    addDetailsViews(items.get(i), true, false);
+                }
+                for (int i=0; i<items.size(); i++) {
+                    addDetailsViews(items.get(i), false, true);
+                }
+            } else {
+                addDetailsViews(mMergedItem, true, true);
             }
         }
     }
@@ -423,8 +496,9 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         
-        mUid = getArguments().getInt(KEY_UID, 0);
-        mProcessName = getArguments().getString(KEY_PROCESS);
+        mUid = getArguments().getInt(KEY_UID, -1);
+        mUserId = getArguments().getInt(KEY_USER_ID, 0);
+        mProcessName = getArguments().getString(KEY_PROCESS, null);
         mShowBackground = getArguments().getBoolean(KEY_BACKGROUND, false);
         
         mAm = (ActivityManager)getActivity().getSystemService(Context.ACTIVITY_SERVICE);
@@ -434,12 +508,14 @@
     }
     
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = mRootView = inflater.inflate(R.layout.running_service_details, null);
-        
+    public View onCreateView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        final View view = inflater.inflate(R.layout.running_service_details, container, false);
+        Utils.prepareCustomPreferencesList(container, view, view, false);
+
+        mRootView = view;
         mAllDetails = (ViewGroup)view.findViewById(R.id.all_details);
         mSnippet = (ViewGroup)view.findViewById(R.id.snippet);
-        mSnippet.setPadding(0, mSnippet.getPaddingTop(), 0, mSnippet.getPaddingBottom());
         mSnippetViewHolder = new RunningProcessesView.ViewHolder(mSnippet);
         
         // We want to retrieve the data right now, so any active managed
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index 1b5310d..94ab11d 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -17,9 +17,11 @@
 package com.android.settings.applications;
 
 import com.android.settings.R;
+import com.android.settings.users.UserUtils;
 
 import android.app.ActivityManager;
 import android.app.ActivityManagerNative;
+import android.app.ActivityThread;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -27,12 +29,17 @@
 import android.content.pm.PackageItemInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
+import android.content.pm.UserInfo;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Drawable.ConstantState;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.Message;
 import android.os.RemoteException;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.text.format.Formatter;
 import android.util.Log;
 import android.util.SparseArray;
@@ -49,6 +56,9 @@
  * applications/processes/services.
  */
 public class RunningState {
+    static final String TAG = "RunningState";
+    static final boolean DEBUG_COMPARE = false;
+
     static Object sGlobalLock = new Object();
     static RunningState sInstance;
 
@@ -65,6 +75,8 @@
     final Context mApplicationContext;
     final ActivityManager mAm;
     final PackageManager mPm;
+    final UserManager mUm;
+    final int mMyUserId;
 
     OnRefreshUiListener mRefreshUiListener;
 
@@ -100,6 +112,17 @@
     // All processes, used for retrieving memory information.
     final ArrayList<ProcessItem> mAllProcessItems = new ArrayList<ProcessItem>();
 
+    // If there are other users on the device, these are the merged items
+    // representing all items that would be put in mMergedItems for that user.
+    final SparseArray<MergedItem> mOtherUserMergedItems = new SparseArray<MergedItem>();
+
+    // If there are other users on the device, these are the merged items
+    // representing all items that would be put in mUserBackgroundItems for that user.
+    final SparseArray<MergedItem> mOtherUserBackgroundItems = new SparseArray<MergedItem>();
+
+    // Tracking of information about users.
+    final SparseArray<UserState> mUsers = new SparseArray<UserState>();
+
     static class AppProcessInfo {
         final ActivityManager.RunningAppProcessInfo info;
         boolean hasServices;
@@ -114,7 +137,64 @@
     final SparseArray<AppProcessInfo> mTmpAppProcesses = new SparseArray<AppProcessInfo>();
 
     int mSequence = 0;
-    
+
+    final Comparator<RunningState.MergedItem> mBackgroundComparator
+        = new Comparator<RunningState.MergedItem>() {
+            @Override
+            public int compare(MergedItem lhs, MergedItem rhs) {
+                if (DEBUG_COMPARE) {
+                    Log.i(TAG, "Comparing " + lhs + " with " + rhs);
+                    Log.i(TAG, "     Proc " + lhs.mProcess + " with " + rhs.mProcess);
+                    Log.i(TAG, "   UserId " + lhs.mUserId + " with " + rhs.mUserId);
+                }
+                if (lhs.mUserId != rhs.mUserId) {
+                    if (lhs.mUserId == mMyUserId) return -1;
+                    if (rhs.mUserId == mMyUserId) return 1;
+                    return lhs.mUserId < rhs.mUserId ? -1 : 1;
+                }
+                if (lhs.mProcess == rhs.mProcess) {
+                    if (lhs.mLabel == rhs.mLabel) {
+                        return 0;
+                    }
+                    return lhs.mLabel != null ? lhs.mLabel.compareTo(rhs.mLabel) : -1;
+                }
+                if (lhs.mProcess == null) return -1;
+                if (rhs.mProcess == null) return 1;
+                if (DEBUG_COMPARE) Log.i(TAG, "    Label " + lhs.mProcess.mLabel
+                        + " with " + rhs.mProcess.mLabel);
+                final ActivityManager.RunningAppProcessInfo lhsInfo
+                        = lhs.mProcess.mRunningProcessInfo;
+                final ActivityManager.RunningAppProcessInfo rhsInfo
+                        = rhs.mProcess.mRunningProcessInfo;
+                final boolean lhsBg = lhsInfo.importance
+                        >= ActivityManager.RunningAppProcessInfo.IMPORTANCE_BACKGROUND;
+                final boolean rhsBg = rhsInfo.importance
+                        >= ActivityManager.RunningAppProcessInfo.IMPORTANCE_BACKGROUND;
+                        if (DEBUG_COMPARE) Log.i(TAG, "       Bg " + lhsBg + " with " + rhsBg);
+                if (lhsBg != rhsBg) {
+                    return lhsBg ? 1 : -1;
+                }
+                final boolean lhsA = (lhsInfo.flags
+                        & ActivityManager.RunningAppProcessInfo.FLAG_HAS_ACTIVITIES) != 0;
+                final boolean rhsA = (rhsInfo.flags
+                        & ActivityManager.RunningAppProcessInfo.FLAG_HAS_ACTIVITIES) != 0;
+                if (DEBUG_COMPARE) Log.i(TAG, "      Act " + lhsA + " with " + rhsA);
+                if (lhsA != rhsA) {
+                    return lhsA ? -1 : 1;
+                }
+                if (DEBUG_COMPARE) Log.i(TAG, "      Lru " + lhsInfo.lru + " with " + rhsInfo.lru);
+                if (lhsInfo.lru != rhsInfo.lru) {
+                    return lhsInfo.lru < rhsInfo.lru ? -1 : 1;
+                }
+                if (lhs.mProcess.mLabel == rhs.mProcess.mLabel) {
+                    return 0;
+                }
+                if (lhs.mProcess.mLabel == null) return 1;
+                if (rhs.mProcess.mLabel == null) return -1;
+                return lhs.mProcess.mLabel.compareTo(rhs.mProcess.mLabel);
+            }
+    };
+
     // ----- following protected by mLock -----
     
     // Lock for protecting the state that will be shared between the
@@ -128,6 +208,7 @@
     ArrayList<BaseItem> mItems = new ArrayList<BaseItem>();
     ArrayList<MergedItem> mMergedItems = new ArrayList<MergedItem>();
     ArrayList<MergedItem> mBackgroundItems = new ArrayList<MergedItem>();
+    ArrayList<MergedItem> mUserBackgroundItems = new ArrayList<MergedItem>();
     
     int mNumBackgroundProcesses;
     long mBackgroundProcessMemory;
@@ -211,25 +292,40 @@
         public void onRefreshUi(int what);
     }
 
+    static class UserState {
+        UserInfo mInfo;
+        String mLabel;
+        Drawable mIcon;
+    }
+
     static class BaseItem {
         final boolean mIsProcess;
-        
+        final int mUserId;
+
         PackageItemInfo mPackageInfo;
         CharSequence mDisplayLabel;
         String mLabel;
         String mDescription;
-        
+
         int mCurSeq;
-        
+
         long mActiveSince;
         long mSize;
         String mSizeStr;
         String mCurSizeStr;
         boolean mNeedDivider;
         boolean mBackground;
-        
-        public BaseItem(boolean isProcess) {
+
+        public BaseItem(boolean isProcess, int userId) {
             mIsProcess = isProcess;
+            mUserId = userId;
+        }
+
+        public Drawable loadIcon(Context context, RunningState state) {
+            if (mPackageInfo != null) {
+                return mPackageInfo.loadIcon(state.mPm);
+            }
+            return null;
         }
     }
 
@@ -240,8 +336,8 @@
         
         MergedItem mMergedItem;
         
-        public ServiceItem() {
-            super(false);
+        public ServiceItem(int userId) {
+            super(false, userId);
         }
     }
 
@@ -271,7 +367,7 @@
         long mActiveSince;
         
         public ProcessItem(Context context, int uid, String processName) {
-            super(true);
+            super(true, UserHandle.getUserId(uid));
             mDescription = context.getResources().getString(
                     R.string.service_process_name, processName);
             mUid = uid;
@@ -284,7 +380,8 @@
             }
             
             try {
-                ApplicationInfo ai = pm.getApplicationInfo(mProcessName, 0);
+                ApplicationInfo ai = pm.getApplicationInfo(mProcessName,
+                        PackageManager.GET_UNINSTALLED_PACKAGES);
                 if (ai.uid == mUid) {
                     mDisplayLabel = ai.loadLabel(pm);
                     mLabel = mDisplayLabel.toString();
@@ -301,7 +398,8 @@
             // If there is one package with this uid, that is what we want.
             if (pkgs.length == 1) {
                 try {
-                    ApplicationInfo ai = pm.getApplicationInfo(pkgs[0], 0);
+                    ApplicationInfo ai = pm.getApplicationInfo(pkgs[0],
+                            PackageManager.GET_UNINSTALLED_PACKAGES);
                     mDisplayLabel = ai.loadLabel(pm);
                     mLabel = mDisplayLabel.toString();
                     mPackageInfo = ai;
@@ -332,8 +430,9 @@
             // If still don't have anything to display, just use the
             // service info.
             if (mServices.size() > 0) {
-                mPackageInfo = mServices.values().iterator().next()
+                ApplicationInfo ai = mServices.values().iterator().next()
                         .mServiceInfo.applicationInfo;
+                mPackageInfo = ai;
                 mDisplayLabel = mPackageInfo.loadLabel(pm);
                 mLabel = mDisplayLabel.toString();
                 return;
@@ -341,7 +440,8 @@
             
             // Finally... whatever, just pick the first package's name.
             try {
-                ApplicationInfo ai = pm.getApplicationInfo(pkgs[0], 0);
+                ApplicationInfo ai = pm.getApplicationInfo(pkgs[0],
+                        PackageManager.GET_UNINSTALLED_PACKAGES);
                 mDisplayLabel = ai.loadLabel(pm);
                 mLabel = mDisplayLabel.toString();
                 mPackageInfo = ai;
@@ -349,20 +449,27 @@
             } catch (PackageManager.NameNotFoundException e) {
             }
         }
-        
-        boolean updateService(Context context,
-                ActivityManager.RunningServiceInfo service) {
+
+        boolean updateService(Context context, ActivityManager.RunningServiceInfo service) {
             final PackageManager pm = context.getPackageManager();
-            
+
             boolean changed = false;
             ServiceItem si = mServices.get(service.service);
             if (si == null) {
                 changed = true;
-                si = new ServiceItem();
+                si = new ServiceItem(mUserId);
                 si.mRunningService = service;
                 try {
-                    si.mServiceInfo = pm.getServiceInfo(service.service, 0);
-                } catch (PackageManager.NameNotFoundException e) {
+                    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,
                         si.mRunningService.service.getClassName(), si.mServiceInfo);
@@ -456,55 +563,96 @@
 
     static class MergedItem extends BaseItem {
         ProcessItem mProcess;
+        UserState mUser;
         final ArrayList<ProcessItem> mOtherProcesses = new ArrayList<ProcessItem>();
         final ArrayList<ServiceItem> mServices = new ArrayList<ServiceItem>();
+        final ArrayList<MergedItem> mChildren = new ArrayList<MergedItem>();
         
         private int mLastNumProcesses = -1, mLastNumServices = -1;
 
-        MergedItem() {
-            super(false);
+        MergedItem(int userId) {
+            super(false, userId);
         }
-        
+
+        private void setDescription(Context context, int numProcesses, int numServices) {
+            if (mLastNumProcesses != numProcesses || mLastNumServices != numServices) {
+                mLastNumProcesses = numProcesses;
+                mLastNumServices = numServices;
+                int resid = R.string.running_processes_item_description_s_s;
+                if (numProcesses != 1) {
+                    resid = numServices != 1
+                            ? R.string.running_processes_item_description_p_p
+                            : R.string.running_processes_item_description_p_s;
+                } else if (numServices != 1) {
+                    resid = R.string.running_processes_item_description_s_p;
+                }
+                mDescription = context.getResources().getString(resid, numProcesses,
+                        numServices);
+            }
+        }
+
         boolean update(Context context, boolean background) {
-            mPackageInfo = mProcess.mPackageInfo;
-            mDisplayLabel = mProcess.mDisplayLabel;
-            mLabel = mProcess.mLabel;
             mBackground = background;
-            
-            if (!mBackground) {
-                int numProcesses = (mProcess.mPid > 0 ? 1 : 0) + mOtherProcesses.size();
-                int numServices = mServices.size();
-                if (mLastNumProcesses != numProcesses || mLastNumServices != numServices) {
-                    mLastNumProcesses = numProcesses;
-                    mLastNumServices = numServices;
-                    int resid = R.string.running_processes_item_description_s_s;
-                    if (numProcesses != 1) {
-                        resid = numServices != 1
-                                ? R.string.running_processes_item_description_p_p
-                                : R.string.running_processes_item_description_p_s;
-                    } else if (numServices != 1) {
-                        resid = R.string.running_processes_item_description_s_p;
+
+            if (mUser != null) {
+                // This is a merged item that contains a child collection
+                // of items...  that is, it is an entire user, containing
+                // everything associated with that user.  So set it up as such.
+                // For concrete stuff we need about the process of this item,
+                // we will just use the info from the first child.
+                MergedItem child0 = mChildren.get(0);
+                mPackageInfo = child0.mProcess.mPackageInfo;
+                mLabel = mUser != null ? mUser.mLabel : null;
+                mDisplayLabel = mLabel;
+                int numProcesses = 0;
+                int numServices = 0;
+                mActiveSince = -1;
+                for (int i=0; i<mChildren.size(); i++) {
+                    MergedItem child = mChildren.get(i);
+                    numProcesses += child.mLastNumProcesses;
+                    numServices += child.mLastNumServices;
+                    if (child.mActiveSince >= 0 && mActiveSince < child.mActiveSince) {
+                        mActiveSince = child.mActiveSince;
                     }
-                    mDescription = context.getResources().getString(resid, numProcesses,
-                            numServices);
+                }
+                if (!mBackground) {
+                    setDescription(context, numProcesses, numServices);
+                }
+            } else {
+                mPackageInfo = mProcess.mPackageInfo;
+                mDisplayLabel = mProcess.mDisplayLabel;
+                mLabel = mProcess.mLabel;
+                
+                if (!mBackground) {
+                    setDescription(context, (mProcess.mPid > 0 ? 1 : 0) + mOtherProcesses.size(),
+                            mServices.size());
+                }
+                
+                mActiveSince = -1;
+                for (int i=0; i<mServices.size(); i++) {
+                    ServiceItem si = mServices.get(i);
+                    if (si.mActiveSince >= 0 && mActiveSince < si.mActiveSince) {
+                        mActiveSince = si.mActiveSince;
+                    }
                 }
             }
-            
-            mActiveSince = -1;
-            for (int i=0; i<mServices.size(); i++) {
-                ServiceItem si = mServices.get(i);
-                if (si.mActiveSince >= 0 && mActiveSince < si.mActiveSince) {
-                    mActiveSince = si.mActiveSince;
-                }
-            }
-            
+
             return false;
         }
         
         boolean updateSize(Context context) {
-            mSize = mProcess.mSize;
-            for (int i=0; i<mOtherProcesses.size(); i++) {
-                mSize += mOtherProcesses.get(i).mSize;
+            if (mUser != null) {
+                mSize = 0;
+                for (int i=0; i<mChildren.size(); i++) {
+                    MergedItem child = mChildren.get(i);
+                    child.updateSize(context);
+                    mSize += child.mSize;
+                }
+            } else {
+                mSize = mProcess.mSize;
+                for (int i=0; i<mOtherProcesses.size(); i++) {
+                    mSize += mOtherProcesses.get(i).mSize;
+                }
             }
             
             String sizeStr = Formatter.formatShortFileSize(
@@ -518,10 +666,31 @@
             }
             return false;
         }
+
+        public Drawable loadIcon(Context context, RunningState state) {
+            if (mUser == null) {
+                return super.loadIcon(context, state);
+            }
+            if (mUser.mIcon != null) {
+                ConstantState constState = mUser.mIcon.getConstantState();
+                if (constState == null) {
+                    return mUser.mIcon;
+                } else {
+                    return constState.newDrawable();
+                }
+            }
+            return context.getResources().getDrawable(
+                    com.android.internal.R.drawable.ic_menu_cc);
+        }
     }
-    
-    static class ServiceProcessComparator implements Comparator<ProcessItem> {
+
+    class ServiceProcessComparator implements Comparator<ProcessItem> {
         public int compare(ProcessItem object1, ProcessItem object2) {
+            if (object1.mUserId != object2.mUserId) {
+                if (object1.mUserId == mMyUserId) return -1;
+                if (object2.mUserId == mMyUserId) return 1;
+                return object1.mUserId < object2.mUserId ? -1 : 1;
+            }
             if (object1.mIsStarted != object2.mIsStarted) {
                 // Non-started processes go last.
                 return object1.mIsStarted ? -1 : 1;
@@ -570,6 +739,8 @@
         mApplicationContext = context.getApplicationContext();
         mAm = (ActivityManager)mApplicationContext.getSystemService(Context.ACTIVITY_SERVICE);
         mPm = mApplicationContext.getPackageManager();
+        mUm = (UserManager)mApplicationContext.getSystemService(Context.USER_SERVICE);
+        mMyUserId = UserHandle.myUserId();
         mResumed = false;
         mBackgroundThread = new HandlerThread("RunningState:Background");
         mBackgroundThread.start();
@@ -646,6 +817,39 @@
         mRunningProcesses.clear();
         mProcessItems.clear();
         mAllProcessItems.clear();
+        mUsers.clear();
+    }
+
+    private void addOtherUserItem(Context context, ArrayList<MergedItem> newMergedItems,
+            SparseArray<MergedItem> userItems, MergedItem newItem) {
+        MergedItem userItem = userItems.get(newItem.mUserId);
+        boolean first = userItem == null || userItem.mCurSeq != mSequence;
+        if (first) {
+            if (userItem == null) {
+                userItem = new MergedItem(newItem.mUserId);
+                userItems.put(newItem.mUserId, userItem);
+            } else {
+                userItem.mChildren.clear();
+            }
+            userItem.mCurSeq = mSequence;
+            if ((userItem.mUser=mUsers.get(newItem.mUserId)) == null) {
+                userItem.mUser = new UserState();
+                UserInfo info = mUm.getUserInfo(newItem.mUserId);
+                userItem.mUser.mInfo = info;
+                if (info != null) {
+                    userItem.mUser.mIcon = UserUtils.getUserIcon(context, mUm,
+                            info, context.getResources());
+                }
+                String name = info != null ? info.name : null;
+                if (name == null) {
+                    name = Integer.toString(info.id);
+                }
+                userItem.mUser.mLabel = context.getResources().getString(
+                        R.string.running_process_item_user_label, name);
+            }
+            newMergedItems.add(userItem);
+        }
+        userItem.mChildren.add(newItem);
     }
 
     private boolean update(Context context, ActivityManager am) {
@@ -940,6 +1144,7 @@
             
             ArrayList<BaseItem> newItems = new ArrayList<BaseItem>();
             ArrayList<MergedItem> newMergedItems = new ArrayList<MergedItem>();
+            SparseArray<MergedItem> otherUsers = null;
             mProcessItems.clear();
             for (int i=0; i<sortedProcesses.size(); i++) {
                 ProcessItem pi = sortedProcesses.get(i);
@@ -975,7 +1180,7 @@
                 if (!haveAllMerged || mergedItem == null
                         || mergedItem.mServices.size() != pi.mServices.size()) {
                     // Whoops, we need to build a new MergedItem!
-                    mergedItem = new MergedItem();
+                    mergedItem = new MergedItem(pi.mUserId);
                     for (ServiceItem si : pi.mServices.values()) {
                         mergedItem.mServices.add(si);
                         si.mMergedItem = mergedItem;
@@ -988,9 +1193,13 @@
                 }
                 
                 mergedItem.update(context, false);
-                newMergedItems.add(mergedItem);
+                if (mergedItem.mUserId != mMyUserId) {
+                    addOtherUserItem(context, newMergedItems, mOtherUserMergedItems, mergedItem);
+                } else {
+                    newMergedItems.add(mergedItem);
+                }
             }
-            
+
             // Finally, interesting processes need to be shown and will
             // go at the top.
             NHP = mInterestingProcesses.size();
@@ -998,15 +1207,30 @@
                 ProcessItem proc = mInterestingProcesses.get(i);
                 if (proc.mClient == null && proc.mServices.size() <= 0) {
                     if (proc.mMergedItem == null) {
-                        proc.mMergedItem = new MergedItem();
+                        proc.mMergedItem = new MergedItem(proc.mUserId);
                         proc.mMergedItem.mProcess = proc;
                     }
                     proc.mMergedItem.update(context, false);
-                    newMergedItems.add(0, proc.mMergedItem);
+                    if (proc.mMergedItem.mUserId != mMyUserId) {
+                        addOtherUserItem(context, newMergedItems, mOtherUserMergedItems,
+                                proc.mMergedItem);
+                    } else {
+                        newMergedItems.add(0, proc.mMergedItem);
+                    }
                     mProcessItems.add(proc);
                 }
             }
-            
+
+            // Finally finally, user aggregated merged items need to be
+            // updated now that they have all of their children.
+            final int NU = mOtherUserMergedItems.size();
+            for (int i=0; i<NU; i++) {
+                MergedItem user = mOtherUserMergedItems.valueAt(i);
+                if (user.mCurSeq == mSequence) {
+                    user.update(context, false);
+                }
+            }
+
             synchronized (mLock) {
                 mItems = newItems;
                 mMergedItems = newMergedItems;
@@ -1047,6 +1271,8 @@
         long foregroundProcessMemory = 0;
         long serviceProcessMemory = 0;
         ArrayList<MergedItem> newBackgroundItems = null;
+        ArrayList<MergedItem> newUserBackgroundItems = null;
+        boolean diffUsers = false;
         try {
             final int numProc = mAllProcessItems.size();
             int[] pids = new int[numProc];
@@ -1066,18 +1292,22 @@
                     backgroundProcessMemory += proc.mSize;
                     MergedItem mergedItem;
                     if (newBackgroundItems != null) {
-                        mergedItem = proc.mMergedItem = new MergedItem();
+                        mergedItem = proc.mMergedItem = new MergedItem(proc.mUserId);
                         proc.mMergedItem.mProcess = proc;
+                        diffUsers |= mergedItem.mUserId != mMyUserId;
                         newBackgroundItems.add(mergedItem);
                     } else {
                         if (bgIndex >= mBackgroundItems.size()
                                 || mBackgroundItems.get(bgIndex).mProcess != proc) {
                             newBackgroundItems = new ArrayList<MergedItem>(numBackgroundProcesses);
                             for (int bgi=0; bgi<bgIndex; bgi++) {
-                                newBackgroundItems.add(mBackgroundItems.get(bgi));
+                                mergedItem = mBackgroundItems.get(bgi);
+                                diffUsers |= mergedItem.mUserId != mMyUserId;
+                                newBackgroundItems.add(mergedItem);
                             }
-                            mergedItem = proc.mMergedItem = new MergedItem();
+                            mergedItem = proc.mMergedItem = new MergedItem(proc.mUserId);
                             proc.mMergedItem.mProcess = proc;
+                            diffUsers |= mergedItem.mUserId != mMyUserId;
                             newBackgroundItems.add(mergedItem);
                         } else {
                             mergedItem = mBackgroundItems.get(bgIndex);
@@ -1099,7 +1329,42 @@
             if (mBackgroundItems.size() > numBackgroundProcesses) {
                 newBackgroundItems = new ArrayList<MergedItem>(numBackgroundProcesses);
                 for (int bgi=0; bgi<numBackgroundProcesses; bgi++) {
-                    newBackgroundItems.add(mBackgroundItems.get(bgi));
+                    MergedItem mergedItem = mBackgroundItems.get(bgi);
+                    diffUsers |= mergedItem.mUserId != mMyUserId;
+                    newBackgroundItems.add(mergedItem);
+                }
+            }
+        }
+
+        if (newBackgroundItems != null) {
+            // The background items have changed; we need to re-build the
+            // per-user items.
+            if (!diffUsers) {
+                // Easy: there are no other users, we can just use the same array.
+                newUserBackgroundItems = newBackgroundItems;
+            } else {
+                // We now need to re-build the per-user list so that background
+                // items for users are collapsed together.
+                newUserBackgroundItems = new ArrayList<MergedItem>();
+                final int NB = newBackgroundItems.size();
+                for (int i=0; i<NB; i++) {
+                    MergedItem mergedItem = newBackgroundItems.get(i);
+                    if (mergedItem.mUserId != mMyUserId) {
+                        addOtherUserItem(context, newUserBackgroundItems,
+                                mOtherUserBackgroundItems, mergedItem);
+                    } else {
+                        newUserBackgroundItems.add(mergedItem);
+                    }
+                }
+                // And user aggregated merged items need to be
+                // updated now that they have all of their children.
+                final int NU = mOtherUserBackgroundItems.size();
+                for (int i=0; i<NU; i++) {
+                    MergedItem user = mOtherUserBackgroundItems.valueAt(i);
+                    if (user.mCurSeq == mSequence) {
+                        user.update(context, true);
+                        user.updateSize(context);
+                    }
                 }
             }
         }
@@ -1117,6 +1382,7 @@
             mServiceProcessMemory = serviceProcessMemory;
             if (newBackgroundItems != null) {
                 mBackgroundItems = newBackgroundItems;
+                mUserBackgroundItems = newUserBackgroundItems;
                 if (mWatchingBackgroundItems) {
                     changed = true;
                 }
@@ -1150,7 +1416,7 @@
 
     ArrayList<MergedItem> getCurrentBackgroundItems() {
         synchronized (mLock) {
-            return mBackgroundItems;
+            return mUserBackgroundItems;
         }
     }
 }
diff --git a/src/com/android/settings/bluetooth/A2dpProfile.java b/src/com/android/settings/bluetooth/A2dpProfile.java
old mode 100644
new mode 100755
index b7ba44d..435a659
--- a/src/com/android/settings/bluetooth/A2dpProfile.java
+++ b/src/com/android/settings/bluetooth/A2dpProfile.java
@@ -24,17 +24,22 @@
 import android.bluetooth.BluetoothUuid;
 import android.content.Context;
 import android.os.ParcelUuid;
+import android.util.Log;
 
 import com.android.settings.R;
 
+import java.util.ArrayList;
 import java.util.List;
 
-/**
- * A2dpProfile handles Bluetooth A2DP.
- * TODO: add null checks around calls to mService object.
- */
 final class A2dpProfile implements LocalBluetoothProfile {
+    private static final String TAG = "A2dpProfile";
+    private static boolean V = true;
+
     private BluetoothA2dp mService;
+    private boolean mIsProfileReady;
+
+    private final LocalBluetoothAdapter mLocalAdapter;
+    private final CachedBluetoothDeviceManager mDeviceManager;
 
     static final ParcelUuid[] SINK_UUIDS = {
         BluetoothUuid.AudioSink,
@@ -42,6 +47,7 @@
     };
 
     static final String NAME = "A2DP";
+    private final LocalBluetoothProfileManager mProfileManager;
 
     // Order of this profile in device profiles list
     private static final int ORDINAL = 1;
@@ -51,17 +57,41 @@
             implements BluetoothProfile.ServiceListener {
 
         public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            if (V) Log.d(TAG,"Bluetooth service connected");
             mService = (BluetoothA2dp) proxy;
+            // We just bound to the service, so refresh the UI for any connected A2DP devices.
+            List<BluetoothDevice> deviceList = mService.getConnectedDevices();
+            while (!deviceList.isEmpty()) {
+                BluetoothDevice nextDevice = deviceList.remove(0);
+                CachedBluetoothDevice device = mDeviceManager.findDevice(nextDevice);
+                // we may add a new device here, but generally this should not happen
+                if (device == null) {
+                    Log.w(TAG, "A2dpProfile found new device: " + nextDevice);
+                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, nextDevice);
+                }
+                device.onProfileStateChanged(A2dpProfile.this, BluetoothProfile.STATE_CONNECTED);
+                device.refresh();
+            }
+            mIsProfileReady=true;
         }
 
         public void onServiceDisconnected(int profile) {
-            mService = null;
+            if (V) Log.d(TAG,"Bluetooth service disconnected");
+            mIsProfileReady=false;
         }
     }
 
-    A2dpProfile(Context context) {
-        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
-        adapter.getProfileProxy(context, new A2dpServiceListener(),
+    public boolean isProfileReady() {
+        return mIsProfileReady;
+    }
+
+    A2dpProfile(Context context, LocalBluetoothAdapter adapter,
+            CachedBluetoothDeviceManager deviceManager,
+            LocalBluetoothProfileManager profileManager) {
+        mLocalAdapter = adapter;
+        mDeviceManager = deviceManager;
+        mProfileManager = profileManager;
+        mLocalAdapter.getProfileProxy(context, new A2dpServiceListener(),
                 BluetoothProfile.A2DP);
     }
 
@@ -73,7 +103,8 @@
         return true;
     }
 
-    private List<BluetoothDevice> getConnectedDevices() {
+    public List<BluetoothDevice> getConnectedDevices() {
+        if (mService == null) return new ArrayList<BluetoothDevice>(0);
         return mService.getDevicesMatchingConnectionStates(
               new int[] {BluetoothProfile.STATE_CONNECTED,
                          BluetoothProfile.STATE_CONNECTING,
@@ -81,6 +112,7 @@
     }
 
     public boolean connect(BluetoothDevice device) {
+        if (mService == null) return false;
         List<BluetoothDevice> sinks = getConnectedDevices();
         if (sinks != null) {
             for (BluetoothDevice sink : sinks) {
@@ -91,22 +123,33 @@
     }
 
     public boolean disconnect(BluetoothDevice device) {
+        if (mService == null) return false;
+        // Downgrade priority as user is disconnecting the headset.
+        if (mService.getPriority(device) > BluetoothProfile.PRIORITY_ON){
+            mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
+        }
         return mService.disconnect(device);
     }
 
     public int getConnectionStatus(BluetoothDevice device) {
+        if (mService == null) {
+            return BluetoothProfile.STATE_DISCONNECTED;
+        }
         return mService.getConnectionState(device);
     }
 
     public boolean isPreferred(BluetoothDevice device) {
+        if (mService == null) return false;
         return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
     }
 
     public int getPreferred(BluetoothDevice device) {
+        if (mService == null) return BluetoothProfile.PRIORITY_OFF;
         return mService.getPriority(device);
     }
 
     public void setPreferred(BluetoothDevice device, boolean preferred) {
+        if (mService == null) return;
         if (preferred) {
             if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
                 mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
@@ -115,8 +158,8 @@
             mService.setPriority(device, BluetoothProfile.PRIORITY_OFF);
         }
     }
-
     boolean isA2dpPlaying() {
+        if (mService == null) return false;
         List<BluetoothDevice> sinks = mService.getConnectedDevices();
         if (!sinks.isEmpty()) {
             if (mService.isA2dpPlaying(sinks.get(0))) {
@@ -126,10 +169,6 @@
         return false;
     }
 
-    public boolean isProfileReady() {
-        return mService != null;
-    }
-
     public String toString() {
         return NAME;
     }
@@ -143,7 +182,7 @@
     }
 
     public int getSummaryResourceForDevice(BluetoothDevice device) {
-        int state = mService.getConnectionState(device);
+        int state = getConnectionStatus(device);
         switch (state) {
             case BluetoothProfile.STATE_DISCONNECTED:
                 return R.string.bluetooth_a2dp_profile_summary_use_for;
@@ -159,4 +198,17 @@
     public int getDrawableResource(BluetoothClass btClass) {
         return R.drawable.ic_bt_headphones_a2dp;
     }
+
+    protected void finalize() {
+        if (V) Log.d(TAG, "finalize()");
+        if (mService != null) {
+            try {
+                BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.A2DP,
+                                                                       mService);
+                mService = null;
+            }catch (Throwable t) {
+                Log.w(TAG, "Error cleaning up A2DP proxy", t);
+            }
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/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/BluetoothDiscoverableEnabler.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
index babf1e2..d687136 100755
--- a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
@@ -29,6 +29,9 @@
 
 import com.android.settings.R;
 
+import android.text.format.Time;
+import android.util.Log;
+
 /**
  * BluetoothDiscoverableEnabler is a helper to manage the "Discoverable"
  * checkbox. It sets/unsets discoverability and keeps track of how much time
@@ -36,6 +39,8 @@
  */
 final class BluetoothDiscoverableEnabler implements Preference.OnPreferenceClickListener {
 
+    private static final String TAG = "BluetoothDiscoverableEnabler";
+
     private static final String SYSTEM_PROPERTY_DISCOVERABLE_TIMEOUT =
             "debug.bt.discoverable_time";
 
@@ -128,15 +133,20 @@
     private void setEnabled(boolean enable) {
         if (enable) {
             int timeout = getDiscoverableTimeout();
-            mLocalAdapter.setDiscoverableTimeout(timeout);
-
             long endTimestamp = System.currentTimeMillis() + timeout * 1000L;
             LocalBluetoothPreferences.persistDiscoverableEndTimestamp(mContext, endTimestamp);
 
             mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE, timeout);
             updateCountdownSummary();
+
+            Log.d(TAG, "setEnabled(): enabled = " + enable + "timeout = " + timeout);
+
+            if (timeout > 0) {
+                BluetoothDiscoverableTimeoutReceiver.setDiscoverableAlarm(mContext, endTimestamp);
+            }
         } else {
             mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
+            BluetoothDiscoverableTimeoutReceiver.cancelDiscoverableAlarm(mContext);
         }
     }
 
@@ -238,6 +248,7 @@
     }
 
     void handleModeChanged(int mode) {
+        Log.d(TAG, "handleModeChanged(): mode = " + mode);
         if (mode == BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
             mDiscoverable = true;
             updateCountdownSummary();
diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableTimeoutReceiver.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableTimeoutReceiver.java
new file mode 100644
index 0000000..14f7b22
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableTimeoutReceiver.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+/* Required to handle timeout notification when phone is suspended */
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+
+import android.bluetooth.BluetoothAdapter;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+
+public class BluetoothDiscoverableTimeoutReceiver extends BroadcastReceiver {
+    private static final String TAG = "BluetoothDiscoverableTimeoutReceiver";
+
+    private static final String INTENT_DISCOVERABLE_TIMEOUT =
+        "android.bluetooth.intent.DISCOVERABLE_TIMEOUT";
+
+    static void setDiscoverableAlarm(Context context, long alarmTime) {
+        Log.d(TAG, "setDiscoverableAlarm(): alarmTime = " + alarmTime);
+
+        Intent intent = new Intent(INTENT_DISCOVERABLE_TIMEOUT);
+        intent.setClass(context, BluetoothDiscoverableTimeoutReceiver.class);
+        PendingIntent pending = PendingIntent.getBroadcast(
+            context, 0, intent, 0);
+        AlarmManager alarmManager =
+              (AlarmManager) context.getSystemService (Context.ALARM_SERVICE);
+
+        if (pending != null) {
+            // Cancel any previous alarms that do the same thing.
+            alarmManager.cancel(pending);
+            Log.d(TAG, "setDiscoverableAlarm(): cancel prev alarm");
+        }
+        pending = PendingIntent.getBroadcast(
+            context, 0, intent, 0);
+
+        alarmManager.set(AlarmManager.RTC_WAKEUP, alarmTime, pending);
+    }
+
+    static void cancelDiscoverableAlarm(Context context) {
+        Log.d(TAG, "cancelDiscoverableAlarm(): Enter");
+
+        Intent intent = new Intent(INTENT_DISCOVERABLE_TIMEOUT);
+        intent.setClass(context, BluetoothDiscoverableTimeoutReceiver.class);
+        PendingIntent pending = PendingIntent.getBroadcast(
+            context, 0, intent, PendingIntent.FLAG_NO_CREATE);
+        if (pending != null) {
+            // Cancel any previous alarms that do the same thing.
+            AlarmManager alarmManager =
+              (AlarmManager) context.getSystemService (Context.ALARM_SERVICE);
+
+            alarmManager.cancel(pending);
+        }
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        LocalBluetoothAdapter localBluetoothAdapter = LocalBluetoothAdapter.getInstance();
+
+         if(localBluetoothAdapter != null  &&
+            localBluetoothAdapter.getState() == BluetoothAdapter.STATE_ON) {
+            Log.d(TAG, "Disable discoverable...");
+
+            localBluetoothAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
+         } else {
+            Log.e(TAG, "localBluetoothAdapter is NULL!!");
+        }
+    }
+};
diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java
index f08e083..df13eef 100644
--- a/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java
@@ -37,13 +37,15 @@
 public final class BluetoothEnabler implements CompoundButton.OnCheckedChangeListener {
     private final Context mContext;
     private Switch mSwitch;
-
+    private boolean mValidListener;
     private final LocalBluetoothAdapter mLocalAdapter;
     private final IntentFilter mIntentFilter;
 
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
+            // Broadcast receiver is always running on the UI thread here,
+            // so we don't need consider thread synchronization.
             int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR);
             handleStateChanged(state);
         }
@@ -52,6 +54,7 @@
     public BluetoothEnabler(Context context, Switch switch_) {
         mContext = context;
         mSwitch = switch_;
+        mValidListener = false;
 
         LocalBluetoothManager manager = LocalBluetoothManager.getInstance(context);
         if (manager == null) {
@@ -75,6 +78,7 @@
 
         mContext.registerReceiver(mReceiver, mIntentFilter);
         mSwitch.setOnCheckedChangeListener(this);
+        mValidListener = true;
     }
 
     public void pause() {
@@ -84,26 +88,27 @@
 
         mContext.unregisterReceiver(mReceiver);
         mSwitch.setOnCheckedChangeListener(null);
+        mValidListener = false;
     }
 
     public void setSwitch(Switch switch_) {
         if (mSwitch == switch_) return;
         mSwitch.setOnCheckedChangeListener(null);
         mSwitch = switch_;
-        mSwitch.setOnCheckedChangeListener(this);
+        mSwitch.setOnCheckedChangeListener(mValidListener ? this : null);
 
         int bluetoothState = BluetoothAdapter.STATE_OFF;
         if (mLocalAdapter != null) bluetoothState = mLocalAdapter.getBluetoothState();
         boolean isOn = bluetoothState == BluetoothAdapter.STATE_ON;
         boolean isOff = bluetoothState == BluetoothAdapter.STATE_OFF;
-        mSwitch.setChecked(isOn);
+        setChecked(isOn);
         mSwitch.setEnabled(isOn || isOff);
     }
 
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         // Show toast message if Bluetooth is not allowed in airplane mode
         if (isChecked &&
-                !WirelessSettings.isRadioAllowed(mContext, Settings.System.RADIO_BLUETOOTH)) {
+                !WirelessSettings.isRadioAllowed(mContext, Settings.Global.RADIO_BLUETOOTH)) {
             Toast.makeText(mContext, R.string.wifi_in_airplane_mode, Toast.LENGTH_SHORT).show();
             // Reset switch to off
             buttonView.setChecked(false);
@@ -121,19 +126,33 @@
                 mSwitch.setEnabled(false);
                 break;
             case BluetoothAdapter.STATE_ON:
-                mSwitch.setChecked(true);
+                setChecked(true);
                 mSwitch.setEnabled(true);
                 break;
             case BluetoothAdapter.STATE_TURNING_OFF:
                 mSwitch.setEnabled(false);
                 break;
             case BluetoothAdapter.STATE_OFF:
-                mSwitch.setChecked(false);
+                setChecked(false);
                 mSwitch.setEnabled(true);
                 break;
             default:
-                mSwitch.setChecked(false);
+                setChecked(false);
                 mSwitch.setEnabled(true);
         }
     }
+
+    private void setChecked(boolean isChecked) {
+        if (isChecked != mSwitch.isChecked()) {
+            // set listener to null, so onCheckedChanged won't be called
+            // if the checked status on Switch isn't changed by user click
+            if (mValidListener) {
+                mSwitch.setOnCheckedChangeListener(null);
+            }
+            mSwitch.setChecked(isChecked);
+            if (mValidListener) {
+                mSwitch.setOnCheckedChangeListener(this);
+            }
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothEventManager.java b/src/com/android/settings/bluetooth/BluetoothEventManager.java
old mode 100644
new mode 100755
index a6d9bcf..0eead85
--- a/src/com/android/settings/bluetooth/BluetoothEventManager.java
+++ b/src/com/android/settings/bluetooth/BluetoothEventManager.java
@@ -21,6 +21,7 @@
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -99,6 +100,7 @@
 
         // Dock event broadcasts
         addHandler(Intent.ACTION_DOCK_EVENT, new DockEventHandler());
+
         mContext.registerReceiver(mBroadcastReceiver, mAdapterIntentFilter);
     }
 
@@ -163,6 +165,8 @@
                     callback.onBluetoothStateChanged(state);
                 }
             }
+            // Inform CachedDeviceManager that the adapter state has changed
+            mDeviceManager.onBluetoothStateChanged(state);
         }
     }
 
@@ -365,7 +369,6 @@
             }
         }
     }
-
     boolean readPairedDevices() {
         Set<BluetoothDevice> bondedDevices = mLocalAdapter.getBondedDevices();
         if (bondedDevices == null) {
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/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
old mode 100644
new mode 100755
index 4fd6cee..9f071cc
--- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
@@ -28,7 +28,6 @@
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Button;
 import android.widget.CompoundButton.OnCheckedChangeListener;
@@ -56,14 +55,15 @@
     private String mReturnPackage = null;
     private String mReturnClass = null;
 
-    private CheckBox mRememberChoice;
-    private boolean mRememberChoiceValue = false;
-
+    private int mRequestType = 0;
     private BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_CANCEL)) {
+                int requestType = intent.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
+                                               BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS);
+                if (requestType != mRequestType) return;
                 BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
                 if (mDevice.equals(device)) dismissDialog();
             }
@@ -91,15 +91,20 @@
         mDevice = i.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
         mReturnPackage = i.getStringExtra(BluetoothDevice.EXTRA_PACKAGE_NAME);
         mReturnClass = i.getStringExtra(BluetoothDevice.EXTRA_CLASS_NAME);
-        int requestType = i.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
+        mRequestType = i.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
                                      BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS);
 
-        if (requestType == BluetoothDevice.REQUEST_TYPE_PROFILE_CONNECTION) {
-            showConnectionDialog();
-        } else if (requestType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
-            showPhonebookDialog();
-        } else {
-            Log.e(TAG, "Error: bad request type: " + requestType);
+        if(DEBUG) Log.i(TAG, "onCreate() Request type: " + mRequestType);
+
+        if (mRequestType == BluetoothDevice.REQUEST_TYPE_PROFILE_CONNECTION) {
+            showDialog(getString(R.string.bluetooth_connection_permission_request), mRequestType);
+        } else if (mRequestType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
+            showDialog(getString(R.string.bluetooth_phonebook_request), mRequestType);
+        } else if (mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
+            showDialog(getString(R.string.bluetooth_map_request), mRequestType);
+        }
+        else {
+            Log.e(TAG, "Error: bad request type: " + mRequestType);
             finish();
             return;
         }
@@ -108,92 +113,91 @@
         mReceiverRegistered = true;
     }
 
-    private void showConnectionDialog() {
+
+    private void showDialog(String title, int requestType)
+    {
         final AlertController.AlertParams p = mAlertParams;
         p.mIconId = android.R.drawable.ic_dialog_info;
-        p.mTitle = getString(R.string.bluetooth_connection_permission_request);
-        p.mView = createConnectionDialogView();
+        p.mTitle = title;
+        if(DEBUG) Log.i(TAG, "showDialog() Request type: " + mRequestType + " this: " + this);
+        switch(requestType)
+        {
+        case BluetoothDevice.REQUEST_TYPE_PROFILE_CONNECTION:
+            p.mView = createConnectionDialogView();
+            break;
+        case BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS:
+            p.mView = createPhonebookDialogView();
+            break;
+        case BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS:
+            p.mView = createMapDialogView();
+            break;
+        }
         p.mPositiveButtonText = getString(R.string.yes);
         p.mPositiveButtonListener = this;
         p.mNegativeButtonText = getString(R.string.no);
         p.mNegativeButtonListener = this;
         mOkButton = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);
         setupAlert();
-    }
 
-    private void showPhonebookDialog() {
-        final AlertController.AlertParams p = mAlertParams;
-        p.mIconId = android.R.drawable.ic_dialog_info;
-        p.mTitle = getString(R.string.bluetooth_phonebook_request);
-        p.mView = createPhonebookDialogView();
-        p.mPositiveButtonText = getString(android.R.string.yes);
-        p.mPositiveButtonListener = this;
-        p.mNegativeButtonText = getString(android.R.string.no);
-        p.mNegativeButtonListener = this;
-        mOkButton = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);
-        setupAlert();
     }
-
-    private String createConnectionDisplayText() {
+    @Override
+    public void onBackPressed() {
+        /*we need an answer so ignore back button presses during auth */
+        if(DEBUG) Log.i(TAG, "Back button pressed! ignoring");
+        return;
+    }
+    private String createRemoteName()
+    {
         String mRemoteName = mDevice != null ? mDevice.getAliasName() : null;
 
         if (mRemoteName == null) mRemoteName = getString(R.string.unknown);
-        String mMessage1 = getString(R.string.bluetooth_connection_dialog_text,
-                mRemoteName);
-        return mMessage1;
+        return mRemoteName;
     }
 
-    private String createPhonebookDisplayText() {
-        String mRemoteName = mDevice != null ? mDevice.getAliasName() : null;
-
-        if (mRemoteName == null) mRemoteName = getString(R.string.unknown);
-        String mMessage1 = getString(R.string.bluetooth_pb_acceptance_dialog_text,
-                                     mRemoteName, mRemoteName);
-        return mMessage1;
-    }
-
+    // TODO(edjee): createConnectionDialogView, createPhonebookDialogView and createMapDialogView
+    // are similar. Refactor them into one method.
+    // Also, the string resources bluetooth_remember_choice and bluetooth_pb_remember_choice should
+    // be removed.
     private View createConnectionDialogView() {
-        mView = getLayoutInflater().inflate(R.layout.bluetooth_connection_access, null);
+        String mRemoteName = createRemoteName();
+        mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null);
         messageView = (TextView)mView.findViewById(R.id.message);
-        messageView.setText(createConnectionDisplayText());
+        messageView.setText(getString(R.string.bluetooth_connection_dialog_text,
+                mRemoteName));
         return mView;
     }
 
     private View createPhonebookDialogView() {
-        mView = getLayoutInflater().inflate(R.layout.bluetooth_pb_access, null);
+        String mRemoteName = createRemoteName();
+        mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null);
         messageView = (TextView)mView.findViewById(R.id.message);
-        messageView.setText(createPhonebookDisplayText());
-        mRememberChoice = (CheckBox)mView.findViewById(R.id.bluetooth_pb_remember_choice);
-        mRememberChoice.setChecked(false);
-        mRememberChoice.setOnCheckedChangeListener(new OnCheckedChangeListener() {
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (isChecked) {
-                    mRememberChoiceValue = true;
-                } else {
-                    mRememberChoiceValue = false;
-                }
-            }
-            });
+        messageView.setText(getString(R.string.bluetooth_pb_acceptance_dialog_text,
+                mRemoteName, mRemoteName));
+        return mView;
+    }
+
+    private View createMapDialogView() {
+        String mRemoteName = createRemoteName();
+        mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null);
+        messageView = (TextView)mView.findViewById(R.id.message);
+        messageView.setText(getString(R.string.bluetooth_map_acceptance_dialog_text,
+                mRemoteName, mRemoteName));
         return mView;
     }
 
     private void onPositive() {
-        if (DEBUG) Log.d(TAG, "onPositive mRememberChoiceValue: " + mRememberChoiceValue);
-
-        if (mRememberChoiceValue) {
-            savePhonebookPermissionChoice(CachedBluetoothDevice.PHONEBOOK_ACCESS_ALLOWED);
-        }
+        if (DEBUG) Log.d(TAG, "onPositive");
+        savePermissionChoice(mRequestType, CachedBluetoothDevice.ACCESS_ALLOWED);
+        // TODO(edjee): Now that we always save the user's choice,
+        // we can get rid of BluetoothDevice#EXTRA_ALWAYS_ALLOWED.
         sendIntentToReceiver(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY, true,
-                             BluetoothDevice.EXTRA_ALWAYS_ALLOWED, mRememberChoiceValue);
+                             BluetoothDevice.EXTRA_ALWAYS_ALLOWED, true);
         finish();
     }
 
     private void onNegative() {
-        if (DEBUG) Log.d(TAG, "onNegative mRememberChoiceValue: " + mRememberChoiceValue);
-
-        if (mRememberChoiceValue) {
-            savePhonebookPermissionChoice(CachedBluetoothDevice.PHONEBOOK_ACCESS_REJECTED);
-        }
+        if (DEBUG) Log.d(TAG, "onNegative");
+        savePermissionChoice(mRequestType, CachedBluetoothDevice.ACCESS_REJECTED);
         sendIntentToReceiver(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY, false,
                              null, false // dummy value, no effect since last param is null
                              );
@@ -207,6 +211,8 @@
         if (mReturnPackage != null && mReturnClass != null) {
             intent.setClassName(mReturnPackage, mReturnClass);
         }
+        if(DEBUG) Log.i(TAG, "sendIntentToReceiver() Request type: " + mRequestType +
+                " mReturnPackage" + mReturnPackage + " mReturnClass" + mReturnClass);
 
         intent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,
                         allowed ? BluetoothDevice.CONNECTION_ACCESS_YES :
@@ -216,6 +222,7 @@
             intent.putExtra(extraName, extraValue);
         }
         intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
+        intent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE, mRequestType);
         sendBroadcast(intent, android.Manifest.permission.BLUETOOTH_ADMIN);
     }
 
@@ -246,11 +253,22 @@
         return true;
     }
 
-    private void savePhonebookPermissionChoice(int permissionChoice) {
+    private void savePermissionChoice(int permissionType, int permissionChoice) {
         LocalBluetoothManager bluetoothManager = LocalBluetoothManager.getInstance(this);
         CachedBluetoothDeviceManager cachedDeviceManager =
             bluetoothManager.getCachedDeviceManager();
         CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
-        cachedDevice.setPhonebookPermissionChoice(permissionChoice);
+        if (DEBUG) Log.d(TAG, "savePermissionChoice permissionType: " + permissionType);
+        if (cachedDevice == null ) {
+            cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(),
+                                                         bluetoothManager.getProfileManager(),
+                                                         mDevice);
+        }
+        if(permissionType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS){
+            cachedDevice.setPhonebookPermissionChoice(permissionChoice);
+        }else if (permissionType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS){
+            cachedDevice.setMessagePermissionChoice(permissionChoice);
+        }
     }
+
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
index e2231bb..c3b93be 100644
--- a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
@@ -36,7 +36,11 @@
 
     private static final String TAG = "BluetoothPermissionRequest";
     private static final boolean DEBUG = Utils.V;
-    public static final int NOTIFICATION_ID = android.R.drawable.stat_sys_data_bluetooth;
+    private static final int NOTIFICATION_ID = android.R.drawable.stat_sys_data_bluetooth;
+
+    private static final String NOTIFICATION_TAG_PBAP = "Phonebook Access" ;
+    private static final String NOTIFICATION_TAG_MAP = "Message Access";
+
 
     Context mContext;
     int mRequestType;
@@ -49,7 +53,7 @@
         mContext = context;
         String action = intent.getAction();
 
-        if (DEBUG) Log.d(TAG, "onReceive");
+        if (DEBUG) Log.d(TAG, "onReceive" + action);
 
         if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_REQUEST)) {
             // convert broadcast intent into activity intent (same action string)
@@ -59,14 +63,8 @@
             mReturnPackage = intent.getStringExtra(BluetoothDevice.EXTRA_PACKAGE_NAME);
             mReturnClass = intent.getStringExtra(BluetoothDevice.EXTRA_CLASS_NAME);
 
-            Intent connectionAccessIntent = new Intent(action);
-            connectionAccessIntent.setClass(context, BluetoothPermissionActivity.class);
-            connectionAccessIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
-                                            mRequestType);
-            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
-            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_PACKAGE_NAME, mReturnPackage);
-            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_CLASS_NAME, mReturnClass);
+            if (DEBUG) Log.d(TAG, "onReceive request type: " + mRequestType + " return "
+                    + mReturnPackage + "," + mReturnClass);
 
             // Check if user had made decisions on accepting or rejecting the phonebook access
             // request. If there is, reply the request and return, no need to start permission
@@ -75,8 +73,22 @@
                 return;
             }
 
-            String deviceAddress = mDevice != null ? mDevice.getAddress() : null;
+            Intent connectionAccessIntent = new Intent(action);
+            connectionAccessIntent.setClass(context, BluetoothPermissionActivity.class);
+            // We use the FLAG_ACTIVITY_MULTIPLE_TASK since we can have multiple concurrent access requests
+            connectionAccessIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+            connectionAccessIntent.setType(Integer.toString(mRequestType)); /* This is needed to create two pending
+                                                                               intents to the same activity.
+                                                                               The value is not used in the activity. */
+            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
+                                            mRequestType);
+            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
+            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_PACKAGE_NAME, mReturnPackage);
+            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_CLASS_NAME, mReturnClass);
 
+            String deviceAddress = mDevice != null ? mDevice.getAddress() : null;
+            String title = null;
+            String message = null;
             PowerManager powerManager =
                 (PowerManager) context.getSystemService(Context.POWER_SERVICE);
 
@@ -93,33 +105,61 @@
                 deleteIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
                 deleteIntent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,
                         BluetoothDevice.CONNECTION_ACCESS_NO);
-
-                Notification notification = new Notification(
-                    android.R.drawable.stat_sys_data_bluetooth,
-                    context.getString(R.string.bluetooth_connection_permission_request),
-                    System.currentTimeMillis());
+                deleteIntent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE, mRequestType);
                 String deviceName = mDevice != null ? mDevice.getAliasName() : null;
-                notification.setLatestEventInfo(context,
-                    context.getString(R.string.bluetooth_connection_permission_request),
-                    context.getString(R.string.bluetooth_connection_notif_message, deviceName),
-                    PendingIntent.getActivity(context, 0, connectionAccessIntent, 0));
-                notification.flags = Notification.FLAG_AUTO_CANCEL |
-                                     Notification.FLAG_ONLY_ALERT_ONCE;
-                notification.defaults = Notification.DEFAULT_SOUND;
-                notification.deleteIntent = PendingIntent.getBroadcast(context, 0, deleteIntent, 0);
+                switch (mRequestType) {
+                    case BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS:
+                        title = context.getString(R.string.bluetooth_phonebook_request);
+                        message = context.getString(R.string.bluetooth_pb_acceptance_dialog_text, deviceName, deviceName);
+                        break;
+                    case BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS:
+                        title = context.getString(R.string.bluetooth_map_request);
+                        message = context.getString(R.string.bluetooth_map_acceptance_dialog_text, deviceName, deviceName);
+                        break;
+                    default:
+                        title = context.getString(R.string.bluetooth_connection_permission_request);
+                        message = context.getString(R.string.bluetooth_connection_dialog_text, deviceName, deviceName);
+                        break;
+                }
+                Notification notification = new Notification.Builder(context)
+                                        .setContentTitle(title)
+                                        .setTicker(message)
+                                        .setContentText(message)
+                                        .setSmallIcon(android.R.drawable.stat_sys_data_bluetooth)
+                                        .setAutoCancel(true)
+                                        .setPriority(Notification.PRIORITY_MAX)
+                                        .setOnlyAlertOnce(false)
+                                        .setDefaults(Notification.DEFAULT_ALL)
+                                        .setContentIntent(PendingIntent.getActivity(context, 0, connectionAccessIntent, 0))
+                                        .setDeleteIntent(PendingIntent.getBroadcast(context, 0, deleteIntent, 0))
+                                        .build();
+
+                notification.flags |= Notification.FLAG_NO_CLEAR; /* cannot be set with the builder */
 
                 NotificationManager notificationManager =
                     (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-                notificationManager.notify(NOTIFICATION_ID, notification);
+
+                notificationManager.notify(getNotificationTag(mRequestType),NOTIFICATION_ID, notification);
             }
         } else if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_CANCEL)) {
             // Remove the notification
             NotificationManager manager = (NotificationManager) context
                 .getSystemService(Context.NOTIFICATION_SERVICE);
-            manager.cancel(NOTIFICATION_ID);
+            mRequestType = intent.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
+                                        BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS);
+            manager.cancel(getNotificationTag(mRequestType), NOTIFICATION_ID);
         }
     }
 
+    private String getNotificationTag(int requestType) {
+        if(requestType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
+            return NOTIFICATION_TAG_PBAP;
+        } else if(mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
+            return NOTIFICATION_TAG_MAP;
+        }
+        return null;
+    }
+
     /**
      * @return true user had made a choice, this method replies to the request according
      *              to user's previous decision
@@ -128,8 +168,10 @@
     private boolean checkUserChoice() {
         boolean processed = false;
 
-        // we only remember PHONEBOOK permission
-        if (mRequestType != BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
+        // ignore if it is something else than phonebook/message settings it wants us to remember
+        if (mRequestType != BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS
+                && mRequestType != BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
+            if (DEBUG) Log.d(TAG, "Unknown RequestType: " + mRequestType);
             return processed;
         }
 
@@ -143,24 +185,47 @@
                 bluetoothManager.getProfileManager(), mDevice);
         }
 
-        int phonebookPermission = cachedDevice.getPhonebookPermissionChoice();
+        if(mRequestType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
 
-        if (phonebookPermission == CachedBluetoothDevice.PHONEBOOK_ACCESS_UNKNOWN) {
-            return processed;
-        }
+            int phonebookPermission = cachedDevice.getPhonebookPermissionChoice();
 
-        String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY;
-        if (phonebookPermission == CachedBluetoothDevice.PHONEBOOK_ACCESS_ALLOWED) {
-            sendIntentToReceiver(intentName, true, BluetoothDevice.EXTRA_ALWAYS_ALLOWED, true);
-            processed = true;
-        } else if (phonebookPermission == CachedBluetoothDevice.PHONEBOOK_ACCESS_REJECTED) {
-            sendIntentToReceiver(intentName, false,
-                                 null, false // dummy value, no effect since previous param is null
-                                 );
-            processed = true;
-        } else {
-            Log.e(TAG, "Bad phonebookPermission: " + phonebookPermission);
+            if (phonebookPermission == CachedBluetoothDevice.ACCESS_UNKNOWN) {
+                return processed;
+            }
+
+            String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY;
+            if (phonebookPermission == CachedBluetoothDevice.ACCESS_ALLOWED) {
+                sendIntentToReceiver(intentName, true, BluetoothDevice.EXTRA_ALWAYS_ALLOWED, true);
+                processed = true;
+            } else if (phonebookPermission == CachedBluetoothDevice.ACCESS_REJECTED) {
+                sendIntentToReceiver(intentName, false,
+                                     null, false ); // dummy value, no effect since previous param is null
+                processed = true;
+            } else {
+                Log.e(TAG, "Bad phonebookPermission: " + phonebookPermission);
+            }
+
+        } else if(mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
+
+            int messagePermission = cachedDevice.getMessagePermissionChoice();
+
+            if (messagePermission == CachedBluetoothDevice.ACCESS_UNKNOWN) {
+                return processed;
+            }
+
+            String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY;
+            if (messagePermission == CachedBluetoothDevice.ACCESS_ALLOWED) {
+                sendIntentToReceiver(intentName, true, BluetoothDevice.EXTRA_ALWAYS_ALLOWED, true);
+                processed = true;
+            } else if (messagePermission == CachedBluetoothDevice.ACCESS_REJECTED) {
+                sendIntentToReceiver(intentName, false,
+                                     null, false); // dummy value, no effect since previous param is null
+                processed = true;
+            } else {
+                Log.e(TAG, "Bad messagePermission: " + messagePermission);
+            }
         }
+        if(DEBUG) Log.d(TAG,"checkUserChoice(): returning " + processed);
         return processed;
     }
 
@@ -180,6 +245,7 @@
             intent.putExtra(extraName, extraValue);
         }
         intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
+        intent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE, mRequestType);
         mContext.sendBroadcast(intent, android.Manifest.permission.BLUETOOTH_ADMIN);
     }
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothProgressCategory.java b/src/com/android/settings/bluetooth/BluetoothProgressCategory.java
new file mode 100644
index 0000000..1c81360
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothProgressCategory.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import com.android.settings.ProgressCategory;
+import com.android.settings.R;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+public class BluetoothProgressCategory extends ProgressCategory {
+    public BluetoothProgressCategory(Context context, AttributeSet attrs) {
+        super(context, attrs, R.string.bluetooth_no_devices_found);
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index d30e428..529ee79 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;
@@ -32,16 +34,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 +73,7 @@
 
     private final IntentFilter mIntentFilter;
 
+
     // accessed from inner class (not private to avoid thunks)
     Preference mMyDevicePreference;
 
@@ -94,6 +94,7 @@
     };
 
     public BluetoothSettings() {
+        super(DISALLOW_CONFIG_BLUETOOTH);
         mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);
     }
 
@@ -119,13 +120,13 @@
             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(
                         ActionBar.LayoutParams.WRAP_CONTENT,
                         ActionBar.LayoutParams.WRAP_CONTENT,
-                        Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+                        Gravity.CENTER_VERTICAL | Gravity.END));
             }
         }
 
@@ -167,6 +168,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 (isRestrictedAndNotPinProtected()) return;
+
         boolean bluetoothIsEnabled = mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON;
         boolean isDiscovering = mLocalAdapter.isDiscovering();
         int textId = isDiscovering ? R.string.bluetooth_searching_for_devices :
@@ -213,6 +217,7 @@
     }
 
     private void startScanning() {
+        if (isRestrictedAndNotPinProtected()) return;
         if (!mAvailableDevicesCategoryIsPresent) {
             getPreferenceScreen().addPreference(mAvailableDevicesCategory);
         }
@@ -259,12 +264,14 @@
                 mMyDevicePreference.setEnabled(true);
                 preferenceScreen.addPreference(mMyDevicePreference);
 
-                if (mDiscoverableEnabler == null) {
-                    mDiscoverableEnabler = new BluetoothDiscoverableEnabler(getActivity(),
-                            mLocalAdapter, mMyDevicePreference);
-                    mDiscoverableEnabler.resume();
-                    LocalBluetoothManager.getInstance(getActivity()).setDiscoverableEnabler(
-                            mDiscoverableEnabler);
+                if (!isRestrictedAndNotPinProtected()) {
+                    if (mDiscoverableEnabler == null) {
+                        mDiscoverableEnabler = new BluetoothDiscoverableEnabler(getActivity(),
+                                mLocalAdapter, mMyDevicePreference);
+                        mDiscoverableEnabler.resume();
+                        LocalBluetoothManager.getInstance(getActivity()).setDiscoverableEnabler(
+                                mDiscoverableEnabler);
+                    }
                 }
 
                 // Paired devices category
@@ -278,17 +285,21 @@
                         BluetoothDeviceFilter.BONDED_DEVICE_FILTER);
                 int numberOfPairedDevices = mPairedDevicesCategory.getPreferenceCount();
 
-                mDiscoverableEnabler.setNumberOfPairedDevices(numberOfPairedDevices);
+                if (mDiscoverableEnabler != null) {
+                    mDiscoverableEnabler.setNumberOfPairedDevices(numberOfPairedDevices);
+                }
 
                 // Available devices category
                 if (mAvailableDevicesCategory == null) {
-                    mAvailableDevicesCategory = new ProgressCategory(getActivity(), null);
+                    mAvailableDevicesCategory = new BluetoothProgressCategory(getActivity(), null);
                 } else {
                     mAvailableDevicesCategory.removeAll();
                 }
-                addDeviceCategory(mAvailableDevicesCategory,
-                        R.string.bluetooth_preference_found_devices,
-                        BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER);
+                if (!isRestrictedAndNotPinProtected()) {
+                    addDeviceCategory(mAvailableDevicesCategory,
+                            R.string.bluetooth_preference_found_devices,
+                            BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER);
+                }
                 int numberOfAvailableDevices = mAvailableDevicesCategory.getPreferenceCount();
                 mAvailableDevicesCategoryIsPresent = true;
 
@@ -353,6 +364,8 @@
         public void onClick(View v) {
             // User clicked on advanced options icon for a device in the list
             if (v.getTag() instanceof CachedBluetoothDevice) {
+                if (isRestrictedAndNotPinProtected()) return;
+
                 CachedBluetoothDevice device = (CachedBluetoothDevice) v.getTag();
 
                 Bundle args = new Bundle(1);
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
old mode 100644
new mode 100755
index 01fd1b2..61d793a
--- a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
@@ -25,6 +25,7 @@
 import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.Log;
+import android.bluetooth.BluetoothAdapter;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -65,17 +66,22 @@
 
     private int mPhonebookPermissionChoice;
 
+    private int mMessagePermissionChoice;
+
+
     private final Collection<Callback> mCallbacks = new ArrayList<Callback>();
 
-    // Following constants indicate the user's choices of Phone book access settings
+    // Following constants indicate the user's choices of Phone book/message access settings
     // User hasn't made any choice or settings app has wiped out the memory
-    final static int PHONEBOOK_ACCESS_UNKNOWN = 0;
+    final static int ACCESS_UNKNOWN = 0;
     // User has accepted the connection and let Settings app remember the decision
-    final static int PHONEBOOK_ACCESS_ALLOWED = 1;
+    final static int ACCESS_ALLOWED = 1;
     // User has rejected the connection and let Settings app remember the decision
-    final static int PHONEBOOK_ACCESS_REJECTED = 2;
+    final static int ACCESS_REJECTED = 2;
+
 
     private final static String PHONEBOOK_PREFS_NAME = "bluetooth_phonebook_permission";
+    private final static String MESSAGE_PREFS_NAME = "bluetooth_message_permission";
 
     /**
      * When we connect to multiple profiles, we only want to display a single
@@ -118,8 +124,29 @@
             Log.d(TAG, "onProfileStateChanged: profile " + profile +
                     " newProfileState " + newProfileState);
         }
-
+        if (mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_TURNING_OFF)
+        {
+            if (Utils.D) Log.d(TAG, " BT Turninig Off...Profile conn state change ignored...");
+            return;
+        }
         mProfileConnectionState.put(profile, newProfileState);
+        if (newProfileState == BluetoothProfile.STATE_DISCONNECTED) {
+            // check whether we are disconnected with this device completely
+            boolean isDisconnected = true;
+            for (LocalBluetoothProfile pf: mProfileConnectionState.keySet()) {
+                if (mProfileConnectionState.get(pf) != BluetoothProfile.STATE_DISCONNECTED) {
+                    isDisconnected = false;
+                    break;
+                }
+            }
+            // if disconnected, restore permission choice.
+            // So ACCESS_REJECTED will take effect until we are disconnected with this device.
+            if (isDisconnected) {
+                fetchPhonebookPermissionChoice();
+                fetchMessagePermissionChoice();
+            }
+        }
+
         if (newProfileState == BluetoothProfile.STATE_CONNECTED) {
             if (!mProfiles.contains(profile)) {
                 mRemovedProfiles.remove(profile);
@@ -130,6 +157,18 @@
                     mLocalNapRoleConnected = true;
                 }
             }
+            if (profile instanceof MapProfile) {
+                profile.setPreferred(mDevice, true);
+                refresh();
+            }
+        } else if (profile instanceof MapProfile &&
+                newProfileState == BluetoothProfile.STATE_DISCONNECTED) {
+            if (mProfiles.contains(profile)) {
+                mRemovedProfiles.add(profile);
+                mProfiles.remove(profile);
+            }
+            profile.setPreferred(mDevice, false);
+            refresh();
         } else if (mLocalNapRoleConnected && profile instanceof PanProfile &&
                 ((PanProfile) profile).isLocalRoleNap(mDevice) &&
                 newProfileState == BluetoothProfile.STATE_DISCONNECTED) {
@@ -156,6 +195,14 @@
         for (LocalBluetoothProfile profile : mProfiles) {
             disconnect(profile);
         }
+        // Disconnect  PBAP server in case its connected
+        // This is to ensure all the profiles are disconnected as some CK/Hs do not
+        // disconnect  PBAP connection when HF connection is brought down
+        PbapServerProfile PbapProfile = mProfileManager.getPbapProfile();
+        if (PbapProfile.getConnectionStatus(mDevice) == BluetoothProfile.STATE_CONNECTED)
+        {
+            PbapProfile.disconnect(mDevice);
+        }
     }
 
     void disconnect(LocalBluetoothProfile profile) {
@@ -184,12 +231,15 @@
     private void connectWithoutResettingTimer(boolean connectAllProfiles) {
         // Try to initialize the profiles if they were not.
         if (mProfiles.isEmpty()) {
-            if (!updateProfiles()) {
-                // If UUIDs are not available yet, connect will be happen
-                // upon arrival of the ACTION_UUID intent.
-                if (DEBUG) Log.d(TAG, "No profiles. Maybe we will connect later");
-                return;
-            }
+            // if mProfiles is empty, then do not invoke updateProfiles. This causes a race
+            // condition with carkits during pairing, wherein RemoteDevice.UUIDs have been updated
+            // from bluetooth stack but ACTION.uuid is not sent yet.
+            // Eventually ACTION.uuid will be received which shall trigger the connection of the
+            // various profiles
+            // If UUIDs are not available yet, connect will be happen
+            // upon arrival of the ACTION_UUID intent.
+            Log.d(TAG, "No profiles. Maybe we will connect later");
+            return;
         }
 
         // Reset the only-show-one-error-dialog tracking variable
@@ -236,9 +286,11 @@
         // Reset the only-show-one-error-dialog tracking variable
         mIsConnectingErrorPossible = true;
         connectInt(profile);
+        // Refresh the UI based on profile.connect() call
+        refresh();
     }
 
-    private void connectInt(LocalBluetoothProfile profile) {
+    synchronized void connectInt(LocalBluetoothProfile profile) {
         if (!ensurePaired()) {
             return;
         }
@@ -283,8 +335,6 @@
     }
 
     void unpair() {
-        disconnect();
-
         int state = getBondState();
 
         if (state == BluetoothDevice.BOND_BONDING) {
@@ -317,12 +367,25 @@
         return mProfileConnectionState.get(profile);
     }
 
+    public void clearProfileConnectionState ()
+    {
+        if (Utils.D) {
+            Log.d(TAG," Clearing all connection state for dev:" + mDevice.getName());
+        }
+        for (LocalBluetoothProfile profile :getProfiles()) {
+            mProfileConnectionState.put(profile, BluetoothProfile.STATE_DISCONNECTED);
+        }
+        fetchPhonebookPermissionChoice();
+        fetchMessagePermissionChoice();
+    }
+
     // TODO: do any of these need to run async on a background thread?
     private void fillData() {
         fetchName();
         fetchBtClass();
         updateProfiles();
         fetchPhonebookPermissionChoice();
+        fetchMessagePermissionChoice();
 
         mVisible = false;
         dispatchAttributesChanged();
@@ -436,7 +499,7 @@
         ParcelUuid[] localUuids = mLocalAdapter.getUuids();
         if (localUuids == null) return false;
 
-        mProfileManager.updateProfiles(uuids, localUuids, mProfiles, mRemovedProfiles);
+        mProfileManager.updateProfiles(uuids, localUuids, mProfiles, mRemovedProfiles, mLocalNapRoleConnected);
 
         if (DEBUG) {
             Log.e(TAG, "updating profiles for " + mDevice.getAliasName());
@@ -487,7 +550,8 @@
         if (bondState == BluetoothDevice.BOND_NONE) {
             mProfiles.clear();
             mConnectAfterPairing = false;  // cancel auto-connect
-            setPhonebookPermissionChoice(PHONEBOOK_ACCESS_UNKNOWN);
+            setPhonebookPermissionChoice(ACCESS_UNKNOWN);
+            setMessagePermissionChoice(ACCESS_UNKNOWN);
         }
 
         refresh();
@@ -604,22 +668,54 @@
     }
 
     void setPhonebookPermissionChoice(int permissionChoice) {
+        mPhonebookPermissionChoice = permissionChoice;
+
+        // if user reject it, don't save it to editor.
+        if (permissionChoice == ACCESS_REJECTED) return;
+
         SharedPreferences.Editor editor =
             mContext.getSharedPreferences(PHONEBOOK_PREFS_NAME, Context.MODE_PRIVATE).edit();
-        if (permissionChoice == PHONEBOOK_ACCESS_UNKNOWN) {
+        if (permissionChoice == ACCESS_UNKNOWN) {
             editor.remove(mDevice.getAddress());
         } else {
             editor.putInt(mDevice.getAddress(), permissionChoice);
         }
         editor.commit();
-        mPhonebookPermissionChoice = permissionChoice;
     }
 
     private void fetchPhonebookPermissionChoice() {
         SharedPreferences preference = mContext.getSharedPreferences(PHONEBOOK_PREFS_NAME,
                                                                      Context.MODE_PRIVATE);
         mPhonebookPermissionChoice = preference.getInt(mDevice.getAddress(),
-                                                       PHONEBOOK_ACCESS_UNKNOWN);
+                                                       ACCESS_UNKNOWN);
+    }
+
+
+    int getMessagePermissionChoice() {
+        return mMessagePermissionChoice;
+    }
+
+    void setMessagePermissionChoice(int permissionChoice) {
+        mMessagePermissionChoice = permissionChoice;
+
+        // if user reject it, don't save it to editor.
+        if (permissionChoice == ACCESS_REJECTED) return;
+
+        SharedPreferences.Editor editor =
+            mContext.getSharedPreferences(MESSAGE_PREFS_NAME, Context.MODE_PRIVATE).edit();
+        if (permissionChoice == ACCESS_UNKNOWN) {
+            editor.remove(mDevice.getAddress());
+        } else {
+            editor.putInt(mDevice.getAddress(), permissionChoice);
+        }
+        editor.commit();
+    }
+
+    private void fetchMessagePermissionChoice() {
+        SharedPreferences preference = mContext.getSharedPreferences(MESSAGE_PREFS_NAME,
+                                                                     Context.MODE_PRIVATE);
+        mMessagePermissionChoice = preference.getInt(mDevice.getAddress(),
+                                                       ACCESS_UNKNOWN);
     }
 
 }
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
old mode 100644
new mode 100755
index 77f6b2c..ff282cc
--- a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.bluetooth;
 
+import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.util.Log;
@@ -134,6 +135,24 @@
         }
     }
 
+    public synchronized void onBluetoothStateChanged(int bluetoothState) {
+        // When Bluetooth is turning off, we need to clear the non-bonded devices
+        // Otherwise, they end up showing up on the next BT enable
+        if (bluetoothState == BluetoothAdapter.STATE_TURNING_OFF) {
+            for (int i = mCachedDevices.size() - 1; i >= 0; i--) {
+                CachedBluetoothDevice cachedDevice = mCachedDevices.get(i);
+                if (cachedDevice.getBondState() != BluetoothDevice.BOND_BONDED) {
+                   cachedDevice.setVisible(false);
+                   mCachedDevices.remove(i);
+                } else {
+                    // For bonded devices, we need to clear the connection status so that
+                    // when BT is enabled next time, device connection status shall be retrieved
+                    // by making a binder call.
+                    cachedDevice.clearProfileConnectionState();
+                }
+            }
+        }
+    }
     private void log(String msg) {
         if (DEBUG) {
             Log.d(TAG, msg);
diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
index 90f8de5..e2faf7f 100644
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -26,6 +26,7 @@
 import android.util.Log;
 
 import com.android.settings.ProgressCategory;
+import com.android.settings.RestrictedSettingsFragment;
 import com.android.settings.SettingsPreferenceFragment;
 
 import java.util.Collection;
@@ -39,7 +40,7 @@
  * @see DevicePickerFragment
  */
 public abstract class DeviceListPreferenceFragment extends
-        SettingsPreferenceFragment implements BluetoothCallback {
+        RestrictedSettingsFragment implements BluetoothCallback {
 
     private static final String TAG = "DeviceListPreferenceFragment";
 
@@ -58,7 +59,8 @@
     final WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference> mDevicePreferenceMap =
             new WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference>();
 
-    DeviceListPreferenceFragment() {
+    DeviceListPreferenceFragment(String restrictedKey) {
+        super(restrictedKey);
         mFilter = BluetoothDeviceFilter.ALL_FILTER;
     }
 
@@ -193,8 +195,8 @@
     }
 
     private void updateProgressUi(boolean start) {
-        if (mDeviceListGroup instanceof ProgressCategory) {
-            ((ProgressCategory) mDeviceListGroup).setProgress(start);
+        if (mDeviceListGroup instanceof BluetoothProgressCategory) {
+            ((BluetoothProgressCategory) mDeviceListGroup).setProgress(start);
         }
     }
 
diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 87d31e7..4b6a6b0 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;
 
@@ -30,6 +34,10 @@
  */
 public final class DevicePickerFragment extends DeviceListPreferenceFragment {
 
+    public DevicePickerFragment() {
+        super(null /* Not tied to any user restrictions. */);
+    }
+
     private boolean mNeedAuth;
     private String mLaunchPackage;
     private String mLaunchClass;
@@ -51,7 +59,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/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index 67d2258..335d888 100755
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -241,7 +241,7 @@
             mCachedDevice.setName((String) newValue);
         } else if (preference instanceof CheckBoxPreference) {
             LocalBluetoothProfile prof = getProfileOf(preference);
-            onProfileClicked(prof);
+            onProfileClicked(prof, (CheckBoxPreference) preference);
             return false;   // checkbox will update from onDeviceAttributesChanged() callback
         } else {
             return false;
@@ -250,7 +250,7 @@
         return true;
     }
 
-    private void onProfileClicked(LocalBluetoothProfile profile) {
+    private void onProfileClicked(LocalBluetoothProfile profile, CheckBoxPreference profilePref) {
         BluetoothDevice device = mCachedDevice.getDevice();
 
         int status = profile.getConnectionStatus(device);
@@ -260,8 +260,14 @@
         if (isConnected) {
             askDisconnect(getActivity(), profile);
         } else {
-            profile.setPreferred(device, true);
-            mCachedDevice.connectProfile(profile);
+            if (profile.isPreferred(device)) {
+                // profile is preferred but not connected: disable auto-connect
+                profile.setPreferred(device, false);
+                refreshProfilePreference(profilePref, profile);
+            } else {
+                profile.setPreferred(device, true);
+                mCachedDevice.connectProfile(profile);
+            }
         }
     }
 
@@ -357,8 +363,4 @@
     private void unpairDevice() {
         mCachedDevice.unpair();
     }
-
-    private boolean getAutoConnect(LocalBluetoothProfile prof) {
-        return prof.isPreferred(mCachedDevice.getDevice());
-    }
 }
diff --git a/src/com/android/settings/bluetooth/DockEventReceiver.java b/src/com/android/settings/bluetooth/DockEventReceiver.java
index a3b6b3c..048b098 100644
--- a/src/com/android/settings/bluetooth/DockEventReceiver.java
+++ b/src/com/android/settings/bluetooth/DockEventReceiver.java
@@ -59,8 +59,11 @@
 
         if (Intent.ACTION_DOCK_EVENT.equals(intent.getAction())
                 || ACTION_DOCK_SHOW_UI.endsWith(intent.getAction())) {
-            if (device == null) {
-                if (DEBUG) Log.d(TAG, "Device is missing");
+            if ((device == null) && (ACTION_DOCK_SHOW_UI.endsWith(intent.getAction()) ||
+                    ((state != Intent.EXTRA_DOCK_STATE_UNDOCKED) &&
+                     (state != Intent.EXTRA_DOCK_STATE_LE_DESK)))) {
+                if (DEBUG) Log.d(TAG,
+                        "Wrong state: "+state+" or intent: "+intent.toString()+" with null device");
                 return;
             }
 
diff --git a/src/com/android/settings/bluetooth/DockService.java b/src/com/android/settings/bluetooth/DockService.java
index 943c3f9..c9a18a3 100644
--- a/src/com/android/settings/bluetooth/DockService.java
+++ b/src/com/android/settings/bluetooth/DockService.java
@@ -36,6 +36,7 @@
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.Message;
+import android.provider.Settings;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -119,6 +120,8 @@
     private int mPendingTurnOnStartId = INVALID_STARTID;
     private int mPendingTurnOffStartId = INVALID_STARTID;
 
+    private CheckBox mAudioMediaCheckbox;
+
     @Override
     public void onCreate() {
         if (DEBUG) Log.d(TAG, "onCreate");
@@ -267,7 +270,9 @@
 
         switch (msgType) {
             case MSG_TYPE_SHOW_UI:
-                createDialog(device, state, startId);
+                if (device != null) {
+                    createDialog(device, state, startId);
+                }
                 break;
 
             case MSG_TYPE_DOCKED:
@@ -325,28 +330,30 @@
     private boolean msgTypeUndockedPermanent(BluetoothDevice device, int startId) {
         // Grace period passed. Disconnect.
         handleUndocked(device);
-        final SharedPreferences prefs = getPrefs();
+        if (device != null) {
+            final SharedPreferences prefs = getPrefs();
 
-        if (DEBUG) {
-            Log.d(TAG, "DISABLE_BT_WHEN_UNDOCKED = "
-                    + prefs.getBoolean(KEY_DISABLE_BT_WHEN_UNDOCKED, false));
-        }
+            if (DEBUG) {
+                Log.d(TAG, "DISABLE_BT_WHEN_UNDOCKED = "
+                        + prefs.getBoolean(KEY_DISABLE_BT_WHEN_UNDOCKED, false));
+            }
 
-        if (prefs.getBoolean(KEY_DISABLE_BT_WHEN_UNDOCKED, false)) {
-            if (hasOtherConnectedDevices(device)) {
-                // Don't disable BT if something is connected
-                prefs.edit().remove(KEY_DISABLE_BT_WHEN_UNDOCKED).apply();
-            } else {
-                // BT was disabled when we first docked
-                if (DEBUG) {
-                    Log.d(TAG, "QUEUED BT DISABLE");
+            if (prefs.getBoolean(KEY_DISABLE_BT_WHEN_UNDOCKED, false)) {
+                if (hasOtherConnectedDevices(device)) {
+                    // Don't disable BT if something is connected
+                    prefs.edit().remove(KEY_DISABLE_BT_WHEN_UNDOCKED).apply();
+                } else {
+                    // BT was disabled when we first docked
+                    if (DEBUG) {
+                        Log.d(TAG, "QUEUED BT DISABLE");
+                    }
+                    // Queue a delayed msg to disable BT
+                    Message newMsg = mServiceHandler.obtainMessage(
+                            MSG_TYPE_DISABLE_BT, 0, startId, null);
+                    mServiceHandler.sendMessageDelayed(newMsg,
+                            DISABLE_BT_GRACE_PERIOD);
+                    return true;
                 }
-                // Queue a delayed msg to disable BT
-                Message newMsg = mServiceHandler.obtainMessage(
-                        MSG_TYPE_DISABLE_BT, 0, startId, null);
-                mServiceHandler.sendMessageDelayed(newMsg,
-                        DISABLE_BT_GRACE_PERIOD);
-                return true;
             }
         }
         return false;
@@ -367,29 +374,41 @@
         mServiceHandler.removeMessages(MSG_TYPE_DISABLE_BT);
         getPrefs().edit().remove(KEY_DISABLE_BT).apply();
 
-        if (device != null && !device.equals(mDevice)) {
-            if (mDevice != null) {
-                // Not expected. Cleanup/undock existing
-                handleUndocked(mDevice);
+        if (device != null) {
+            if (!device.equals(mDevice)) {
+                if (mDevice != null) {
+                    // Not expected. Cleanup/undock existing
+                    handleUndocked(mDevice);
+                }
+
+                mDevice = device;
+
+                // Register first in case LocalBluetoothProfileManager
+                // becomes ready after isManagerReady is called and it
+                // would be too late to register a service listener.
+                mProfileManager.addServiceListener(this);
+                if (mProfileManager.isManagerReady()) {
+                    handleDocked(device, state, startId);
+                    // Not needed after all
+                    mProfileManager.removeServiceListener(this);
+                } else {
+                    final BluetoothDevice d = device;
+                    mRunnable = new Runnable() {
+                        public void run() {
+                            handleDocked(d, state, startId);  // FIXME: WTF runnable here?
+                        }
+                    };
+                    return true;
+                }
             }
-
-            mDevice = device;
-
-            // Register first in case LocalBluetoothProfileManager
-            // becomes ready after isManagerReady is called and it
-            // would be too late to register a service listener.
-            mProfileManager.addServiceListener(this);
-            if (mProfileManager.isManagerReady()) {
-                handleDocked(device, state, startId);
-                // Not needed after all
-                mProfileManager.removeServiceListener(this);
-            } else {
-                final BluetoothDevice d = device;
-                mRunnable = new Runnable() {
-                    public void run() {
-                        handleDocked(d, state, startId);  // FIXME: WTF runnable here?
-                    }
-                };
+        } else {
+            // display dialog to enable dock for media audio only in the case of low end docks and
+            // if not already selected by user
+            int dockAudioMediaEnabled = Settings.Global.getInt(getContentResolver(),
+                    Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, -1);
+            if (dockAudioMediaEnabled == -1 &&
+                    state == Intent.EXTRA_DOCK_STATE_LE_DESK) {
+                handleDocked(null, state, startId);
                 return true;
             }
         }
@@ -427,21 +446,25 @@
                     + " Device: " + (device == null ? "null" : device.getAliasName()));
         }
 
-        if (device == null) {
-            Log.w(TAG, "device is null");
-            return null;
-        }
-
         int msgType;
         switch (state) {
             case Intent.EXTRA_DOCK_STATE_UNDOCKED:
                 msgType = MSG_TYPE_UNDOCKED_TEMPORARY;
                 break;
             case Intent.EXTRA_DOCK_STATE_DESK:
-            case Intent.EXTRA_DOCK_STATE_LE_DESK:
             case Intent.EXTRA_DOCK_STATE_HE_DESK:
             case Intent.EXTRA_DOCK_STATE_CAR:
+                if (device == null) {
+                    Log.w(TAG, "device is null");
+                    return null;
+                }
+                /// Fall Through ///
+            case Intent.EXTRA_DOCK_STATE_LE_DESK:
                 if (DockEventReceiver.ACTION_DOCK_SHOW_UI.equals(intent.getAction())) {
+                    if (device == null) {
+                        Log.w(TAG, "device is null");
+                        return null;
+                    }
                     msgType = MSG_TYPE_SHOW_UI;
                 } else {
                     msgType = MSG_TYPE_DOCKED;
@@ -474,35 +497,55 @@
 
         startForeground(0, new Notification());
 
-        // Device in a new dock.
-        boolean firstTime = !LocalBluetoothPreferences.hasDockAutoConnectSetting(this, device.getAddress());
-
-        CharSequence[] items = initBtSettings(device, state, firstTime);
-
         final AlertDialog.Builder ab = new AlertDialog.Builder(this);
-        ab.setTitle(getString(R.string.bluetooth_dock_settings_title));
+        View view;
+        LayoutInflater inflater = (LayoutInflater)getSystemService(LAYOUT_INFLATER_SERVICE);
 
-        // Profiles
-        ab.setMultiChoiceItems(items, mCheckedItems, mMultiClickListener);
+        mAudioMediaCheckbox = null;
 
-        // Remember this settings
-        LayoutInflater inflater = (LayoutInflater)
-                getSystemService(LAYOUT_INFLATER_SERVICE);
+        if (device != null) {
+            // Device in a new dock.
+            boolean firstTime =
+                    !LocalBluetoothPreferences.hasDockAutoConnectSetting(this, device.getAddress());
+
+            CharSequence[] items = initBtSettings(device, state, firstTime);
+
+            ab.setTitle(getString(R.string.bluetooth_dock_settings_title));
+
+            // Profiles
+            ab.setMultiChoiceItems(items, mCheckedItems, mMultiClickListener);
+
+            // Remember this settings
+            view = inflater.inflate(R.layout.remember_dock_setting, null);
+            CheckBox rememberCheckbox = (CheckBox) view.findViewById(R.id.remember);
+
+            // check "Remember setting" by default if no value was saved
+            boolean checked = firstTime ||
+                    LocalBluetoothPreferences.getDockAutoConnectSetting(this, device.getAddress());
+            rememberCheckbox.setChecked(checked);
+            rememberCheckbox.setOnCheckedChangeListener(mCheckedChangeListener);
+            if (DEBUG) {
+                Log.d(TAG, "Auto connect = "
+                  + LocalBluetoothPreferences.getDockAutoConnectSetting(this, device.getAddress()));
+            }
+        } else {
+            ab.setTitle(getString(R.string.bluetooth_dock_settings_title));
+
+            view = inflater.inflate(R.layout.dock_audio_media_enable_dialog, null);
+            mAudioMediaCheckbox =
+                    (CheckBox) view.findViewById(R.id.dock_audio_media_enable_cb);
+
+            boolean checked = Settings.Global.getInt(getContentResolver(),
+                                    Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, 0) == 1;
+
+            mAudioMediaCheckbox.setChecked(checked);
+            mAudioMediaCheckbox.setOnCheckedChangeListener(mCheckedChangeListener);
+        }
+
         float pixelScaleFactor = getResources().getDisplayMetrics().density;
-        View view = inflater.inflate(R.layout.remember_dock_setting, null);
-        CheckBox rememberCheckbox = (CheckBox) view.findViewById(R.id.remember);
-
-        // check "Remember setting" by default if no value was saved
-        boolean checked = firstTime || LocalBluetoothPreferences.getDockAutoConnectSetting(this, device.getAddress());
-        rememberCheckbox.setChecked(checked);
-        rememberCheckbox.setOnCheckedChangeListener(mCheckedChangeListener);
         int viewSpacingLeft = (int) (14 * pixelScaleFactor);
         int viewSpacingRight = (int) (14 * pixelScaleFactor);
         ab.setView(view, viewSpacingLeft, 0 /* top */, viewSpacingRight, 0 /* bottom */);
-        if (DEBUG) {
-            Log.d(TAG, "Auto connect = "
-                    + LocalBluetoothPreferences.getDockAutoConnectSetting(this, device.getAddress()));
-        }
 
         // Ok Button
         ab.setPositiveButton(getString(android.R.string.ok), mClickListener);
@@ -536,6 +579,9 @@
                     if (mDevice != null) {
                         LocalBluetoothPreferences.saveDockAutoConnectSetting(
                                 DockService.this, mDevice.getAddress(), isChecked);
+                    } else {
+                        Settings.Global.putInt(getContentResolver(),
+                                Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, isChecked ? 1 : 0);
                     }
                 }
             };
@@ -559,19 +605,24 @@
     private final DialogInterface.OnClickListener mClickListener =
             new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialog, int which) {
-                    if (which == DialogInterface.BUTTON_POSITIVE
-                            && mDevice != null) {
-                        if (!LocalBluetoothPreferences
-                                .hasDockAutoConnectSetting(
-                                        DockService.this,
-                                        mDevice.getAddress())) {
-                            LocalBluetoothPreferences
-                                    .saveDockAutoConnectSetting(
+                    if (which == DialogInterface.BUTTON_POSITIVE) {
+                        if (mDevice != null) {
+                            if (!LocalBluetoothPreferences
+                                    .hasDockAutoConnectSetting(
                                             DockService.this,
-                                            mDevice.getAddress(), true);
-                        }
+                                            mDevice.getAddress())) {
+                                LocalBluetoothPreferences
+                                        .saveDockAutoConnectSetting(
+                                                DockService.this,
+                                                mDevice.getAddress(), true);
+                            }
 
-                        applyBtSettings(mDevice, mStartIdAssociatedWithDialog);
+                            applyBtSettings(mDevice, mStartIdAssociatedWithDialog);
+                        } else if (mAudioMediaCheckbox != null) {
+                            Settings.Global.putInt(getContentResolver(),
+                                    Settings.Global.DOCK_AUDIO_MEDIA_ENABLED,
+                                    mAudioMediaCheckbox.isChecked() ? 1 : 0);
+                        }
                     }
                 }
             };
@@ -823,7 +874,8 @@
 
     private synchronized void handleDocked(BluetoothDevice device, int state,
             int startId) {
-        if (LocalBluetoothPreferences.getDockAutoConnectSetting(this, device.getAddress())) {
+        if (device != null &&
+                LocalBluetoothPreferences.getDockAutoConnectSetting(this, device.getAddress())) {
             // Setting == auto connect
             initBtSettings(device, state, false);
             applyBtSettings(mDevice, startId);
@@ -841,8 +893,10 @@
         }
         mDevice = null;
         mPendingDevice = null;
-        CachedBluetoothDevice cachedDevice = getCachedBluetoothDevice(device);
-        cachedDevice.disconnect();
+        if (device != null) {
+            CachedBluetoothDevice cachedDevice = getCachedBluetoothDevice(device);
+            cachedDevice.disconnect();
+        }
     }
 
     private CachedBluetoothDevice getCachedBluetoothDevice(BluetoothDevice device) {
diff --git a/src/com/android/settings/bluetooth/HeadsetProfile.java b/src/com/android/settings/bluetooth/HeadsetProfile.java
old mode 100644
new mode 100755
index 99d070b..1caeb65
--- a/src/com/android/settings/bluetooth/HeadsetProfile.java
+++ b/src/com/android/settings/bluetooth/HeadsetProfile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 The Android Open Source Project
+ * 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.
@@ -16,6 +16,7 @@
 
 package com.android.settings.bluetooth;
 
+import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothHeadset;
@@ -27,6 +28,7 @@
 
 import com.android.settings.R;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -34,9 +36,10 @@
  */
 final class HeadsetProfile implements LocalBluetoothProfile {
     private static final String TAG = "HeadsetProfile";
+    private static boolean V = true;
 
     private BluetoothHeadset mService;
-    private boolean mProfileReady;
+    private boolean mIsProfileReady;
 
     private final LocalBluetoothAdapter mLocalAdapter;
     private final CachedBluetoothDeviceManager mDeviceManager;
@@ -57,38 +60,38 @@
             implements BluetoothProfile.ServiceListener {
 
         public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            if (V) Log.d(TAG,"Bluetooth service connected");
             mService = (BluetoothHeadset) proxy;
-            mProfileReady = true;
-            // 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()) {
-                return;
+            while (!deviceList.isEmpty()) {
+                BluetoothDevice nextDevice = deviceList.remove(0);
+                CachedBluetoothDevice device = mDeviceManager.findDevice(nextDevice);
+                // we may add a new device here, but generally this should not happen
+                if (device == null) {
+                    Log.w(TAG, "HeadsetProfile found new device: " + nextDevice);
+                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, nextDevice);
+                }
+                device.onProfileStateChanged(HeadsetProfile.this,
+                        BluetoothProfile.STATE_CONNECTED);
+                device.refresh();
             }
-            BluetoothDevice firstDevice = deviceList.get(0);
-            CachedBluetoothDevice device = mDeviceManager.findDevice(firstDevice);
-            // 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);
-            }
-            device.onProfileStateChanged(HeadsetProfile.this,
-                    BluetoothProfile.STATE_CONNECTED);
 
             mProfileManager.callServiceConnectedListeners();
+            mIsProfileReady=true;
         }
 
         public void onServiceDisconnected(int profile) {
-            mProfileReady = false;
-            mService = null;
+            if (V) Log.d(TAG,"Bluetooth service disconnected");
             mProfileManager.callServiceDisconnectedListeners();
+            mIsProfileReady=false;
         }
     }
 
-    // TODO(): The calls must get queued if mService becomes null.
-    // It can happen when the phone app crashes for some reason.
-    // All callers should have service listeners. Dock Service is the only
-    // one right now.
+    public boolean isProfileReady() {
+        return mIsProfileReady;
+    }
+
     HeadsetProfile(Context context, LocalBluetoothAdapter adapter,
             CachedBluetoothDeviceManager deviceManager,
             LocalBluetoothProfileManager profileManager) {
@@ -108,6 +111,7 @@
     }
 
     public boolean connect(BluetoothDevice device) {
+        if (mService == null) return false;
         List<BluetoothDevice> sinks = mService.getConnectedDevices();
         if (sinks != null) {
             for (BluetoothDevice sink : sinks) {
@@ -118,6 +122,7 @@
     }
 
     public boolean disconnect(BluetoothDevice device) {
+        if (mService == null) return false;
         List<BluetoothDevice> deviceList = mService.getConnectedDevices();
         if (!deviceList.isEmpty() && deviceList.get(0).equals(device)) {
             // Downgrade priority as user is disconnecting the headset.
@@ -132,7 +137,6 @@
 
     public int getConnectionStatus(BluetoothDevice device) {
         if (mService == null) return BluetoothProfile.STATE_DISCONNECTED;
-
         List<BluetoothDevice> deviceList = mService.getConnectedDevices();
 
         return !deviceList.isEmpty() && deviceList.get(0).equals(device)
@@ -141,14 +145,17 @@
     }
 
     public boolean isPreferred(BluetoothDevice device) {
+        if (mService == null) return false;
         return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
     }
 
     public int getPreferred(BluetoothDevice device) {
+        if (mService == null) return BluetoothProfile.PRIORITY_OFF;
         return mService.getPriority(device);
     }
 
     public void setPreferred(BluetoothDevice device, boolean preferred) {
+        if (mService == null) return;
         if (preferred) {
             if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
                 mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
@@ -158,8 +165,12 @@
         }
     }
 
-    public synchronized boolean isProfileReady() {
-        return mProfileReady;
+    public List<BluetoothDevice> getConnectedDevices() {
+        if (mService == null) return new ArrayList<BluetoothDevice>(0);
+        return mService.getDevicesMatchingConnectionStates(
+              new int[] {BluetoothProfile.STATE_CONNECTED,
+                         BluetoothProfile.STATE_CONNECTING,
+                         BluetoothProfile.STATE_DISCONNECTING});
     }
 
     public String toString() {
@@ -175,7 +186,7 @@
     }
 
     public int getSummaryResourceForDevice(BluetoothDevice device) {
-        int state = mService.getConnectionState(device);
+        int state = getConnectionStatus(device);
         switch (state) {
             case BluetoothProfile.STATE_DISCONNECTED:
                 return R.string.bluetooth_headset_profile_summary_use_for;
@@ -191,4 +202,17 @@
     public int getDrawableResource(BluetoothClass btClass) {
         return R.drawable.ic_bt_headset_hfp;
     }
+
+    protected void finalize() {
+        if (V) Log.d(TAG, "finalize()");
+        if (mService != null) {
+            try {
+                BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.HEADSET,
+                                                                       mService);
+                mService = null;
+            }catch (Throwable t) {
+                Log.w(TAG, "Error cleaning up HID proxy", t);
+            }
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/HidProfile.java b/src/com/android/settings/bluetooth/HidProfile.java
old mode 100644
new mode 100755
index 920f4bb..8df2845
--- a/src/com/android/settings/bluetooth/HidProfile.java
+++ b/src/com/android/settings/bluetooth/HidProfile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 The Android Open Source Project
+ * 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.
@@ -16,11 +16,13 @@
 
 package com.android.settings.bluetooth;
 
+import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothInputDevice;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
+import android.util.Log;
 
 import com.android.settings.R;
 
@@ -30,8 +32,15 @@
  * HidProfile handles Bluetooth HID profile.
  */
 final class HidProfile implements LocalBluetoothProfile {
+    private static final String TAG = "HidProfile";
+    private static boolean V = true;
+
     private BluetoothInputDevice mService;
-    private boolean mProfileReady;
+    private boolean mIsProfileReady;
+
+    private final LocalBluetoothAdapter mLocalAdapter;
+    private final CachedBluetoothDeviceManager mDeviceManager;
+    private final LocalBluetoothProfileManager mProfileManager;
 
     static final String NAME = "HID";
 
@@ -43,17 +52,40 @@
             implements BluetoothProfile.ServiceListener {
 
         public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            if (V) Log.d(TAG,"Bluetooth service connected");
             mService = (BluetoothInputDevice) proxy;
-            mProfileReady = true;
+            // We just bound to the service, so refresh the UI for any connected HID devices.
+            List<BluetoothDevice> deviceList = mService.getConnectedDevices();
+            while (!deviceList.isEmpty()) {
+                BluetoothDevice nextDevice = deviceList.remove(0);
+                CachedBluetoothDevice device = mDeviceManager.findDevice(nextDevice);
+                // we may add a new device here, but generally this should not happen
+                if (device == null) {
+                    Log.w(TAG, "HidProfile found new device: " + nextDevice);
+                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, nextDevice);
+                }
+                device.onProfileStateChanged(HidProfile.this, BluetoothProfile.STATE_CONNECTED);
+                device.refresh();
+            }
+            mIsProfileReady=true;
         }
 
         public void onServiceDisconnected(int profile) {
-            mProfileReady = false;
-            mService = null;
+            if (V) Log.d(TAG,"Bluetooth service disconnected");
+            mIsProfileReady=false;
         }
     }
 
-    HidProfile(Context context, LocalBluetoothAdapter adapter) {
+    public boolean isProfileReady() {
+        return mIsProfileReady;
+    }
+
+    HidProfile(Context context, LocalBluetoothAdapter adapter,
+        CachedBluetoothDeviceManager deviceManager,
+        LocalBluetoothProfileManager profileManager) {
+        mLocalAdapter = adapter;
+        mDeviceManager = deviceManager;
+        mProfileManager = profileManager;
         adapter.getProfileProxy(context, new InputDeviceServiceListener(),
                 BluetoothProfile.INPUT_DEVICE);
     }
@@ -67,14 +99,19 @@
     }
 
     public boolean connect(BluetoothDevice device) {
+        if (mService == null) return false;
         return mService.connect(device);
     }
 
     public boolean disconnect(BluetoothDevice device) {
+        if (mService == null) return false;
         return mService.disconnect(device);
     }
 
     public int getConnectionStatus(BluetoothDevice device) {
+        if (mService == null) {
+            return BluetoothProfile.STATE_DISCONNECTED;
+        }
         List<BluetoothDevice> deviceList = mService.getConnectedDevices();
 
         return !deviceList.isEmpty() && deviceList.get(0).equals(device)
@@ -83,14 +120,17 @@
     }
 
     public boolean isPreferred(BluetoothDevice device) {
+        if (mService == null) return false;
         return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
     }
 
     public int getPreferred(BluetoothDevice device) {
+        if (mService == null) return BluetoothProfile.PRIORITY_OFF;
         return mService.getPriority(device);
     }
 
     public void setPreferred(BluetoothDevice device, boolean preferred) {
+        if (mService == null) return;
         if (preferred) {
             if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
                 mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
@@ -100,10 +140,6 @@
         }
     }
 
-    public boolean isProfileReady() {
-        return mProfileReady;
-    }
-
     public String toString() {
         return NAME;
     }
@@ -118,7 +154,7 @@
     }
 
     public int getSummaryResourceForDevice(BluetoothDevice device) {
-        int state = mService.getConnectionState(device);
+        int state = getConnectionStatus(device);
         switch (state) {
             case BluetoothProfile.STATE_DISCONNECTED:
                 return R.string.bluetooth_hid_profile_summary_use_for;
@@ -149,4 +185,17 @@
                 return R.drawable.ic_bt_misc_hid;
         }
     }
+
+    protected void finalize() {
+        if (V) Log.d(TAG, "finalize()");
+        if (mService != null) {
+            try {
+                BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.INPUT_DEVICE,
+                                                                       mService);
+                mService = null;
+            }catch (Throwable t) {
+                Log.w(TAG, "Error cleaning up HID proxy", t);
+            }
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
index 7e62b0e..f00b801 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
@@ -19,14 +19,16 @@
 import android.app.QueuedWork;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.util.Log;
 
 /**
  * LocalBluetoothPreferences provides an interface to the preferences
  * related to Bluetooth.
  */
 final class LocalBluetoothPreferences {
-//    private static final String TAG = "LocalBluetoothPreferences";
-
+    private static final String TAG = "LocalBluetoothPreferences";
+    private static final boolean DEBUG = Utils.D;
     private static final String SHARED_PREFERENCES_NAME = "bluetooth_settings";
 
     // If a device was picked from the device picker or was in discoverable mode
@@ -60,6 +62,7 @@
             String deviceAddress) {
         LocalBluetoothManager manager = LocalBluetoothManager.getInstance(context);
         if (manager == null) {
+            if(DEBUG) Log.v(TAG, "manager == null - do not show dialog.");
             return false;
         }
 
@@ -68,6 +71,13 @@
             return true;
         }
 
+        // If in appliance mode, do not show dialog in foreground.
+        if ((context.getResources().getConfiguration().uiMode &
+                Configuration.UI_MODE_TYPE_APPLIANCE) == Configuration.UI_MODE_TYPE_APPLIANCE) {
+            if (DEBUG) Log.v(TAG, "in appliance mode - do not show dialog.");
+            return false;
+        }
+
         long currentTimeMillis = System.currentTimeMillis();
         SharedPreferences sharedPreferences = getSharedPreferences(context);
 
@@ -102,6 +112,7 @@
                 }
             }
         }
+        if (DEBUG) Log.v(TAG, "Found no reason to show the dialog - do not show dialog.");
         return false;
     }
 
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfile.java b/src/com/android/settings/bluetooth/LocalBluetoothProfile.java
old mode 100644
new mode 100755
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
index f3143f0..78d6441 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
@@ -19,19 +19,25 @@
 import android.bluetooth.BluetoothA2dp;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothHeadset;
+import android.bluetooth.BluetoothMap;
 import android.bluetooth.BluetoothInputDevice;
 import android.bluetooth.BluetoothPan;
+import android.bluetooth.BluetoothPbap;
 import android.bluetooth.BluetoothProfile;
 import android.bluetooth.BluetoothUuid;
 import android.content.Context;
 import android.content.Intent;
 import android.os.ParcelUuid;
 import android.util.Log;
+import android.os.Handler;
+import android.os.Message;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
+import java.util.List;
 
 /**
  * LocalBluetoothProfileManager provides access to the LocalBluetoothProfile
@@ -39,7 +45,7 @@
  */
 final class LocalBluetoothProfileManager {
     private static final String TAG = "LocalBluetoothProfileManager";
-
+    private static final boolean DEBUG = Utils.D;
     /** Singleton instance. */
     private static LocalBluetoothProfileManager sInstance;
 
@@ -74,9 +80,11 @@
 
     private A2dpProfile mA2dpProfile;
     private HeadsetProfile mHeadsetProfile;
+    private MapProfile mMapProfile;
     private final HidProfile mHidProfile;
     private OppProfile mOppProfile;
     private final PanProfile mPanProfile;
+    private final PbapServerProfile mPbapProfile;
 
     /**
      * Mapping from profile name, e.g. "HEADSET" to profile object.
@@ -105,7 +113,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);
 
@@ -113,7 +121,17 @@
         addPanProfile(mPanProfile, PanProfile.NAME,
                 BluetoothPan.ACTION_CONNECTION_STATE_CHANGED);
 
-        Log.d(TAG, "LocalBluetoothProfileManager construction complete");
+        if(DEBUG) Log.d(TAG, "Adding local MAP profile");
+        mMapProfile = new MapProfile(mContext, mLocalAdapter,
+                mDeviceManager, this);
+        addProfile(mMapProfile, MapProfile.NAME,
+                BluetoothMap.ACTION_CONNECTION_STATE_CHANGED);
+
+       //Create PBAP server profile, but do not add it to list of profiles
+       // as we do not need to monitor the profile as part of profile list
+        mPbapProfile = new PbapServerProfile(context);
+
+        if (DEBUG) Log.d(TAG, "LocalBluetoothProfileManager construction complete");
     }
 
     /**
@@ -127,8 +145,8 @@
         // A2DP
         if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.AudioSource)) {
             if (mA2dpProfile == null) {
-                Log.d(TAG, "Adding local A2DP profile");
-                mA2dpProfile = new A2dpProfile(mContext);
+                if(DEBUG) Log.d(TAG, "Adding local A2DP profile");
+                mA2dpProfile = new A2dpProfile(mContext, mLocalAdapter, mDeviceManager, this);
                 addProfile(mA2dpProfile, A2dpProfile.NAME,
                         BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);
             }
@@ -140,7 +158,7 @@
         if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Handsfree_AG) ||
             BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.HSP_AG)) {
             if (mHeadsetProfile == null) {
-                Log.d(TAG, "Adding local HEADSET profile");
+                if (DEBUG) Log.d(TAG, "Adding local HEADSET profile");
                 mHeadsetProfile = new HeadsetProfile(mContext, mLocalAdapter,
                         mDeviceManager, this);
                 addProfile(mHeadsetProfile, HeadsetProfile.NAME,
@@ -153,7 +171,7 @@
         // OPP
         if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.ObexObjectPush)) {
             if (mOppProfile == null) {
-                Log.d(TAG, "Adding local OPP profile");
+                if(DEBUG) Log.d(TAG, "Adding local OPP profile");
                 mOppProfile = new OppProfile();
                 // Note: no event handler for OPP, only name map.
                 mProfileNameMap.put(OppProfile.NAME, mOppProfile);
@@ -287,6 +305,10 @@
         return mHeadsetProfile;
     }
 
+    PbapServerProfile getPbapProfile(){
+        return mPbapProfile;
+    }
+
     /**
      * Fill in a list of LocalBluetoothProfile objects that are supported by
      * the local device and the remote device.
@@ -298,7 +320,8 @@
      */
     synchronized void updateProfiles(ParcelUuid[] uuids, ParcelUuid[] localUuids,
             Collection<LocalBluetoothProfile> profiles,
-            Collection<LocalBluetoothProfile> removedProfiles) {
+            Collection<LocalBluetoothProfile> removedProfiles,
+            boolean isPanNapConnected) {
         // Copy previous profile list into removedProfiles
         removedProfiles.clear();
         removedProfiles.addAll(profiles);
@@ -330,16 +353,20 @@
             removedProfiles.remove(mOppProfile);
         }
 
-        if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Hid) &&
+        if ((BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Hid) ||
+             BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Hogp)) &&
             mHidProfile != null) {
             profiles.add(mHidProfile);
             removedProfiles.remove(mHidProfile);
         }
 
-        if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.NAP) &&
-            mPanProfile != null) {
+        if(isPanNapConnected)
+            if(DEBUG) Log.d(TAG, "Valid PAN-NAP connection exists.");
+        if ((BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.NAP) &&
+            mPanProfile != null) || isPanNapConnected) {
             profiles.add(mPanProfile);
             removedProfiles.remove(mPanProfile);
         }
     }
+
 }
diff --git a/src/com/android/settings/bluetooth/MapProfile.java b/src/com/android/settings/bluetooth/MapProfile.java
new file mode 100644
index 0000000..fb1b180
--- /dev/null
+++ b/src/com/android/settings/bluetooth/MapProfile.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothMap;
+import android.bluetooth.BluetoothProfile;
+import android.bluetooth.BluetoothUuid;
+import android.content.Context;
+import android.os.ParcelUuid;
+import android.util.Log;
+
+import com.android.settings.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * MapProfile handles Bluetooth MAP profile.
+ */
+final class MapProfile implements LocalBluetoothProfile {
+    private static final String TAG = "MapProfile";
+    private static boolean V = true;
+
+    private BluetoothMap mService;
+    private boolean mIsProfileReady;
+
+    private final LocalBluetoothAdapter mLocalAdapter;
+    private final CachedBluetoothDeviceManager mDeviceManager;
+    private final LocalBluetoothProfileManager mProfileManager;
+
+    static final ParcelUuid[] UUIDS = {
+        BluetoothUuid.MAP,
+        BluetoothUuid.MNS,
+        BluetoothUuid.MAS,
+    };
+
+    static final String NAME = "MAP";
+
+    // Order of this profile in device profiles list
+
+    // These callbacks run on the main thread.
+    private final class MapServiceListener
+            implements BluetoothProfile.ServiceListener {
+
+        public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            if (V) Log.d(TAG,"Bluetooth service connected");
+            mService = (BluetoothMap) proxy;
+            // We just bound to the service, so refresh the UI for any connected MAP devices.
+            List<BluetoothDevice> deviceList = mService.getConnectedDevices();
+            while (!deviceList.isEmpty()) {
+                BluetoothDevice nextDevice = deviceList.remove(0);
+                CachedBluetoothDevice device = mDeviceManager.findDevice(nextDevice);
+                // we may add a new device here, but generally this should not happen
+                if (device == null) {
+                    Log.w(TAG, "MapProfile found new device: " + nextDevice);
+                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, nextDevice);
+                }
+                device.onProfileStateChanged(MapProfile.this,
+                        BluetoothProfile.STATE_CONNECTED);
+                device.refresh();
+            }
+
+            mProfileManager.callServiceConnectedListeners();
+            mIsProfileReady=true;
+        }
+
+        public void onServiceDisconnected(int profile) {
+            if (V) Log.d(TAG,"Bluetooth service disconnected");
+            mProfileManager.callServiceDisconnectedListeners();
+            mIsProfileReady=false;
+        }
+    }
+
+    public boolean isProfileReady() {
+        if(V) Log.d(TAG,"isProfileReady(): "+ mIsProfileReady);
+        return mIsProfileReady;
+    }
+
+    MapProfile(Context context, LocalBluetoothAdapter adapter,
+            CachedBluetoothDeviceManager deviceManager,
+            LocalBluetoothProfileManager profileManager) {
+        mLocalAdapter = adapter;
+        mDeviceManager = deviceManager;
+        mProfileManager = profileManager;
+        mLocalAdapter.getProfileProxy(context, new MapServiceListener(),
+                BluetoothProfile.MAP);
+    }
+
+    public boolean isConnectable() {
+        return true;
+    }
+
+    public boolean isAutoConnectable() {
+        return true;
+    }
+
+    public boolean connect(BluetoothDevice device) {
+        if(V)Log.d(TAG,"connect() - should not get called");
+        return true; // MAP never connects out
+    }
+
+    public boolean disconnect(BluetoothDevice device) {
+        if (mService == null) return false;
+        List<BluetoothDevice> deviceList = mService.getConnectedDevices();
+        if (!deviceList.isEmpty() && deviceList.get(0).equals(device)) {
+            if (mService.getPriority(device) > BluetoothProfile.PRIORITY_ON) {
+                mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
+            }
+            return mService.disconnect(device);
+        } else {
+            return false;
+        }
+    }
+
+    public int getConnectionStatus(BluetoothDevice device) {
+        if (mService == null) return BluetoothProfile.STATE_DISCONNECTED;
+        List<BluetoothDevice> deviceList = mService.getConnectedDevices();
+        if(V) Log.d(TAG,"getConnectionStatus: status is: "+ mService.getConnectionState(device));
+
+        return !deviceList.isEmpty() && deviceList.get(0).equals(device)
+                ? mService.getConnectionState(device)
+                : BluetoothProfile.STATE_DISCONNECTED;
+    }
+
+    public boolean isPreferred(BluetoothDevice device) {
+        if (mService == null) return false;
+        return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
+    }
+
+    public int getPreferred(BluetoothDevice device) {
+        if (mService == null) return BluetoothProfile.PRIORITY_OFF;
+        return mService.getPriority(device);
+    }
+
+    public void setPreferred(BluetoothDevice device, boolean preferred) {
+        if (mService == null) return;
+        if (preferred) {
+            if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
+                mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
+            }
+        } else {
+            mService.setPriority(device, BluetoothProfile.PRIORITY_OFF);
+        }
+    }
+
+    public List<BluetoothDevice> getConnectedDevices() {
+        if (mService == null) return new ArrayList<BluetoothDevice>(0);
+        return mService.getDevicesMatchingConnectionStates(
+              new int[] {BluetoothProfile.STATE_CONNECTED,
+                         BluetoothProfile.STATE_CONNECTING,
+                         BluetoothProfile.STATE_DISCONNECTING});
+    }
+
+    public String toString() {
+        return NAME;
+    }
+
+    public int getOrdinal() {
+        return BluetoothProfile.MAP;
+    }
+
+    public int getNameResource(BluetoothDevice device) {
+        return R.string.bluetooth_profile_map;
+    }
+
+    public int getSummaryResourceForDevice(BluetoothDevice device) {
+        int state = getConnectionStatus(device);
+        switch (state) {
+            case BluetoothProfile.STATE_DISCONNECTED:
+                return R.string.bluetooth_map_profile_summary_use_for;
+
+            case BluetoothProfile.STATE_CONNECTED:
+                return R.string.bluetooth_map_profile_summary_connected;
+
+            default:
+                return Utils.getConnectionStateSummary(state);
+        }
+    }
+
+    public int getDrawableResource(BluetoothClass btClass) {
+        return R.drawable.ic_bt_cellphone;
+    }
+
+    protected void finalize() {
+        if (V) Log.d(TAG, "finalize()");
+        if (mService != null) {
+            try {
+                BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.MAP,
+                                                                       mService);
+                mService = null;
+            }catch (Throwable t) {
+                Log.w(TAG, "Error cleaning up MAP proxy", t);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/bluetooth/OppProfile.java b/src/com/android/settings/bluetooth/OppProfile.java
old mode 100644
new mode 100755
diff --git a/src/com/android/settings/bluetooth/PanProfile.java b/src/com/android/settings/bluetooth/PanProfile.java
old mode 100644
new mode 100755
index 3db4a2b..f6e0691
--- a/src/com/android/settings/bluetooth/PanProfile.java
+++ b/src/com/android/settings/bluetooth/PanProfile.java
@@ -22,6 +22,7 @@
 import android.bluetooth.BluetoothPan;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
+import android.util.Log;
 
 import com.android.settings.R;
 
@@ -32,7 +33,11 @@
  * PanProfile handles Bluetooth PAN profile (NAP and PANU).
  */
 final class PanProfile implements LocalBluetoothProfile {
+    private static final String TAG = "PanProfile";
+    private static boolean V = true;
+
     private BluetoothPan mService;
+    private boolean mIsProfileReady;
 
     // Tethering direction for each device
     private final HashMap<BluetoothDevice, Integer> mDeviceRoleMap =
@@ -48,14 +53,21 @@
             implements BluetoothProfile.ServiceListener {
 
         public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            if (V) Log.d(TAG,"Bluetooth service connected");
             mService = (BluetoothPan) proxy;
+            mIsProfileReady=true;
         }
 
         public void onServiceDisconnected(int profile) {
-            mService = null;
+            if (V) Log.d(TAG,"Bluetooth service disconnected");
+            mIsProfileReady=false;
         }
     }
 
+    public boolean isProfileReady() {
+        return mIsProfileReady;
+    }
+
     PanProfile(Context context) {
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
         adapter.getProfileProxy(context, new PanServiceListener(),
@@ -71,6 +83,7 @@
     }
 
     public boolean connect(BluetoothDevice device) {
+        if (mService == null) return false;
         List<BluetoothDevice> sinks = mService.getConnectedDevices();
         if (sinks != null) {
             for (BluetoothDevice sink : sinks) {
@@ -81,15 +94,20 @@
     }
 
     public boolean disconnect(BluetoothDevice device) {
+        if (mService == null) return false;
         return mService.disconnect(device);
     }
 
     public int getConnectionStatus(BluetoothDevice device) {
+        if (mService == null) {
+            return BluetoothProfile.STATE_DISCONNECTED;
+        }
         return mService.getConnectionState(device);
     }
 
     public boolean isPreferred(BluetoothDevice device) {
-        return true;
+        // return current connection status so profile checkbox is set correctly
+        return getConnectionStatus(device) == BluetoothProfile.STATE_CONNECTED;
     }
 
     public int getPreferred(BluetoothDevice device) {
@@ -100,10 +118,6 @@
         // ignore: isPreferred is always true for PAN
     }
 
-    public boolean isProfileReady() {
-        return true;
-    }
-
     public String toString() {
         return NAME;
     }
@@ -121,7 +135,7 @@
     }
 
     public int getSummaryResourceForDevice(BluetoothDevice device) {
-        int state = mService.getConnectionState(device);
+        int state = getConnectionStatus(device);
         switch (state) {
             case BluetoothProfile.STATE_DISCONNECTED:
                 return R.string.bluetooth_pan_profile_summary_use_for;
@@ -154,4 +168,16 @@
             return false;
         }
     }
+
+    protected void finalize() {
+        if (V) Log.d(TAG, "finalize()");
+        if (mService != null) {
+            try {
+                BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.PAN, mService);
+                mService = null;
+            }catch (Throwable t) {
+                Log.w(TAG, "Error cleaning up PAN proxy", t);
+            }
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/PbapServerProfile.java b/src/com/android/settings/bluetooth/PbapServerProfile.java
new file mode 100755
index 0000000..1f5ca32
--- /dev/null
+++ b/src/com/android/settings/bluetooth/PbapServerProfile.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothPbap;
+import android.bluetooth.BluetoothProfile;
+import android.content.Context;
+import android.util.Log;
+
+import com.android.settings.R;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * PBAPServer Profile
+ */
+final class PbapServerProfile implements LocalBluetoothProfile {
+    private static final String TAG = "PbapServerProfile";
+    private static boolean V = true;
+
+    private BluetoothPbap mService;
+    private boolean mIsProfileReady;
+
+    static final String NAME = "PBAP Server";
+
+    // Order of this profile in device profiles list
+    private static final int ORDINAL = 6;
+
+    // These callbacks run on the main thread.
+    private final class PbapServiceListener
+            implements BluetoothPbap.ServiceListener {
+
+        public void onServiceConnected(BluetoothPbap proxy) {
+            if (V) Log.d(TAG,"Bluetooth service connected");
+            mService = (BluetoothPbap) proxy;
+            mIsProfileReady=true;
+        }
+
+        public void onServiceDisconnected() {
+            if (V) Log.d(TAG,"Bluetooth service disconnected");
+            mIsProfileReady=false;
+        }
+    }
+
+    public boolean isProfileReady() {
+        return mIsProfileReady;
+    }
+
+    PbapServerProfile(Context context) {
+        BluetoothPbap pbap = new BluetoothPbap(context, new PbapServiceListener());
+    }
+
+    public boolean isConnectable() {
+        return true;
+    }
+
+    public boolean isAutoConnectable() {
+        return false;
+    }
+
+    public boolean connect(BluetoothDevice device) {
+        /*Can't connect from server */
+        return false;
+
+    }
+
+    public boolean disconnect(BluetoothDevice device) {
+        if (mService == null) return false;
+        return mService.disconnect();
+    }
+
+    public int getConnectionStatus(BluetoothDevice device) {
+        if (mService == null) {
+            return BluetoothProfile.STATE_DISCONNECTED;
+        }
+        if (mService.isConnected(device))
+            return BluetoothProfile.STATE_CONNECTED;
+        else
+            return BluetoothProfile.STATE_DISCONNECTED;
+    }
+
+    public boolean isPreferred(BluetoothDevice device) {
+        return false;
+    }
+
+    public int getPreferred(BluetoothDevice device) {
+        return -1;
+    }
+
+    public void setPreferred(BluetoothDevice device, boolean preferred) {
+        // ignore: isPreferred is always true for PBAP
+    }
+
+    public String toString() {
+        return NAME;
+    }
+
+    public int getOrdinal() {
+        return ORDINAL;
+    }
+
+    public int getNameResource(BluetoothDevice device) {
+      return 0;
+    }
+
+    public int getSummaryResourceForDevice(BluetoothDevice device) {
+        return 0;
+    }
+
+    public int getDrawableResource(BluetoothClass btClass) {
+        return 0;
+    }
+    protected void finalize() {
+        if (V) Log.d(TAG, "finalize()");
+        if (mService != null) {
+            try {
+                mService.close();
+                mService = null;
+            }catch (Throwable t) {
+                Log.w(TAG, "Error cleaning up PBAP proxy", t);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/bluetooth/RequestPermissionActivity.java b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
index 529312d..9f266a5 100644
--- a/src/com/android/settings/bluetooth/RequestPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
@@ -149,8 +149,6 @@
 
     private void createDialog() {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setIcon(android.R.drawable.ic_dialog_info);
-        builder.setTitle(getString(R.string.bluetooth_permission_request));
 
         if (mNeededToEnableBluetooth) {
             // RequestPermissionHelperActivity has gotten confirmation from user
@@ -167,8 +165,8 @@
                 builder.setMessage(
                         getString(R.string.bluetooth_ask_discovery, mTimeout));
             }
-            builder.setPositiveButton(getString(R.string.yes), this);
-            builder.setNegativeButton(getString(R.string.no), this);
+            builder.setPositiveButton(getString(R.string.allow), this);
+            builder.setNegativeButton(getString(R.string.deny), this);
         }
 
         mDialog = builder.create();
@@ -228,8 +226,12 @@
         } else if (mLocalAdapter.setScanMode(
                 BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE, mTimeout)) {
             // If already in discoverable mode, this will extend the timeout.
+            long endTime = System.currentTimeMillis() + (long) mTimeout * 1000;
             LocalBluetoothPreferences.persistDiscoverableEndTimestamp(
-                    this, System.currentTimeMillis() + (long) mTimeout * 1000);
+                    this, endTime);
+            if (0 < mTimeout) {
+               BluetoothDiscoverableTimeoutReceiver.setDiscoverableAlarm(this, endTime);
+            }
             returnCode = mTimeout;
             // Activity.RESULT_FIRST_USER should be 1
             if (returnCode < RESULT_FIRST_USER) {
diff --git a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java
index 5c4b828..f108513 100644
--- a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java
+++ b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java
@@ -72,26 +72,20 @@
 
     void createDialog() {
         final AlertController.AlertParams p = mAlertParams;
-        p.mIconId = android.R.drawable.ic_dialog_info;
-        p.mTitle = getString(R.string.bluetooth_permission_request);
-
-        View view = getLayoutInflater().inflate(R.layout.bluetooth_discoverable, null);
-        p.mView = view;
-        TextView tv = (TextView) view.findViewById(R.id.message);
 
         if (mEnableOnly) {
-            tv.setText(getString(R.string.bluetooth_ask_enablement));
+            p.mMessage = getString(R.string.bluetooth_ask_enablement);
         } else {
             if (mTimeout == BluetoothDiscoverableEnabler.DISCOVERABLE_TIMEOUT_NEVER) {
-                tv.setText(getString(R.string.bluetooth_ask_enablement_and_lasting_discovery));
+                p.mMessage = getString(R.string.bluetooth_ask_enablement_and_lasting_discovery);
             } else {
-                tv.setText(getString(R.string.bluetooth_ask_enablement_and_discovery, mTimeout));
+                p.mMessage = getString(R.string.bluetooth_ask_enablement_and_discovery, mTimeout);
             }
         }
 
-        p.mPositiveButtonText = getString(R.string.yes);
+        p.mPositiveButtonText = getString(R.string.allow);
         p.mPositiveButtonListener = this;
-        p.mNegativeButtonText = getString(R.string.no);
+        p.mNegativeButtonText = getString(R.string.deny);
         p.mNegativeButtonListener = this;
 
         setupAlert();
diff --git a/src/com/android/settings/deviceinfo/FileItemInfoLayout.java b/src/com/android/settings/deviceinfo/FileItemInfoLayout.java
index 990f7f2..542d7c9 100644
--- a/src/com/android/settings/deviceinfo/FileItemInfoLayout.java
+++ b/src/com/android/settings/deviceinfo/FileItemInfoLayout.java
@@ -2,10 +2,9 @@
 
 package com.android.settings.deviceinfo;
 
-import com.android.settings.R;
-
 import android.content.Context;
-import android.os.Environment;
+import android.os.Environment.UserEnvironment;
+import android.os.UserHandle;
 import android.util.AttributeSet;
 import android.view.ViewDebug;
 import android.widget.CheckBox;
@@ -13,6 +12,8 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.android.settings.R;
+
 /**
  * Handles display of a single row entry on Settings --> Storage --> Misc Files screen
  */
@@ -20,8 +21,9 @@
     private TextView mFileNameView;
     private TextView mFileSizeView;
     private CheckBox mCheckbox;
-    private static final int mLengthExternalStorageDirPrefix =
-            Environment.getExternalStorageDirectory().getAbsolutePath().length() + 1;
+
+    private static final int sLengthExternalStorageDirPrefix = new UserEnvironment(
+            UserHandle.myUserId()).getExternalStorageDirectory().getAbsolutePath().length() + 1;
 
     public FileItemInfoLayout(Context context) {
         this(context, null);
@@ -51,7 +53,7 @@
     }
 
     public void setFileName(String fileName) {
-        mFileNameView.setText(fileName.substring(mLengthExternalStorageDirPrefix));
+        mFileNameView.setText(fileName.substring(sLengthExternalStorageDirPrefix));
     }
 
     public void setFileSize(String filesize) {
diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index f1c7fbe..999611d 100644
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -18,18 +18,23 @@
 
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.res.Resources;
+import android.content.pm.IPackageDataObserver;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.hardware.usb.UsbManager;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.UserManager;
 import android.os.storage.IMountService;
 import android.os.storage.StorageEventListener;
 import android.os.storage.StorageManager;
@@ -46,74 +51,72 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.google.android.collect.Lists;
 
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Panel showing storage usage on disk for known {@link StorageVolume} returned
+ * by {@link StorageManager}. Calculates and displays usage of data types.
+ */
 public class Memory extends SettingsPreferenceFragment {
     private static final String TAG = "MemorySettings";
 
+    private static final String TAG_CONFIRM_CLEAR_CACHE = "confirmClearCache";
+
     private static final int DLG_CONFIRM_UNMOUNT = 1;
     private static final int DLG_ERROR_UNMOUNT = 2;
 
-    private Resources mResources;
-
     // The mountToggle Preference that has last been clicked.
     // Assumes no two successive unmount event on 2 different volumes are performed before the first
     // one's preference is disabled
-    private static Preference mLastClickedMountToggle;
-    private static String mClickedMountPoint;
+    private static Preference sLastClickedMountToggle;
+    private static String sClickedMountPoint;
 
     // Access using getMountService()
-    private IMountService mMountService = null;
+    private IMountService mMountService;
+    private StorageManager mStorageManager;
+    private UsbManager mUsbManager;
 
-    private StorageManager mStorageManager = null;
-
-    private UsbManager mUsbManager = null;
-
-    private StorageVolumePreferenceCategory mInternalStorageVolumePreferenceCategory;
-    private StorageVolumePreferenceCategory[] mStorageVolumePreferenceCategories;
+    private ArrayList<StorageVolumePreferenceCategory> mCategories = Lists.newArrayList();
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        mUsbManager = (UsbManager)getSystemService(Context.USB_SERVICE);
+        final Context context = getActivity();
 
-        if (mStorageManager == null) {
-            mStorageManager = (StorageManager) getSystemService(Context.STORAGE_SERVICE);
-            mStorageManager.registerListener(mStorageListener);
-        }
+        mUsbManager = (UsbManager) getSystemService(Context.USB_SERVICE);
+
+        mStorageManager = StorageManager.from(context);
+        mStorageManager.registerListener(mStorageListener);
 
         addPreferencesFromResource(R.xml.device_info_memory);
 
-        mResources = getResources();
+        addCategory(StorageVolumePreferenceCategory.buildForInternal(context));
 
-        if (!Environment.isExternalStorageEmulated()) {
-            // External storage is separate from internal storage; need to
-            // show internal storage as a separate item.
-            mInternalStorageVolumePreferenceCategory = new StorageVolumePreferenceCategory(
-                    getActivity(), mResources, null, mStorageManager, false);
-            getPreferenceScreen().addPreference(mInternalStorageVolumePreferenceCategory);
-            mInternalStorageVolumePreferenceCategory.init();
-        }
-
-        StorageVolume[] storageVolumes = mStorageManager.getVolumeList();
-        int length = storageVolumes.length;
-        mStorageVolumePreferenceCategories = new StorageVolumePreferenceCategory[length];
-        for (int i = 0; i < length; i++) {
-            StorageVolume storageVolume = storageVolumes[i];
-            boolean isPrimary = i == 0;
-            mStorageVolumePreferenceCategories[i] = new StorageVolumePreferenceCategory(
-                    getActivity(), mResources, storageVolume, mStorageManager, isPrimary);
-            getPreferenceScreen().addPreference(mStorageVolumePreferenceCategories[i]);
-            mStorageVolumePreferenceCategories[i].init();
+        final StorageVolume[] storageVolumes = mStorageManager.getVolumeList();
+        for (StorageVolume volume : storageVolumes) {
+            if (!volume.isEmulated()) {
+                addCategory(StorageVolumePreferenceCategory.buildForPhysical(context, volume));
+            }
         }
 
         setHasOptionsMenu(true);
     }
 
+    private void addCategory(StorageVolumePreferenceCategory category) {
+        mCategories.add(category);
+        getPreferenceScreen().addPreference(category);
+        category.init();
+    }
+
     private boolean isMassStorageEnabled() {
-        // mass storage is enabled if primary volume supports it
-        final StorageVolume[] storageVolumes = mStorageManager.getVolumeList();
-        return (storageVolumes.length > 0 && storageVolumes[0].allowMassStorage());
+        // Mass storage is enabled if primary volume supports it
+        final StorageVolume[] volumes = mStorageManager.getVolumeList();
+        final StorageVolume primary = StorageManager.getPrimaryVolume(volumes);
+        return primary != null && primary.allowMassStorage();
     }
 
     @Override
@@ -128,11 +131,8 @@
         intentFilter.addAction(UsbManager.ACTION_USB_STATE);
         getActivity().registerReceiver(mMediaScannerReceiver, intentFilter);
 
-        if (mInternalStorageVolumePreferenceCategory != null) {
-            mInternalStorageVolumePreferenceCategory.onResume();
-        }
-        for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
-            mStorageVolumePreferenceCategories[i].onResume();
+        for (StorageVolumePreferenceCategory category : mCategories) {
+            category.onResume();
         }
     }
 
@@ -141,10 +141,10 @@
         public void onStorageStateChanged(String path, String oldState, String newState) {
             Log.i(TAG, "Received storage state changed notification that " + path +
                     " changed state from " + oldState + " to " + newState);
-            for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
-                StorageVolumePreferenceCategory svpc = mStorageVolumePreferenceCategories[i];
-                if (path.equals(svpc.getStorageVolume().getPath())) {
-                    svpc.onStorageStateChanged();
+            for (StorageVolumePreferenceCategory category : mCategories) {
+                final StorageVolume volume = category.getStorageVolume();
+                if (volume != null && path.equals(volume.getPath())) {
+                    category.onStorageStateChanged();
                     break;
                 }
             }
@@ -155,11 +155,8 @@
     public void onPause() {
         super.onPause();
         getActivity().unregisterReceiver(mMediaScannerReceiver);
-        if (mInternalStorageVolumePreferenceCategory != null) {
-            mInternalStorageVolumePreferenceCategory.onPause();
-        }
-        for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
-            mStorageVolumePreferenceCategories[i].onPause();
+        for (StorageVolumePreferenceCategory category : mCategories) {
+            category.onPause();
         }
     }
 
@@ -179,7 +176,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
@@ -214,22 +214,30 @@
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
-            StorageVolumePreferenceCategory svpc = mStorageVolumePreferenceCategories[i];
-            Intent intent = svpc.intentForClick(preference);
+        if (StorageVolumePreferenceCategory.KEY_CACHE.equals(preference.getKey())) {
+            ConfirmClearCacheFragment.show(this);
+            return true;
+        }
+
+        for (StorageVolumePreferenceCategory category : mCategories) {
+            Intent intent = category.intentForClick(preference);
             if (intent != null) {
                 // Don't go across app boundary if monkey is running
                 if (!Utils.isMonkeyRunning()) {
-                    startActivity(intent);
+                    try {
+                        startActivity(intent);
+                    } catch (ActivityNotFoundException anfe) {
+                        Log.w(TAG, "No activity found for intent " + intent);
+                    }
                 }
                 return true;
             }
 
-            if (svpc.mountToggleClicked(preference)) {
-                mLastClickedMountToggle = preference;
-                final StorageVolume storageVolume = svpc.getStorageVolume();
-                mClickedMountPoint = storageVolume.getPath();
-                String state = mStorageManager.getVolumeState(storageVolume.getPath());
+            final StorageVolume volume = category.getStorageVolume();
+            if (volume != null && category.mountToggleClicked(preference)) {
+                sLastClickedMountToggle = preference;
+                sClickedMountPoint = volume.getPath();
+                String state = mStorageManager.getVolumeState(volume.getPath());
                 if (Environment.MEDIA_MOUNTED.equals(state) ||
                         Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
                     unmount();
@@ -250,13 +258,12 @@
             if (action.equals(UsbManager.ACTION_USB_STATE)) {
                boolean isUsbConnected = intent.getBooleanExtra(UsbManager.USB_CONNECTED, false);
                String usbFunction = mUsbManager.getDefaultFunction();
-               for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
-                   mStorageVolumePreferenceCategories[i].onUsbStateChanged(isUsbConnected, usbFunction);
+               for (StorageVolumePreferenceCategory category : mCategories) {
+                   category.onUsbStateChanged(isUsbConnected, usbFunction);
                }
             } else if (action.equals(Intent.ACTION_MEDIA_SCANNER_FINISHED)) {
-                // mInternalStorageVolumePreferenceCategory is not affected by the media scanner
-                for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
-                    mStorageVolumePreferenceCategories[i].onMediaScannerFinished();
+                for (StorageVolumePreferenceCategory category : mCategories) {
+                    category.onMediaScannerFinished();
                 }
             }
         }
@@ -290,10 +297,10 @@
         Toast.makeText(getActivity(), R.string.unmount_inform_text, Toast.LENGTH_SHORT).show();
         IMountService mountService = getMountService();
         try {
-            mLastClickedMountToggle.setEnabled(false);
-            mLastClickedMountToggle.setTitle(mResources.getString(R.string.sd_ejecting_title));
-            mLastClickedMountToggle.setSummary(mResources.getString(R.string.sd_ejecting_summary));
-            mountService.unmountVolume(mClickedMountPoint, true, false);
+            sLastClickedMountToggle.setEnabled(false);
+            sLastClickedMountToggle.setTitle(getString(R.string.sd_ejecting_title));
+            sLastClickedMountToggle.setSummary(getString(R.string.sd_ejecting_summary));
+            mountService.unmountVolume(sClickedMountPoint, true, false);
         } catch (RemoteException e) {
             // Informative dialog to user that unmount failed.
             showDialogInner(DLG_ERROR_UNMOUNT);
@@ -307,7 +314,7 @@
 
     private boolean hasAppsAccessingStorage() throws RemoteException {
         IMountService mountService = getMountService();
-        int stUsers[] = mountService.getStorageUsers(mClickedMountPoint);
+        int stUsers[] = mountService.getStorageUsers(sClickedMountPoint);
         if (stUsers != null && stUsers.length > 0) {
             return true;
         }
@@ -345,7 +352,7 @@
         IMountService mountService = getMountService();
         try {
             if (mountService != null) {
-                mountService.mountVolume(mClickedMountPoint);
+                mountService.mountVolume(sClickedMountPoint);
             } else {
                 Log.e(TAG, "Mount service is null, can't mount");
             }
@@ -353,4 +360,68 @@
             // Not much can be done
         }
     }
+
+    private void onCacheCleared() {
+        for (StorageVolumePreferenceCategory category : mCategories) {
+            category.onCacheCleared();
+        }
+    }
+
+    private static class ClearCacheObserver extends IPackageDataObserver.Stub {
+        private final Memory mTarget;
+        private int mRemaining;
+
+        public ClearCacheObserver(Memory target, int remaining) {
+            mTarget = target;
+            mRemaining = remaining;
+        }
+
+        @Override
+        public void onRemoveCompleted(final String packageName, final boolean succeeded) {
+            synchronized (this) {
+                if (--mRemaining == 0) {
+                    mTarget.onCacheCleared();
+                }
+            }
+        }
+    }
+
+    /**
+     * Dialog to request user confirmation before clearing all cache data.
+     */
+    public static class ConfirmClearCacheFragment extends DialogFragment {
+        public static void show(Memory parent) {
+            if (!parent.isAdded()) return;
+
+            final ConfirmClearCacheFragment dialog = new ConfirmClearCacheFragment();
+            dialog.setTargetFragment(parent, 0);
+            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_CLEAR_CACHE);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+
+            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            builder.setTitle(R.string.memory_clear_cache_title);
+            builder.setMessage(getString(R.string.memory_clear_cache_message));
+
+            builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    final Memory target = (Memory) getTargetFragment();
+                    final PackageManager pm = context.getPackageManager();
+                    final List<PackageInfo> infos = pm.getInstalledPackages(0);
+                    final ClearCacheObserver observer = new ClearCacheObserver(
+                            target, infos.size());
+                    for (PackageInfo info : infos) {
+                        pm.deleteApplicationCacheFiles(info.packageName, observer);
+                    }
+                }
+            });
+            builder.setNegativeButton(android.R.string.cancel, null);
+
+            return builder.create();
+        }
+    }
 }
diff --git a/src/com/android/settings/deviceinfo/MiscFilesHandler.java b/src/com/android/settings/deviceinfo/MiscFilesHandler.java
index 2f9697f..93e352b 100644
--- a/src/com/android/settings/deviceinfo/MiscFilesHandler.java
+++ b/src/com/android/settings/deviceinfo/MiscFilesHandler.java
@@ -144,8 +144,8 @@
         // Returns true if all deletions were successful.
         // If a deletion fails, the method stops attempting to delete and returns false.
         private boolean deleteDir(File dir) {
-            if (dir.isDirectory()) {
-                String[] children = dir.list();
+            String[] children = dir.list();
+            if (children != null) {
                 for (int i=0; i < children.length; i++) {
                     boolean success = deleteDir(new File(dir, children[i]));
                     if (!success) {
@@ -193,8 +193,8 @@
             mContext = activity;
             final StorageVolume storageVolume = activity.getIntent().getParcelableExtra(
                     StorageVolume.EXTRA_STORAGE_VOLUME);
-            StorageMeasurement mMeasurement = 
-                StorageMeasurement.getInstance(activity, storageVolume, false /*Unused as a key*/);
+            StorageMeasurement mMeasurement = StorageMeasurement.getInstance(
+                    activity, storageVolume);
             if (mMeasurement == null) return;
             mData = (ArrayList<StorageMeasurement.FileInfo>) mMeasurement.mFileInfoForMisc;
             if (mData != null) {
@@ -283,4 +283,4 @@
             return view;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/deviceinfo/PercentageBarChart.java b/src/com/android/settings/deviceinfo/PercentageBarChart.java
index 95973c4..cb25b81 100644
--- a/src/com/android/settings/deviceinfo/PercentageBarChart.java
+++ b/src/com/android/settings/deviceinfo/PercentageBarChart.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.deviceinfo;
 
-import com.android.settings.R;
-
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
@@ -26,10 +24,13 @@
 import android.util.AttributeSet;
 import android.view.View;
 
+import com.android.settings.R;
+
 import java.util.Collection;
 
 /**
- * 
+ * Draws a horizontal bar chart with colored slices, each represented by
+ * {@link Entry}.
  */
 public class PercentageBarChart extends View {
     private final Paint mEmptyPaint = new Paint();
@@ -38,14 +39,21 @@
 
     private int mMinTickWidth = 1;
 
-    public static class Entry {
+    public static class Entry implements Comparable<Entry> {
+        public final int order;
         public final float percentage;
         public final Paint paint;
 
-        protected Entry(float percentage, Paint paint) {
+        protected Entry(int order, float percentage, Paint paint) {
+            this.order = order;
             this.percentage = percentage;
             this.paint = paint;
         }
+
+        @Override
+        public int compareTo(Entry another) {
+            return order - another.order;
+        }
     }
 
     public PercentageBarChart(Context context, AttributeSet attrs) {
@@ -71,29 +79,56 @@
 
         final int width = right - left;
 
-        float lastX = left;
+        final boolean isLayoutRtl = isLayoutRtl();
+        if (isLayoutRtl) {
+            float nextX = right;
 
-        if (mEntries != null) {
-            for (final Entry e : mEntries) {
-                final float entryWidth;
-                if (e.percentage == 0.0f) {
-                    entryWidth = 0.0f;
-                } else {
-                    entryWidth = Math.max(mMinTickWidth, width * e.percentage);
+            if (mEntries != null) {
+                for (final Entry e : mEntries) {
+                    final float entryWidth;
+                    if (e.percentage == 0.0f) {
+                        entryWidth = 0.0f;
+                    } else {
+                        entryWidth = Math.max(mMinTickWidth, width * e.percentage);
+                    }
+
+                    final float lastX = nextX - entryWidth;
+                    if (lastX < left) {
+                        canvas.drawRect(left, top, nextX, bottom, e.paint);
+                        return;
+                    }
+
+                    canvas.drawRect(lastX, top, nextX, bottom, e.paint);
+                    nextX = lastX;
                 }
-
-                final float nextX = lastX + entryWidth;
-                if (nextX > right) {
-                    canvas.drawRect(lastX, top, right, bottom, e.paint);
-                    return;
-                }
-
-                canvas.drawRect(lastX, top, nextX, bottom, e.paint);
-                lastX = nextX;
             }
-        }
 
-        canvas.drawRect(lastX, top, right, bottom, mEmptyPaint);
+            canvas.drawRect(left, top, nextX, bottom, mEmptyPaint);
+        } else {
+            float lastX = left;
+
+            if (mEntries != null) {
+                for (final Entry e : mEntries) {
+                    final float entryWidth;
+                    if (e.percentage == 0.0f) {
+                        entryWidth = 0.0f;
+                    } else {
+                        entryWidth = Math.max(mMinTickWidth, width * e.percentage);
+                    }
+
+                    final float nextX = lastX + entryWidth;
+                    if (nextX > right) {
+                        canvas.drawRect(lastX, top, right, bottom, e.paint);
+                        return;
+                    }
+
+                    canvas.drawRect(lastX, top, nextX, bottom, e.paint);
+                    lastX = nextX;
+                }
+            }
+
+            canvas.drawRect(lastX, top, right, bottom, mEmptyPaint);
+        }
     }
 
     /**
@@ -112,12 +147,11 @@
      * @param percentage the total width that
      * @param color the color to draw the entry
      */
-    public static Entry createEntry(float percentage, int color) {
+    public static Entry createEntry(int order, float percentage, int color) {
         final Paint p = new Paint();
         p.setColor(color);
         p.setStyle(Paint.Style.FILL);
-
-        return new Entry(percentage, p);
+        return new Entry(order, percentage, p);
     }
 
     public void setEntries(Collection<Entry> entries) {
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index 9e884c5..b27b241 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -26,16 +26,17 @@
 import android.net.NetworkInfo;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
-import android.os.BatteryManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.SystemClock;
 import android.os.SystemProperties;
+import android.os.UserHandle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
+import android.telephony.CellBroadcastMessage;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
@@ -46,7 +47,7 @@
 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.util.ArrayUtils;
 import com.android.settings.R;
 import com.android.settings.Utils;
 
@@ -59,6 +60,7 @@
  * # Roaming
  * # Device Id (IMEI in GSM and MEID in CDMA)
  * # Network type
+ * # Operator info (area info cell broadcast for Brazil)
  * # Signal Strength
  * # Battery Strength  : TODO
  * # Uptime
@@ -73,6 +75,7 @@
     private static final String KEY_OPERATOR_NAME = "operator_name";
     private static final String KEY_ROAMING_STATE = "roaming_state";
     private static final String KEY_NETWORK_TYPE = "network_type";
+    private static final String KEY_LATEST_AREA_INFO = "latest_area_info";
     private static final String KEY_PHONE_NUMBER = "number";
     private static final String KEY_IMEI_SV = "imei_sv";
     private static final String KEY_IMEI = "imei";
@@ -94,6 +97,7 @@
         KEY_OPERATOR_NAME,
         KEY_ROAMING_STATE,
         KEY_NETWORK_TYPE,
+        KEY_LATEST_AREA_INFO,
         KEY_PHONE_NUMBER,
         KEY_IMEI,
         KEY_IMEI_SV,
@@ -104,22 +108,51 @@
         KEY_ICC_ID
     };
 
+    static final String CB_AREA_INFO_RECEIVED_ACTION =
+            "android.cellbroadcastreceiver.CB_AREA_INFO_RECEIVED";
+
+    static final String GET_LATEST_CB_AREA_INFO_ACTION =
+            "android.cellbroadcastreceiver.GET_LATEST_CB_AREA_INFO";
+
+    // Require the sender to have this permission to prevent third-party spoofing.
+    static final String CB_AREA_INFO_SENDER_PERMISSION =
+            "android.permission.RECEIVE_EMERGENCY_BROADCAST";
+
+    // Broadcasts to listen to for connectivity changes.
+    private static final String[] CONNECTIVITY_INTENTS = {
+            BluetoothAdapter.ACTION_STATE_CHANGED,
+            ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE,
+            WifiManager.LINK_CONFIGURATION_CHANGED_ACTION,
+            WifiManager.NETWORK_STATE_CHANGED_ACTION,
+    };
+
     private static final int EVENT_SIGNAL_STRENGTH_CHANGED = 200;
     private static final int EVENT_SERVICE_STATE_CHANGED = 300;
 
     private static final int EVENT_UPDATE_STATS = 500;
 
+    private static final int EVENT_UPDATE_CONNECTIVITY = 600;
+
+    private ConnectivityManager mCM;
     private TelephonyManager mTelephonyManager;
+    private WifiManager mWifiManager;
+
     private Phone mPhone = null;
     private PhoneStateIntentReceiver mPhoneStateReceiver;
     private Resources mRes;
+    private boolean mShowLatestAreaInfo;
+
+    private String mUnknown;
+    private String mUnavailable;
+
     private Preference mSignalStrength;
     private Preference mUptime;
-
-    private String sUnknown;
-
     private Preference mBatteryStatus;
     private Preference mBatteryLevel;
+    private Preference mBtAddress;
+    private Preference mIpAddress;
+    private Preference mWifiMacAddress;
+    private Preference mWimaxMacAddress;
 
     private Handler mHandler;
 
@@ -151,6 +184,10 @@
                     status.updateTimes();
                     sendEmptyMessageDelayed(EVENT_UPDATE_STATS, 1000);
                     break;
+
+                case EVENT_UPDATE_CONNECTIVITY:
+                    status.updateConnectivity();
+                    break;
             }
         }
     }
@@ -175,28 +212,73 @@
         }
     };
 
+    private BroadcastReceiver mAreaInfoReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (CB_AREA_INFO_RECEIVED_ACTION.equals(action)) {
+                Bundle extras = intent.getExtras();
+                if (extras == null) {
+                    return;
+                }
+                CellBroadcastMessage cbMessage = (CellBroadcastMessage) extras.get("message");
+                if (cbMessage != null && cbMessage.getServiceCategory() == 50) {
+                    String latestAreaInfo = cbMessage.getMessageBody();
+                    updateAreaInfo(latestAreaInfo);
+                }
+            }
+        }
+    };
+
+    private IntentFilter mConnectivityIntentFilter;
+    private final BroadcastReceiver mConnectivityReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (ArrayUtils.contains(CONNECTIVITY_INTENTS, action)) {
+                mHandler.sendEmptyMessage(EVENT_UPDATE_CONNECTIVITY);
+            }
+        }
+    };
+
+    private boolean hasBluetooth() {
+        return BluetoothAdapter.getDefaultAdapter() != null;
+    }
+
+    private boolean hasWimax() {
+        return  mCM.getNetworkInfo(ConnectivityManager.TYPE_WIMAX) != null;
+    }
+
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        Preference removablePref;
 
         mHandler = new MyHandler(this);
 
+        mCM = (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
         mTelephonyManager = (TelephonyManager)getSystemService(TELEPHONY_SERVICE);
+        mWifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
 
         addPreferencesFromResource(R.xml.device_info_status);
         mBatteryLevel = findPreference(KEY_BATTERY_LEVEL);
         mBatteryStatus = findPreference(KEY_BATTERY_STATUS);
+        mBtAddress = findPreference(KEY_BT_ADDRESS);
+        mWifiMacAddress = findPreference(KEY_WIFI_MAC_ADDRESS);
+        mWimaxMacAddress = findPreference(KEY_WIMAX_MAC_ADDRESS);
+        mIpAddress = findPreference(KEY_IP_ADDRESS);
 
         mRes = getResources();
-        sUnknown = mRes.getString(R.string.device_info_default);
+        mUnknown = mRes.getString(R.string.device_info_default);
+        mUnavailable = mRes.getString(R.string.status_unavailable);
 
-        mPhone = PhoneFactory.getDefaultPhone();
+        if (UserHandle.myUserId() == UserHandle.USER_OWNER) {
+            mPhone = PhoneFactory.getDefaultPhone();
+        }
         // Note - missing in zaku build, be careful later...
         mSignalStrength = findPreference(KEY_SIGNAL_STRENGTH);
         mUptime = findPreference("up_time");
 
-        if (Utils.isWifiOnly(getApplicationContext())) {
+        if (mPhone == null || Utils.isWifiOnly(getApplicationContext())) {
             for (String key : PHONE_RELATED_ENTRIES) {
                 removePreferenceFromScreen(key);
             }
@@ -235,6 +317,11 @@
                 removePreferenceFromScreen(KEY_MEID_NUMBER);
                 removePreferenceFromScreen(KEY_MIN_NUMBER);
                 removePreferenceFromScreen(KEY_ICC_ID);
+
+                // only show area info when SIM country is Brazil
+                if ("br".equals(mTelephonyManager.getSimCountryIso())) {
+                    mShowLatestAreaInfo = true;
+                }
             }
 
             String rawNumber = mPhone.getLine1Number();  // may be null or empty
@@ -248,12 +335,28 @@
             mPhoneStateReceiver = new PhoneStateIntentReceiver(this, mHandler);
             mPhoneStateReceiver.notifySignalStrength(EVENT_SIGNAL_STRENGTH_CHANGED);
             mPhoneStateReceiver.notifyServiceState(EVENT_SERVICE_STATE_CHANGED);
+
+            if (!mShowLatestAreaInfo) {
+                removePreferenceFromScreen(KEY_LATEST_AREA_INFO);
+            }
         }
 
-        setWimaxStatus();
-        setWifiStatus();
-        setBtStatus();
-        setIpAddressStatus();
+        if (!hasBluetooth()) {
+            getPreferenceScreen().removePreference(mBtAddress);
+            mBtAddress = null;
+        }
+
+        if (!hasWimax()) {
+            getPreferenceScreen().removePreference(mWimaxMacAddress);
+            mWimaxMacAddress = null;
+        }
+
+        mConnectivityIntentFilter = new IntentFilter();
+        for (String intent: CONNECTIVITY_INTENTS) {
+             mConnectivityIntentFilter.addAction(intent);
+        }
+
+        updateConnectivity();
 
         String serial = Build.SERIAL;
         if (serial != null && !serial.equals("")) {
@@ -267,16 +370,25 @@
     protected void onResume() {
         super.onResume();
 
-        if (!Utils.isWifiOnly(getApplicationContext())) {
+        if (mPhone != null && !Utils.isWifiOnly(getApplicationContext())) {
             mPhoneStateReceiver.registerIntent();
 
             updateSignalStrength();
             updateServiceState(mPhone.getServiceState());
             updateDataState();
-
             mTelephonyManager.listen(mPhoneStateListener,
-                      PhoneStateListener.LISTEN_DATA_CONNECTION_STATE);
+                    PhoneStateListener.LISTEN_DATA_CONNECTION_STATE);
+            if (mShowLatestAreaInfo) {
+                registerReceiver(mAreaInfoReceiver, new IntentFilter(CB_AREA_INFO_RECEIVED_ACTION),
+                        CB_AREA_INFO_SENDER_PERMISSION, null);
+                // Ask CellBroadcastReceiver to broadcast the latest area info received
+                Intent getLatestIntent = new Intent(GET_LATEST_CB_AREA_INFO_ACTION);
+                sendBroadcastAsUser(getLatestIntent, UserHandle.ALL,
+                        CB_AREA_INFO_SENDER_PERMISSION);
+            }
         }
+        registerReceiver(mConnectivityReceiver, mConnectivityIntentFilter,
+                         android.Manifest.permission.CHANGE_NETWORK_STATE, null);
         registerReceiver(mBatteryInfoReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
         mHandler.sendEmptyMessage(EVENT_UPDATE_STATS);
     }
@@ -285,11 +397,15 @@
     public void onPause() {
         super.onPause();
 
-        if (!Utils.isWifiOnly(getApplicationContext())) {
+        if (mPhone != null && !Utils.isWifiOnly(getApplicationContext())) {
             mPhoneStateReceiver.unregisterIntent();
             mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
         }
+        if (mShowLatestAreaInfo) {
+            unregisterReceiver(mAreaInfoReceiver);
+        }
         unregisterReceiver(mBatteryInfoReceiver);
+        unregisterReceiver(mConnectivityReceiver);
         mHandler.removeMessages(EVENT_UPDATE_STATS);
     }
 
@@ -320,7 +436,7 @@
 
     private void setSummaryText(String preference, String text) {
             if (TextUtils.isEmpty(text)) {
-               text = sUnknown;
+               text = mUnknown;
              }
              // some preferences may be missing
              if (findPreference(preference) != null) {
@@ -330,8 +446,11 @@
 
     private void updateNetworkType() {
         // Whether EDGE, UMTS, etc...
-        setSummaryText(KEY_NETWORK_TYPE, mTelephonyManager.getNetworkTypeName() +
-                ":" + mTelephonyManager.getNetworkType());
+        String networktype = null;
+        if (TelephonyManager.NETWORK_TYPE_UNKNOWN != mTelephonyManager.getNetworkType()) {
+            networktype = mTelephonyManager.getNetworkTypeName();
+        }
+        setSummaryText(KEY_NETWORK_TYPE, networktype);
     }
 
     private void updateDataState() {
@@ -383,6 +502,12 @@
         setSummaryText(KEY_OPERATOR_NAME, serviceState.getOperatorAlphaLong());
     }
 
+    private void updateAreaInfo(String areaInfo) {
+        if (areaInfo != null) {
+            setSummaryText(KEY_LATEST_AREA_INFO, areaInfo);
+        }
+    }
+
     void updateSignalStrength() {
         // TODO PhoneStateIntentReceiver is deprecated and PhoneStateListener
         // should probably used instead.
@@ -414,55 +539,47 @@
     }
 
     private void setWimaxStatus() {
-        ConnectivityManager cm = (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
-        NetworkInfo ni = cm.getNetworkInfo(ConnectivityManager.TYPE_WIMAX);
-
-        if (ni == null) {
-            PreferenceScreen root = getPreferenceScreen();
-            Preference ps = (Preference) findPreference(KEY_WIMAX_MAC_ADDRESS);
-            if (ps != null) root.removePreference(ps);
-        } else {
-            Preference wimaxMacAddressPref = findPreference(KEY_WIMAX_MAC_ADDRESS);
-            String macAddress = SystemProperties.get("net.wimax.mac.address",
-                    getString(R.string.status_unavailable));
-            wimaxMacAddressPref.setSummary(macAddress);
+        if (mWimaxMacAddress != null) {
+            String macAddress = SystemProperties.get("net.wimax.mac.address", mUnavailable);
+            mWimaxMacAddress.setSummary(macAddress);
         }
     }
+
     private void setWifiStatus() {
-        WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
-        WifiInfo wifiInfo = wifiManager.getConnectionInfo();
-
-        Preference wifiMacAddressPref = findPreference(KEY_WIFI_MAC_ADDRESS);
-
+        WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
         String macAddress = wifiInfo == null ? null : wifiInfo.getMacAddress();
-        wifiMacAddressPref.setSummary(!TextUtils.isEmpty(macAddress) ? macAddress
-                : getString(R.string.status_unavailable));
+        mWifiMacAddress.setSummary(!TextUtils.isEmpty(macAddress) ? macAddress : mUnavailable);
     }
 
     private void setIpAddressStatus() {
-        Preference ipAddressPref = findPreference(KEY_IP_ADDRESS);
-        String ipAddress = Utils.getDefaultIpAddresses(this);
+        String ipAddress = Utils.getDefaultIpAddresses(this.mCM);
         if (ipAddress != null) {
-            ipAddressPref.setSummary(ipAddress);
+            mIpAddress.setSummary(ipAddress);
         } else {
-            ipAddressPref.setSummary(getString(R.string.status_unavailable));
+            mIpAddress.setSummary(mUnavailable);
         }
     }
 
     private void setBtStatus() {
         BluetoothAdapter bluetooth = BluetoothAdapter.getDefaultAdapter();
-        Preference btAddressPref = findPreference(KEY_BT_ADDRESS);
-
-        if (bluetooth == null) {
-            // device not BT capable
-            getPreferenceScreen().removePreference(btAddressPref);
-        } else {
+        if (bluetooth != null && mBtAddress != null) {
             String address = bluetooth.isEnabled() ? bluetooth.getAddress() : null;
-            btAddressPref.setSummary(!TextUtils.isEmpty(address) ? address
-                    : getString(R.string.status_unavailable));
+            if (!TextUtils.isEmpty(address)) {
+               // Convert the address to lowercase for consistency with the wifi MAC address.
+                mBtAddress.setSummary(address.toLowerCase());
+            } else {
+                mBtAddress.setSummary(mUnavailable);
+            }
         }
     }
 
+    void updateConnectivity() {
+        setWimaxStatus();
+        setWifiStatus();
+        setBtStatus();
+        setIpAddressStatus();
+    }
+
     void updateTimes() {
         long at = SystemClock.uptimeMillis() / 1000;
         long ut = SystemClock.elapsedRealtime() / 1000;
diff --git a/src/com/android/settings/deviceinfo/StorageItemPreference.java b/src/com/android/settings/deviceinfo/StorageItemPreference.java
new file mode 100644
index 0000000..e4f3ff9
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/StorageItemPreference.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.RectShape;
+import android.os.UserHandle;
+import android.preference.Preference;
+
+import com.android.settings.R;
+
+public class StorageItemPreference extends Preference {
+    public final int color;
+    public final int userHandle;
+
+    public StorageItemPreference(Context context, int titleRes, int colorRes) {
+        this(context, context.getText(titleRes), colorRes, UserHandle.USER_NULL);
+    }
+
+    public StorageItemPreference(
+            Context context, CharSequence title, int colorRes, int userHandle) {
+        super(context);
+
+        if (colorRes != 0) {
+            this.color = context.getResources().getColor(colorRes);
+
+            final Resources res = context.getResources();
+            final int width = res.getDimensionPixelSize(R.dimen.device_memory_usage_button_width);
+            final int height = res.getDimensionPixelSize(R.dimen.device_memory_usage_button_height);
+            setIcon(createRectShape(width, height, this.color));
+        } else {
+            this.color = Color.MAGENTA;
+        }
+
+        setTitle(title);
+        setSummary(R.string.memory_calculating_size);
+
+        this.userHandle = userHandle;
+    }
+
+    private static ShapeDrawable createRectShape(int width, int height, int color) {
+        ShapeDrawable shape = new ShapeDrawable(new RectShape());
+        shape.setIntrinsicHeight(height);
+        shape.setIntrinsicWidth(width);
+        shape.getPaint().setColor(color);
+        return shape;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageMeasurement.java b/src/com/android/settings/deviceinfo/StorageMeasurement.java
index 2792d09..34ef62b 100644
--- a/src/com/android/settings/deviceinfo/StorageMeasurement.java
+++ b/src/com/android/settings/deviceinfo/StorageMeasurement.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.deviceinfo;
 
+import android.app.ActivityManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -24,42 +25,38 @@
 import android.content.pm.IPackageStatsObserver;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageStats;
-import android.os.Bundle;
+import android.content.pm.UserInfo;
 import android.os.Environment;
+import android.os.Environment.UserEnvironment;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.Message;
-import android.os.RemoteException;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.os.storage.StorageVolume;
 import android.util.Log;
+import android.util.SparseLongArray;
 
 import com.android.internal.app.IMediaContainerService;
+import com.google.android.collect.Maps;
+import com.google.android.collect.Sets;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.Set;
+
+import javax.annotation.concurrent.GuardedBy;
 
 /**
- * Measure the memory for various systems.
- *
- * TODO: This class should ideally have less knowledge about what the context
- * it's measuring is. In the future, reduce the amount of stuff it needs to
- * know about by just keeping an array of measurement types of the following
- * properties:
- *
- *   Filesystem stats (using DefaultContainerService)
- *   Directory measurements (using DefaultContainerService.measureDir)
- *   Application measurements (using PackageManager)
- *
- * Then the calling application would just specify the type and an argument.
- * This class would keep track of it while the calling application would
- * decide on how to use it.
+ * Utility for measuring the disk usage of internal storage or a physical
+ * {@link StorageVolume}. Connects with a remote {@link IMediaContainerService}
+ * and delivers results to {@link MeasurementReceiver}.
  */
 public class StorageMeasurement {
     private static final String TAG = "StorageMeasurement";
@@ -67,53 +64,109 @@
     private static final boolean LOCAL_LOGV = true;
     static final boolean LOGV = LOCAL_LOGV && Log.isLoggable(TAG, Log.VERBOSE);
 
-    public static final String TOTAL_SIZE = "total_size";
-
-    public static final String AVAIL_SIZE = "avail_size";
-
-    public static final String APPS_USED = "apps_used";
-
-    public static final String DOWNLOADS_SIZE = "downloads_size";
-
-    public static final String MISC_SIZE = "misc_size";
-
-    public static final String MEDIA_SIZES = "media_sizes";
-
     private static final String DEFAULT_CONTAINER_PACKAGE = "com.android.defcontainer";
 
     public static final ComponentName DEFAULT_CONTAINER_COMPONENT = new ComponentName(
             DEFAULT_CONTAINER_PACKAGE, "com.android.defcontainer.DefaultContainerService");
 
-    private final MeasurementHandler mHandler;
+    /** Media types to measure on external storage. */
+    private static final Set<String> sMeasureMediaTypes = Sets.newHashSet(
+            Environment.DIRECTORY_DCIM, Environment.DIRECTORY_MOVIES,
+            Environment.DIRECTORY_PICTURES, Environment.DIRECTORY_MUSIC,
+            Environment.DIRECTORY_ALARMS, Environment.DIRECTORY_NOTIFICATIONS,
+            Environment.DIRECTORY_RINGTONES, Environment.DIRECTORY_PODCASTS,
+            Environment.DIRECTORY_DOWNLOADS, Environment.DIRECTORY_ANDROID);
 
-    private static Map<StorageVolume, StorageMeasurement> sInstances =
-        new ConcurrentHashMap<StorageVolume, StorageMeasurement>();
-    private static StorageMeasurement sInternalInstance;
+    @GuardedBy("sInstances")
+    private static HashMap<StorageVolume, StorageMeasurement> sInstances = Maps.newHashMap();
+
+    /**
+     * Obtain shared instance of {@link StorageMeasurement} for given physical
+     * {@link StorageVolume}, or internal storage if {@code null}.
+     */
+    public static StorageMeasurement getInstance(Context context, StorageVolume volume) {
+        synchronized (sInstances) {
+            StorageMeasurement value = sInstances.get(volume);
+            if (value == null) {
+                value = new StorageMeasurement(context.getApplicationContext(), volume);
+                sInstances.put(volume, value);
+            }
+            return value;
+        }
+    }
+
+    public static class MeasurementDetails {
+        public long totalSize;
+        public long availSize;
+
+        /**
+         * Total apps disk usage.
+         * <p>
+         * When measuring internal storage, this value includes the code size of
+         * all apps (regardless of install status for current user), and
+         * internal disk used by the current user's apps. When the device
+         * emulates external storage, this value also includes emulated storage
+         * used by the current user's apps.
+         * <p>
+         * When measuring a physical {@link StorageVolume}, this value includes
+         * usage by all apps on that volume.
+         */
+        public long appsSize;
+
+        /**
+         * Total cache disk usage by apps.
+         */
+        public long cacheSize;
+
+        /**
+         * Total media disk usage, categorized by types such as
+         * {@link Environment#DIRECTORY_MUSIC}.
+         * <p>
+         * When measuring internal storage, this reflects media on emulated
+         * storage for the current user.
+         * <p>
+         * When measuring a physical {@link StorageVolume}, this reflects media
+         * on that volume.
+         */
+        public HashMap<String, Long> mediaSize = Maps.newHashMap();
+
+        /**
+         * Misc external disk usage for the current user, unaccounted in
+         * {@link #mediaSize}.
+         */
+        public long miscSize;
+
+        /**
+         * Total disk usage for users, which is only meaningful for emulated
+         * internal storage. Key is {@link UserHandle}.
+         */
+        public SparseLongArray usersSize = new SparseLongArray();
+    }
+
+    public interface MeasurementReceiver {
+        public void updateApproximate(StorageMeasurement meas, long totalSize, long availSize);
+        public void updateDetails(StorageMeasurement meas, MeasurementDetails details);
+    }
 
     private volatile WeakReference<MeasurementReceiver> mReceiver;
 
+    /** Physical volume being measured, or {@code null} for internal. */
+    private final StorageVolume mVolume;
+
+    private final boolean mIsInternal;
+    private final boolean mIsPrimary;
+
+    private final MeasurementHandler mHandler;
+
     private long mTotalSize;
     private long mAvailSize;
-    private long mAppsSize;
-    private long mDownloadsSize;
-    private long mMiscSize;
-    private long[] mMediaSizes = new long[StorageVolumePreferenceCategory.sMediaCategories.length];
-
-    final private StorageVolume mStorageVolume;
-    final private boolean mIsPrimary;
-    final private boolean mIsInternal;
 
     List<FileInfo> mFileInfoForMisc;
 
-    public interface MeasurementReceiver {
-        public void updateApproximate(Bundle bundle);
-        public void updateExact(Bundle bundle);
-    }
-
-    private StorageMeasurement(Context context, StorageVolume storageVolume, boolean isPrimary) {
-        mStorageVolume = storageVolume;
-        mIsInternal = storageVolume == null;
-        mIsPrimary = !mIsInternal && isPrimary;
+    private StorageMeasurement(Context context, StorageVolume volume) {
+        mVolume = volume;
+        mIsInternal = volume == null;
+        mIsPrimary = volume != null ? volume.isPrimary() : false;
 
         // Start the thread that will measure the disk usage.
         final HandlerThread handlerThread = new HandlerThread("MemoryMeasurement");
@@ -121,31 +174,6 @@
         mHandler = new MeasurementHandler(context, handlerThread.getLooper());
     }
 
-    /**
-     * Get the singleton of the StorageMeasurement class. The application
-     * context is used to avoid leaking activities.
-     * @param storageVolume The {@link StorageVolume} that will be measured
-     * @param isPrimary true when this storage volume is the primary volume
-     */
-    public static StorageMeasurement getInstance(Context context, StorageVolume storageVolume,
-            boolean isPrimary) {
-        if (storageVolume == null) {
-            if (sInternalInstance == null) {
-                sInternalInstance =
-                    new StorageMeasurement(context.getApplicationContext(), storageVolume, isPrimary);
-            }
-            return sInternalInstance;
-        }
-        if (sInstances.containsKey(storageVolume)) {
-            return sInstances.get(storageVolume);
-        } else {
-            StorageMeasurement storageMeasurement =
-                new StorageMeasurement(context.getApplicationContext(), storageVolume, isPrimary);
-            sInstances.put(storageVolume, storageMeasurement);
-            return storageMeasurement;
-        }
-    }
-
     public void setReceiver(MeasurementReceiver receiver) {
         if (mReceiver == null || mReceiver.get() == null) {
             mReceiver = new WeakReference<MeasurementReceiver>(receiver);
@@ -173,15 +201,10 @@
         if (receiver == null) {
             return;
         }
-
-        Bundle bundle = new Bundle();
-        bundle.putLong(TOTAL_SIZE, mTotalSize);
-        bundle.putLong(AVAIL_SIZE, mAvailSize);
-
-        receiver.updateApproximate(bundle);
+        receiver.updateApproximate(this, mTotalSize, mAvailSize);
     }
 
-    private void sendExactUpdate() {
+    private void sendExactUpdate(MeasurementDetails details) {
         MeasurementReceiver receiver = (mReceiver != null) ? mReceiver.get() : null;
         if (receiver == null) {
             if (LOGV) {
@@ -189,27 +212,78 @@
             }
             return;
         }
+        receiver.updateDetails(this, details);
+    }
 
-        Bundle bundle = new Bundle();
-        bundle.putLong(TOTAL_SIZE, mTotalSize);
-        bundle.putLong(AVAIL_SIZE, mAvailSize);
-        bundle.putLong(APPS_USED, mAppsSize);
-        bundle.putLong(DOWNLOADS_SIZE, mDownloadsSize);
-        bundle.putLong(MISC_SIZE, mMiscSize);
-        bundle.putLongArray(MEDIA_SIZES, mMediaSizes);
+    private static class StatsObserver extends IPackageStatsObserver.Stub {
+        private final boolean mIsInternal;
+        private final MeasurementDetails mDetails;
+        private final int mCurrentUser;
+        private final Message mFinished;
 
-        receiver.updateExact(bundle);
+        private int mRemaining;
+
+        public StatsObserver(boolean isInternal, MeasurementDetails details, int currentUser,
+                Message finished, int remaining) {
+            mIsInternal = isInternal;
+            mDetails = details;
+            mCurrentUser = currentUser;
+            mFinished = finished;
+            mRemaining = remaining;
+        }
+
+        @Override
+        public void onGetStatsCompleted(PackageStats stats, boolean succeeded) {
+            synchronized (mDetails) {
+                if (succeeded) {
+                    addStatsLocked(stats);
+                }
+                if (--mRemaining == 0) {
+                    mFinished.sendToTarget();
+                }
+            }
+        }
+
+        private void addStatsLocked(PackageStats stats) {
+            if (mIsInternal) {
+                long codeSize = stats.codeSize;
+                long dataSize = stats.dataSize;
+                long cacheSize = stats.cacheSize;
+                if (Environment.isExternalStorageEmulated()) {
+                    // Include emulated storage when measuring internal. OBB is
+                    // shared on emulated storage, so treat as code.
+                    codeSize += stats.externalCodeSize + stats.externalObbSize;
+                    dataSize += stats.externalDataSize + stats.externalMediaSize;
+                    cacheSize += stats.externalCacheSize;
+                }
+
+                // Count code and data for current user
+                if (stats.userHandle == mCurrentUser) {
+                    mDetails.appsSize += codeSize;
+                    mDetails.appsSize += dataSize;
+                }
+
+                // User summary only includes data (code is only counted once
+                // for the current user)
+                addValue(mDetails.usersSize, stats.userHandle, dataSize);
+
+                // Include cache for all users
+                mDetails.cacheSize += cacheSize;
+
+            } else {
+                // Physical storage; only count external sizes
+                mDetails.appsSize += stats.externalCodeSize + stats.externalDataSize
+                        + stats.externalMediaSize + stats.externalObbSize;
+                mDetails.cacheSize += stats.externalCacheSize;
+            }
+        }
     }
 
     private class MeasurementHandler extends Handler {
         public static final int MSG_MEASURE = 1;
-
         public static final int MSG_CONNECTED = 2;
-
         public static final int MSG_DISCONNECT = 3;
-
         public static final int MSG_COMPLETED = 4;
-
         public static final int MSG_INVALIDATE = 5;
 
         private Object mLock = new Object();
@@ -218,21 +292,21 @@
 
         private volatile boolean mBound = false;
 
-        private volatile boolean mMeasured = false;
-
-        private StatsObserver mStatsObserver;
+        private MeasurementDetails mCached;
 
         private final WeakReference<Context> mContext;
 
-        final private ServiceConnection mDefContainerConn = new ServiceConnection() {
+        private final ServiceConnection mDefContainerConn = new ServiceConnection() {
+            @Override
             public void onServiceConnected(ComponentName name, IBinder service) {
-                final IMediaContainerService imcs = IMediaContainerService.Stub
-                .asInterface(service);
+                final IMediaContainerService imcs = IMediaContainerService.Stub.asInterface(
+                        service);
                 mDefaultContainer = imcs;
                 mBound = true;
                 sendMessage(obtainMessage(MSG_CONNECTED, imcs));
             }
 
+            @Override
             public void onServiceDisconnected(ComponentName name) {
                 mBound = false;
                 removeMessages(MSG_CONNECTED);
@@ -248,8 +322,8 @@
         public void handleMessage(Message msg) {
             switch (msg.what) {
                 case MSG_MEASURE: {
-                    if (mMeasured) {
-                        sendExactUpdate();
+                    if (mCached != null) {
+                        sendExactUpdate(mCached);
                         break;
                     }
 
@@ -264,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);
+                            context.bindServiceAsUser(service, mDefContainerConn, Context.BIND_AUTO_CREATE,
+                                    UserHandle.OWNER);
                         }
                     }
                     break;
@@ -291,89 +365,25 @@
                     break;
                 }
                 case MSG_COMPLETED: {
-                    mMeasured = true;
-                    sendExactUpdate();
+                    mCached = (MeasurementDetails) msg.obj;
+                    sendExactUpdate(mCached);
                     break;
                 }
                 case MSG_INVALIDATE: {
-                    mMeasured = false;
+                    mCached = null;
                     break;
                 }
             }
         }
 
-        /**
-         * Request measurement of each package.
-         *
-         * @param pm PackageManager instance to query
-         */
-        public void requestQueuedMeasurementsLocked(PackageManager pm) {
-            final String[] appsList = mStatsObserver.getAppsList();
-            final int N = appsList.length;
-            for (int i = 0; i < N; i++) {
-                pm.getPackageSizeInfo(appsList[i], mStatsObserver);
-            }
-        }
-
-        private class StatsObserver extends IPackageStatsObserver.Stub {
-            private long mAppsSizeForThisStatsObserver = 0;
-            private final List<String> mAppsList = new ArrayList<String>();
-
-            public void onGetStatsCompleted(PackageStats stats, boolean succeeded) {
-                if (!mStatsObserver.equals(this)) {
-                    // this callback's class object is no longer in use. ignore this callback.
-                    return;
-                }
-
-                if (succeeded) {
-                    if (mIsInternal) {
-                        mAppsSizeForThisStatsObserver += stats.codeSize + stats.dataSize;
-                    } else if (!Environment.isExternalStorageEmulated()) {
-                        mAppsSizeForThisStatsObserver += stats.externalObbSize +
-                                stats.externalCodeSize + stats.externalDataSize +
-                                stats.externalCacheSize + stats.externalMediaSize;
-                    } else {
-                        mAppsSizeForThisStatsObserver += stats.codeSize + stats.dataSize +
-                                stats.externalCodeSize + stats.externalDataSize +
-                                stats.externalCacheSize + stats.externalMediaSize +
-                                stats.externalObbSize;
-                    }
-                }
-
-                synchronized (mAppsList) {
-                    mAppsList.remove(stats.packageName);
-                    if (mAppsList.size() > 0) return;
-                }
-
-                mAppsSize = mAppsSizeForThisStatsObserver;
-                onInternalMeasurementComplete();
-            }
-
-            public void queuePackageMeasurementLocked(String packageName) {
-                synchronized (mAppsList) {
-                    mAppsList.add(packageName);
-                }
-            }
-
-            public String[] getAppsList() {
-                synchronized (mAppsList) {
-                    return mAppsList.toArray(new String[mAppsList.size()]);
-                }
-            }
-        }
-
-        private void onInternalMeasurementComplete() {
-            sendEmptyMessage(MSG_COMPLETED);
-        }
-
         private void measureApproximateStorage(IMediaContainerService imcs) {
-            final String path = mStorageVolume != null ? mStorageVolume.getPath()
+            final String path = mVolume != null ? mVolume.getPath()
                     : Environment.getDataDirectory().getPath();
             try {
                 final long[] stats = imcs.getFileSystemStats(path);
                 mTotalSize = stats[0];
                 mAvailSize = stats[1];
-            } catch (RemoteException e) {
+            } catch (Exception e) {
                 Log.w(TAG, "Problem in container service", e);
             }
 
@@ -381,146 +391,119 @@
         }
 
         private void measureExactStorage(IMediaContainerService imcs) {
-            Context context = mContext != null ? mContext.get() : null;
+            final Context context = mContext != null ? mContext.get() : null;
             if (context == null) {
                 return;
             }
 
-            // Media
-            for (int i = 0; i < StorageVolumePreferenceCategory.sMediaCategories.length; i++) {
-                if (mIsPrimary) {
-                    String[] dirs = StorageVolumePreferenceCategory.sMediaCategories[i].mDirPaths;
-                    final int length = dirs.length;
-                    mMediaSizes[i] = 0;
-                    for (int d = 0; d < length; d++) {
-                        final String path = dirs[d];
-                        mMediaSizes[i] += getDirectorySize(imcs, path);
-                    }
-                } else {
-                    // TODO Compute sizes using the MediaStore
-                    mMediaSizes[i] = 0;
+            final MeasurementDetails details = new MeasurementDetails();
+            final Message finished = obtainMessage(MSG_COMPLETED, details);
+
+            details.totalSize = mTotalSize;
+            details.availSize = mAvailSize;
+
+            final UserManager userManager = (UserManager) context.getSystemService(
+                    Context.USER_SERVICE);
+            final List<UserInfo> users = userManager.getUsers();
+
+            final int currentUser = ActivityManager.getCurrentUser();
+            final UserEnvironment currentEnv = new UserEnvironment(currentUser);
+
+            // Measure media types for emulated storage, or for primary physical
+            // external volume
+            final boolean measureMedia = (mIsInternal && Environment.isExternalStorageEmulated())
+                    || mIsPrimary;
+            if (measureMedia) {
+                for (String type : sMeasureMediaTypes) {
+                    final File path = currentEnv.getExternalStoragePublicDirectory(type);
+                    final long size = getDirectorySize(imcs, path);
+                    details.mediaSize.put(type, size);
                 }
             }
 
-            /* Compute sizes using the media provider
-            // Media sizes are measured by the MediaStore. Query database.
-            ContentResolver contentResolver = context.getContentResolver();
-            // TODO "external" as a static String from MediaStore?
-            Uri audioUri = MediaStore.Files.getContentUri("external");
-            final String[] projection =
-                new String[] { "sum(" + MediaStore.Files.FileColumns.SIZE + ")" };
-            final String selection =
-                MediaStore.Files.FileColumns.STORAGE_ID + "=" +
-                Integer.toString(mStorageVolume.getStorageId()) + " AND " +
-                MediaStore.Files.FileColumns.MEDIA_TYPE + "=?";
-
-            for (int i = 0; i < StorageVolumePreferenceCategory.sMediaCategories.length; i++) {
-                mMediaSizes[i] = 0;
-                int mediaType = StorageVolumePreferenceCategory.sMediaCategories[i].mediaType;
-                Cursor c = null;
-                try {
-                    c = contentResolver.query(audioUri, projection, selection,
-                            new String[] { Integer.toString(mediaType) } , null);
-
-                    if (c != null && c.moveToNext()) {
-                        long size = c.getLong(0);
-                        mMediaSizes[i] = size;
-                    }
-                } finally {
-                    if (c != null) c.close();
-                }
-            }
-             */
-
-            // Downloads (primary volume only)
-            if (mIsPrimary) {
-                final String downloadsPath = Environment.getExternalStoragePublicDirectory(
-                        Environment.DIRECTORY_DOWNLOADS).getAbsolutePath();
-                mDownloadsSize = getDirectorySize(imcs, downloadsPath);
-            } else {
-                mDownloadsSize = 0;
+            // Measure misc files not counted under media
+            if (measureMedia) {
+                final File path = mIsInternal ? currentEnv.getExternalStorageDirectory()
+                        : mVolume.getPathFile();
+                details.miscSize = measureMisc(imcs, path);
             }
 
-            // Misc
-            mMiscSize = 0;
-            if (mIsPrimary) {
-                measureSizesOfMisc(imcs);
+            // Measure total emulated storage of all users; internal apps data
+            // will be spliced in later
+            for (UserInfo user : users) {
+                final UserEnvironment userEnv = new UserEnvironment(user.id);
+                final long size = getDirectorySize(imcs, userEnv.getExternalStorageDirectory());
+                addValue(details.usersSize, user.id, size);
             }
 
-            // Apps
-            // We have to get installd to measure the package sizes.
-            PackageManager pm = context.getPackageManager();
-            if (pm == null) {
-                return;
-            }
-            final List<ApplicationInfo> apps;
-            if (mIsPrimary || mIsInternal) {
-                apps = pm.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES |
-                        PackageManager.GET_DISABLED_COMPONENTS);
-            } else {
-                // TODO also measure apps installed on the SD card
-                apps = Collections.emptyList();
-            }
+            // Measure all apps for all users
+            final PackageManager pm = context.getPackageManager();
+            if (mIsInternal || mIsPrimary) {
+                final List<ApplicationInfo> apps = pm.getInstalledApplications(
+                        PackageManager.GET_UNINSTALLED_PACKAGES
+                        | PackageManager.GET_DISABLED_COMPONENTS);
 
-            if (apps != null && apps.size() > 0) {
-                // initiate measurement of all package sizes. need new StatsObserver object.
-                mStatsObserver = new StatsObserver();
-                synchronized (mStatsObserver.mAppsList) {
-                    for (int i = 0; i < apps.size(); i++) {
-                        final ApplicationInfo info = apps.get(i);
-                        mStatsObserver.queuePackageMeasurementLocked(info.packageName);
+                final int count = users.size() * apps.size();
+                final StatsObserver observer = new StatsObserver(
+                        mIsInternal, details, currentUser, finished, count);
+
+                for (UserInfo user : users) {
+                    for (ApplicationInfo app : apps) {
+                        pm.getPackageSizeInfo(app.packageName, user.id, observer);
                     }
                 }
 
-                requestQueuedMeasurementsLocked(pm);
-                // Sending of the message back to the MeasurementReceiver is
-                // completed in the PackageObserver
             } else {
-                onInternalMeasurementComplete();
+                finished.sendToTarget();
             }
         }
     }
 
-    private long getDirectorySize(IMediaContainerService imcs, String dir) {
+    private static long getDirectorySize(IMediaContainerService imcs, File path) {
         try {
-            return imcs.calculateDirectorySize(dir);
+            final long size = imcs.calculateDirectorySize(path.toString());
+            Log.d(TAG, "getDirectorySize(" + path + ") returned " + size);
+            return size;
         } catch (Exception e) {
-            Log.w(TAG, "Could not read memory from default container service for " + dir, e);
+            Log.w(TAG, "Could not read memory from default container service for " + path, e);
             return 0;
         }
     }
 
-    long getMiscSize() {
-        return mMiscSize;
-    }
-
-    private void measureSizesOfMisc(IMediaContainerService imcs) {
-        File top = new File(mStorageVolume.getPath());
+    private long measureMisc(IMediaContainerService imcs, File dir) {
         mFileInfoForMisc = new ArrayList<FileInfo>();
-        File[] files = top.listFiles();
-        if (files == null) return;
-        final int len = files.length;
-        // Get sizes of all top level nodes except the ones already computed...
+
+        final File[] files = dir.listFiles();
+        if (files == null) return 0;
+
+        // Get sizes of all top level nodes except the ones already computed
         long counter = 0;
-        for (int i = 0; i < len; i++) {
-            String path = files[i].getAbsolutePath();
-            if (StorageVolumePreferenceCategory.sPathsExcludedForMisc.contains(path)) {
+        long miscSize = 0;
+
+        for (File file : files) {
+            final String path = file.getAbsolutePath();
+            final String name = file.getName();
+            if (sMeasureMediaTypes.contains(name)) {
                 continue;
             }
-            if (files[i].isFile()) {
-                final long fileSize = files[i].length();
+
+            if (file.isFile()) {
+                final long fileSize = file.length();
                 mFileInfoForMisc.add(new FileInfo(path, fileSize, counter++));
-                mMiscSize += fileSize;
-            } else if (files[i].isDirectory()) {
-                final long dirSize = getDirectorySize(imcs, path);
+                miscSize += fileSize;
+            } else if (file.isDirectory()) {
+                final long dirSize = getDirectorySize(imcs, file);
                 mFileInfoForMisc.add(new FileInfo(path, dirSize, counter++));
-                mMiscSize += dirSize;
+                miscSize += dirSize;
             } else {
                 // Non directory, non file: not listed
             }
         }
+
         // sort the list of FileInfo objects collected above in descending order of their sizes
         Collections.sort(mFileInfoForMisc);
+
+        return miscSize;
     }
 
     static class FileInfo implements Comparable<FileInfo> {
@@ -546,10 +529,7 @@
         }
     }
 
-    /**
-     * TODO remove this method, only used because external SD Card needs a special treatment.
-     */
-    boolean isExternalSDCard() {
-        return !mIsPrimary && !mIsInternal;
+    private static void addValue(SparseLongArray array, int key, long value) {
+        array.put(key, array.get(key) + value);
     }
 }
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
index 156184a..4e5bd63 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
@@ -16,210 +16,215 @@
 
 package com.android.settings.deviceinfo;
 
+import android.app.ActivityManagerNative;
 import android.app.ActivityThread;
 import android.app.DownloadManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.IPackageManager;
+import android.content.pm.UserInfo;
 import android.content.res.Resources;
-import android.graphics.drawable.ShapeDrawable;
-import android.graphics.drawable.shapes.RectShape;
 import android.hardware.usb.UsbManager;
-import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
 import android.os.RemoteException;
+import android.os.UserManager;
 import android.os.storage.StorageManager;
 import android.os.storage.StorageVolume;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
+import android.provider.MediaStore;
 import android.text.format.Formatter;
 
 import com.android.settings.R;
+import com.android.settings.deviceinfo.StorageMeasurement.MeasurementDetails;
 import com.android.settings.deviceinfo.StorageMeasurement.MeasurementReceiver;
+import com.google.android.collect.Lists;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
 
-public class StorageVolumePreferenceCategory extends PreferenceCategory implements
-        MeasurementReceiver {
+public class StorageVolumePreferenceCategory extends PreferenceCategory {
+    public static final String KEY_CACHE = "cache";
 
-    static final int TOTAL_SIZE = 0;
-    static final int APPLICATIONS = 1;
-    static final int DCIM = 2; // Pictures and Videos
-    static final int MUSIC = 3;
-    static final int DOWNLOADS = 4;
-    static final int MISC = 5;
-    static final int AVAILABLE = 6;
+    private static final int ORDER_USAGE_BAR = -2;
+    private static final int ORDER_STORAGE_LOW = -1;
+
+    /** Physical volume being measured, or {@code null} for internal. */
+    private final StorageVolume mVolume;
+    private final StorageMeasurement mMeasure;
+
+    private final Resources mResources;
+    private final StorageManager mStorageManager;
+    private final UserManager mUserManager;
 
     private UsageBarPreference mUsageBarPreference;
-    private Preference[] mPreferences;
     private Preference mMountTogglePreference;
     private Preference mFormatPreference;
     private Preference mStorageLow;
-    private int[] mColors;
 
-    private Resources mResources;
-
-    private StorageVolume mStorageVolume;
-
-    private StorageManager mStorageManager = null;
-
-    private StorageMeasurement mMeasurement;
-
-    private boolean mAllowFormat;
+    private StorageItemPreference mItemTotal;
+    private StorageItemPreference mItemAvailable;
+    private StorageItemPreference mItemApps;
+    private StorageItemPreference mItemDcim;
+    private StorageItemPreference mItemMusic;
+    private StorageItemPreference mItemDownloads;
+    private StorageItemPreference mItemCache;
+    private StorageItemPreference mItemMisc;
+    private List<StorageItemPreference> mItemUsers = Lists.newArrayList();
 
     private boolean mUsbConnected;
     private String mUsbFunction;
 
-    static class CategoryInfo {
-        final int mTitle;
-        final int mColor;
+    private long mTotalSize;
 
-        public CategoryInfo(int title, int color) {
-            mTitle = title;
-            mColor = color;
-        }
-    }
-
-    static final CategoryInfo[] sCategoryInfos = new CategoryInfo[] {
-        new CategoryInfo(R.string.memory_size, 0),
-        new CategoryInfo(R.string.memory_apps_usage, R.color.memory_apps_usage),
-        new CategoryInfo(R.string.memory_dcim_usage, R.color.memory_dcim),
-        new CategoryInfo(R.string.memory_music_usage, R.color.memory_music),
-        new CategoryInfo(R.string.memory_downloads_usage, R.color.memory_downloads),
-        new CategoryInfo(R.string.memory_media_misc_usage, R.color.memory_misc),
-        new CategoryInfo(R.string.memory_available, R.color.memory_avail),
-    };
-
-    public static final Set<String> sPathsExcludedForMisc = new HashSet<String>();
-
-    static class MediaCategory {
-        final String[] mDirPaths;
-        final int mCategory;
-        //final int mMediaType;
-
-        public MediaCategory(int category, String... directories) {
-            mCategory = category;
-            final int length = directories.length;
-            mDirPaths = new String[length];
-            for (int i = 0; i < length; i++) {
-                final String name = directories[i];
-                final String path = Environment.getExternalStoragePublicDirectory(name).
-                        getAbsolutePath();
-                mDirPaths[i] = path;
-                sPathsExcludedForMisc.add(path);
-            }
-        }
-    }
-
-    static final MediaCategory[] sMediaCategories = new MediaCategory[] {
-        new MediaCategory(DCIM, Environment.DIRECTORY_DCIM, Environment.DIRECTORY_MOVIES,
-                Environment.DIRECTORY_PICTURES),
-        new MediaCategory(MUSIC, Environment.DIRECTORY_MUSIC, Environment.DIRECTORY_ALARMS,
-                Environment.DIRECTORY_NOTIFICATIONS, Environment.DIRECTORY_RINGTONES,
-                Environment.DIRECTORY_PODCASTS)
-    };
-
-    static {
-        // Downloads
-        sPathsExcludedForMisc.add(Environment.getExternalStoragePublicDirectory(
-                Environment.DIRECTORY_DOWNLOADS).getAbsolutePath());
-        // Apps
-        sPathsExcludedForMisc.add(Environment.getExternalStorageDirectory().getAbsolutePath() +
-                "/Android");
-    }
-
-    // Updates the memory usage bar graph.
     private static final int MSG_UI_UPDATE_APPROXIMATE = 1;
-
-    // Updates the memory usage bar graph.
-    private static final int MSG_UI_UPDATE_EXACT = 2;
+    private static final int MSG_UI_UPDATE_DETAILS = 2;
 
     private Handler mUpdateHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
                 case MSG_UI_UPDATE_APPROXIMATE: {
-                    Bundle bundle = msg.getData();
-                    final long totalSize = bundle.getLong(StorageMeasurement.TOTAL_SIZE);
-                    final long availSize = bundle.getLong(StorageMeasurement.AVAIL_SIZE);
-                    updateApproximate(totalSize, availSize);
+                    final long[] size = (long[]) msg.obj;
+                    updateApproximate(size[0], size[1]);
                     break;
                 }
-                case MSG_UI_UPDATE_EXACT: {
-                    Bundle bundle = msg.getData();
-                    final long totalSize = bundle.getLong(StorageMeasurement.TOTAL_SIZE);
-                    final long availSize = bundle.getLong(StorageMeasurement.AVAIL_SIZE);
-                    final long appsUsed = bundle.getLong(StorageMeasurement.APPS_USED);
-                    final long downloadsSize = bundle.getLong(StorageMeasurement.DOWNLOADS_SIZE);
-                    final long miscSize = bundle.getLong(StorageMeasurement.MISC_SIZE);
-                    final long[] mediaSizes = bundle.getLongArray(StorageMeasurement.MEDIA_SIZES);
-                    updateExact(totalSize, availSize, appsUsed, downloadsSize, miscSize,
-                            mediaSizes);
+                case MSG_UI_UPDATE_DETAILS: {
+                    final MeasurementDetails details = (MeasurementDetails) msg.obj;
+                    updateDetails(details);
                     break;
                 }
             }
         }
     };
 
-    public StorageVolumePreferenceCategory(Context context, Resources resources,
-            StorageVolume storageVolume, StorageManager storageManager, boolean isPrimary) {
-        super(context);
-        mResources = resources;
-        mStorageVolume = storageVolume;
-        mStorageManager = storageManager;
-        setTitle(storageVolume != null ? storageVolume.getDescription(context)
-                : resources.getText(R.string.internal_storage));
-        mMeasurement = StorageMeasurement.getInstance(context, storageVolume, isPrimary);
-        mMeasurement.setReceiver(this);
+    /**
+     * Build category to summarize internal storage, including any emulated
+     * {@link StorageVolume}.
+     */
+    public static StorageVolumePreferenceCategory buildForInternal(Context context) {
+        return new StorageVolumePreferenceCategory(context, null);
+    }
 
-        // Cannot format emulated storage
-        mAllowFormat = mStorageVolume != null && !mStorageVolume.isEmulated();
-        // For now we are disabling reformatting secondary external storage
-        // until some interoperability problems with MTP are fixed
-        if (!isPrimary) mAllowFormat = false;
+    /**
+     * Build category to summarize specific physical {@link StorageVolume}.
+     */
+    public static StorageVolumePreferenceCategory buildForPhysical(
+            Context context, StorageVolume volume) {
+        return new StorageVolumePreferenceCategory(context, volume);
+    }
+
+    private StorageVolumePreferenceCategory(Context context, StorageVolume volume) {
+        super(context);
+
+        mVolume = volume;
+        mMeasure = StorageMeasurement.getInstance(context, volume);
+
+        mResources = context.getResources();
+        mStorageManager = StorageManager.from(context);
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+
+        setTitle(volume != null ? volume.getDescription(context)
+                : context.getText(R.string.internal_storage));
+    }
+
+    private StorageItemPreference buildItem(int titleRes, int colorRes) {
+        return new StorageItemPreference(getContext(), titleRes, colorRes);
     }
 
     public void init() {
-        mUsageBarPreference = new UsageBarPreference(getContext());
+        final Context context = getContext();
 
-        final int width = (int) mResources.getDimension(R.dimen.device_memory_usage_button_width);
-        final int height = (int) mResources.getDimension(R.dimen.device_memory_usage_button_height);
+        removeAll();
 
-        final int numberOfCategories = sCategoryInfos.length;
-        mPreferences = new Preference[numberOfCategories];
-        mColors = new int[numberOfCategories];
-        for (int i = 0; i < numberOfCategories; i++) {
-            final Preference preference = new Preference(getContext());
-            mPreferences[i] = preference;
-            preference.setTitle(sCategoryInfos[i].mTitle);
-            preference.setSummary(R.string.memory_calculating_size);
-            if (i != TOTAL_SIZE) {
-                // TOTAL_SIZE has no associated color
-                mColors[i] = mResources.getColor(sCategoryInfos[i].mColor);
-                preference.setIcon(createRectShape(width, height, mColors[i]));
+        final UserInfo currentUser;
+        try {
+            currentUser = ActivityManagerNative.getDefault().getCurrentUser();
+        } catch (RemoteException e) {
+            throw new RuntimeException("Failed to get current user");
+        }
+
+        final List<UserInfo> otherUsers = getUsersExcluding(currentUser);
+        final boolean showUsers = mVolume == null && otherUsers.size() > 0;
+
+        mUsageBarPreference = new UsageBarPreference(context);
+        mUsageBarPreference.setOrder(ORDER_USAGE_BAR);
+        addPreference(mUsageBarPreference);
+
+        mItemTotal = buildItem(R.string.memory_size, 0);
+        mItemAvailable = buildItem(R.string.memory_available, R.color.memory_avail);
+        addPreference(mItemTotal);
+        addPreference(mItemAvailable);
+
+        mItemApps = buildItem(R.string.memory_apps_usage, R.color.memory_apps_usage);
+        mItemDcim = buildItem(R.string.memory_dcim_usage, R.color.memory_dcim);
+        mItemMusic = buildItem(R.string.memory_music_usage, R.color.memory_music);
+        mItemDownloads = buildItem(R.string.memory_downloads_usage, R.color.memory_downloads);
+        mItemCache = buildItem(R.string.memory_media_cache_usage, R.color.memory_cache);
+        mItemMisc = buildItem(R.string.memory_media_misc_usage, R.color.memory_misc);
+
+        mItemCache.setKey(KEY_CACHE);
+
+        final boolean showDetails = mVolume == null || mVolume.isPrimary();
+        if (showDetails) {
+            if (showUsers) {
+                addPreference(new PreferenceHeader(context, currentUser.name));
+            }
+
+            addPreference(mItemApps);
+            addPreference(mItemDcim);
+            addPreference(mItemMusic);
+            addPreference(mItemDownloads);
+            addPreference(mItemCache);
+            addPreference(mItemMisc);
+
+            if (showUsers) {
+                addPreference(new PreferenceHeader(context, R.string.storage_other_users));
+
+                int count = 0;
+                for (UserInfo info : otherUsers) {
+                    final int colorRes = count++ % 2 == 0 ? R.color.memory_user_light
+                            : R.color.memory_user_dark;
+                    final StorageItemPreference userPref = new StorageItemPreference(
+                            getContext(), info.name, colorRes, info.id);
+                    mItemUsers.add(userPref);
+                    addPreference(userPref);
+                }
             }
         }
 
-        mMountTogglePreference = new Preference(getContext());
-        mMountTogglePreference.setTitle(R.string.sd_eject);
-        mMountTogglePreference.setSummary(R.string.sd_eject_summary);
+        final boolean isRemovable = mVolume != null ? mVolume.isRemovable() : false;
+        // Always create the preference since many code rely on it existing
+        mMountTogglePreference = new Preference(context);
+        if (isRemovable) {
+            mMountTogglePreference.setTitle(R.string.sd_eject);
+            mMountTogglePreference.setSummary(R.string.sd_eject_summary);
+            addPreference(mMountTogglePreference);
+        }
 
-        if (mAllowFormat) {
-            mFormatPreference = new Preference(getContext());
+        // Only allow formatting of primary physical storage
+        // TODO: enable for non-primary volumes once MTP is fixed
+        final boolean allowFormat = mVolume != null ? mVolume.isPrimary() : false;
+        if (allowFormat) {
+            mFormatPreference = new Preference(context);
             mFormatPreference.setTitle(R.string.sd_format);
             mFormatPreference.setSummary(R.string.sd_format_summary);
+            addPreference(mFormatPreference);
         }
 
         final IPackageManager pm = ActivityThread.getPackageManager();
         try {
             if (pm.isStorageLow()) {
-                mStorageLow = new Preference(getContext());
+                mStorageLow = new Preference(context);
+                mStorageLow.setOrder(ORDER_STORAGE_LOW);
                 mStorageLow.setTitle(R.string.storage_low_title);
                 mStorageLow.setSummary(R.string.storage_low_summary);
-            } else {
+                addPreference(mStorageLow);
+            } else if (mStorageLow != null) {
+                removePreference(mStorageLow);
                 mStorageLow = null;
             }
         } catch (RemoteException e) {
@@ -227,66 +232,25 @@
     }
 
     public StorageVolume getStorageVolume() {
-        return mStorageVolume;
-    }
-
-    /**
-     * Successive mounts can change the list of visible preferences.
-     * This makes sure all preferences are visible and displayed in the right order.
-     */
-    private void resetPreferences() {
-        final int numberOfCategories = sCategoryInfos.length;
-
-        removePreference(mUsageBarPreference);
-        for (int i = 0; i < numberOfCategories; i++) {
-            removePreference(mPreferences[i]);
-        }
-        removePreference(mMountTogglePreference);
-        if (mFormatPreference != null) {
-            removePreference(mFormatPreference);
-        }
-
-        addPreference(mUsageBarPreference);
-        if (mStorageLow != null) {
-            addPreference(mStorageLow);
-        }
-        for (int i = 0; i < numberOfCategories; i++) {
-            addPreference(mPreferences[i]);
-        }
-        addPreference(mMountTogglePreference);
-        if (mFormatPreference != null) {
-            addPreference(mFormatPreference);
-        }
-
-        mMountTogglePreference.setEnabled(true);
+        return mVolume;
     }
 
     private void updatePreferencesFromState() {
-        resetPreferences();
+        // Only update for physical volumes
+        if (mVolume == null) return;
 
-        String state = mStorageVolume != null
-                ? mStorageManager.getVolumeState(mStorageVolume.getPath())
-                : Environment.MEDIA_MOUNTED;
+        mMountTogglePreference.setEnabled(true);
 
-        String readOnly = "";
+        final String state = mStorageManager.getVolumeState(mVolume.getPath());
+
         if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
-            state = Environment.MEDIA_MOUNTED;
-            readOnly = mResources.getString(R.string.read_only);
-            if (mFormatPreference != null) {
-                removePreference(mFormatPreference);
-            }
+            mItemAvailable.setTitle(R.string.memory_available_read_only);
+        } else {
+            mItemAvailable.setTitle(R.string.memory_available);
         }
 
-        if ((mStorageVolume == null || !mStorageVolume.isRemovable())
-                && !Environment.MEDIA_UNMOUNTED.equals(state)) {
-            // This device has built-in storage that is not removable.
-            // There is no reason for the user to unmount it.
-            removePreference(mMountTogglePreference);
-        }
-
-        if (Environment.MEDIA_MOUNTED.equals(state)) {
-            mPreferences[AVAILABLE].setSummary(mPreferences[AVAILABLE].getSummary() + readOnly);
-
+        if (Environment.MEDIA_MOUNTED.equals(state)
+                || Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
             mMountTogglePreference.setEnabled(true);
             mMountTogglePreference.setTitle(mResources.getString(R.string.sd_eject));
             mMountTogglePreference.setSummary(mResources.getString(R.string.sd_eject_summary));
@@ -303,18 +267,17 @@
             }
 
             removePreference(mUsageBarPreference);
-            removePreference(mPreferences[TOTAL_SIZE]);
-            removePreference(mPreferences[AVAILABLE]);
-            if (mFormatPreference != null) {
-                removePreference(mFormatPreference);
-            }
+            removePreference(mItemTotal);
+            removePreference(mItemAvailable);
         }
 
         if (mUsbConnected && (UsbManager.USB_FUNCTION_MTP.equals(mUsbFunction) ||
                 UsbManager.USB_FUNCTION_PTP.equals(mUsbFunction))) {
             mMountTogglePreference.setEnabled(false);
-            if (Environment.MEDIA_MOUNTED.equals(state)) {
-                mMountTogglePreference.setSummary(mResources.getString(R.string.mtp_ptp_mode_summary));
+            if (Environment.MEDIA_MOUNTED.equals(state)
+                    || Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
+                mMountTogglePreference.setSummary(
+                        mResources.getString(R.string.mtp_ptp_mode_summary));
             }
 
             if (mFormatPreference != null) {
@@ -325,75 +288,90 @@
             mFormatPreference.setEnabled(true);
             mFormatPreference.setSummary(mResources.getString(R.string.sd_format_summary));
         }
-
     }
 
     public void updateApproximate(long totalSize, long availSize) {
-        mPreferences[TOTAL_SIZE].setSummary(formatSize(totalSize));
-        mPreferences[AVAILABLE].setSummary(formatSize(availSize));
+        mItemTotal.setSummary(formatSize(totalSize));
+        mItemAvailable.setSummary(formatSize(availSize));
+
+        mTotalSize = totalSize;
 
         final long usedSize = totalSize - availSize;
 
         mUsageBarPreference.clear();
-        mUsageBarPreference.addEntry(usedSize / (float) totalSize, android.graphics.Color.GRAY);
+        mUsageBarPreference.addEntry(0, usedSize / (float) totalSize, android.graphics.Color.GRAY);
         mUsageBarPreference.commit();
 
         updatePreferencesFromState();
     }
 
-    public void updateExact(long totalSize, long availSize, long appsSize, long downloadsSize,
-            long miscSize, long[] mediaSizes) {
+    private static long totalValues(HashMap<String, Long> map, String... keys) {
+        long total = 0;
+        for (String key : keys) {
+            if (map.containsKey(key)) {
+                total += map.get(key);
+            }
+        }
+        return total;
+    }
+
+    public void updateDetails(MeasurementDetails details) {
+        final boolean showDetails = mVolume == null || mVolume.isPrimary();
+        if (!showDetails) return;
+
+        // Count caches as available space, since system manages them
+        mItemTotal.setSummary(formatSize(details.totalSize));
+        mItemAvailable.setSummary(formatSize(details.availSize));
+
         mUsageBarPreference.clear();
 
-        mPreferences[TOTAL_SIZE].setSummary(formatSize(totalSize));
+        updatePreference(mItemApps, details.appsSize);
 
-        if (mMeasurement.isExternalSDCard()) {
-            // TODO FIXME: external SD card will not report any size. Show used space in bar graph
-            final long usedSize = totalSize - availSize;
-            mUsageBarPreference.addEntry(usedSize / (float) totalSize, android.graphics.Color.GRAY);
+        final long dcimSize = totalValues(details.mediaSize, Environment.DIRECTORY_DCIM,
+                Environment.DIRECTORY_MOVIES, Environment.DIRECTORY_PICTURES);
+        updatePreference(mItemDcim, dcimSize);
+
+        final long musicSize = totalValues(details.mediaSize, Environment.DIRECTORY_MUSIC,
+                Environment.DIRECTORY_ALARMS, Environment.DIRECTORY_NOTIFICATIONS,
+                Environment.DIRECTORY_RINGTONES, Environment.DIRECTORY_PODCASTS);
+        updatePreference(mItemMusic, musicSize);
+
+        final long downloadsSize = totalValues(details.mediaSize, Environment.DIRECTORY_DOWNLOADS);
+        updatePreference(mItemDownloads, downloadsSize);
+
+        updatePreference(mItemCache, details.cacheSize);
+        updatePreference(mItemMisc, details.miscSize);
+
+        for (StorageItemPreference userPref : mItemUsers) {
+            final long userSize = details.usersSize.get(userPref.userHandle);
+            updatePreference(userPref, userSize);
         }
 
-        updatePreference(appsSize, totalSize, APPLICATIONS);
-
-        long totalMediaSize = 0;
-        for (int i = 0; i < sMediaCategories.length; i++) {
-            final int category = sMediaCategories[i].mCategory;
-            final long size = mediaSizes[i];
-            updatePreference(size, totalSize, category);
-            totalMediaSize += size;
-        }
-
-        updatePreference(downloadsSize, totalSize, DOWNLOADS);
-
-        // Note miscSize != totalSize - availSize - appsSize - downloadsSize - totalMediaSize
-        // Block size is taken into account. That can be extra space from folders. TODO Investigate
-        updatePreference(miscSize, totalSize, MISC);
-
-        updatePreference(availSize, totalSize, AVAILABLE);
-
         mUsageBarPreference.commit();
     }
 
-    private void updatePreference(long size, long totalSize, int category) {
+    private void updatePreference(StorageItemPreference pref, long size) {
         if (size > 0) {
-            mPreferences[category].setSummary(formatSize(size));
-            mUsageBarPreference.addEntry(size / (float) totalSize, mColors[category]);
+            pref.setSummary(formatSize(size));
+            final int order = pref.getOrder();
+            mUsageBarPreference.addEntry(order, size / (float) mTotalSize, pref.color);
         } else {
-            removePreference(mPreferences[category]);
+            removePreference(pref);
         }
     }
 
     private void measure() {
-        mMeasurement.invalidate();
-        mMeasurement.measure();
+        mMeasure.invalidate();
+        mMeasure.measure();
     }
 
     public void onResume() {
-        mMeasurement.setReceiver(this);
+        mMeasure.setReceiver(mReceiver);
         measure();
     }
 
     public void onStorageStateChanged() {
+        init();
         measure();
     }
 
@@ -402,77 +380,103 @@
         mUsbFunction = usbFunction;
         measure();
     }
+
     public void onMediaScannerFinished() {
         measure();
     }
 
-    public void onPause() {
-        mMeasurement.cleanUp();
+    public void onCacheCleared() {
+        measure();
     }
 
-    private static ShapeDrawable createRectShape(int width, int height, int color) {
-        ShapeDrawable shape = new ShapeDrawable(new RectShape());
-        shape.setIntrinsicHeight(height);
-        shape.setIntrinsicWidth(width);
-        shape.getPaint().setColor(color);
-        return shape;
+    public void onPause() {
+        mMeasure.cleanUp();
     }
 
     private String formatSize(long size) {
         return Formatter.formatFileSize(getContext(), size);
     }
 
-    @Override
-    public void updateApproximate(Bundle bundle) {
-        final Message message = mUpdateHandler.obtainMessage(MSG_UI_UPDATE_APPROXIMATE);
-        message.setData(bundle);
-        mUpdateHandler.sendMessage(message);
-    }
+    private MeasurementReceiver mReceiver = new MeasurementReceiver() {
+        @Override
+        public void updateApproximate(StorageMeasurement meas, long totalSize, long availSize) {
+            mUpdateHandler.obtainMessage(MSG_UI_UPDATE_APPROXIMATE, new long[] {
+                    totalSize, availSize }).sendToTarget();
+        }
 
-    @Override
-    public void updateExact(Bundle bundle) {
-        final Message message = mUpdateHandler.obtainMessage(MSG_UI_UPDATE_EXACT);
-        message.setData(bundle);
-        mUpdateHandler.sendMessage(message);
-    }
+        @Override
+        public void updateDetails(StorageMeasurement meas, MeasurementDetails details) {
+            mUpdateHandler.obtainMessage(MSG_UI_UPDATE_DETAILS, details).sendToTarget();
+        }
+    };
 
     public boolean mountToggleClicked(Preference preference) {
         return preference == mMountTogglePreference;
     }
 
-    public Intent intentForClick(Preference preference) {
+    public Intent intentForClick(Preference pref) {
         Intent intent = null;
 
         // TODO The current "delete" story is not fully handled by the respective applications.
         // When it is done, make sure the intent types below are correct.
         // If that cannot be done, remove these intents.
-        if (preference == mFormatPreference) {
+        final String key = pref.getKey();
+        if (pref == mFormatPreference) {
             intent = new Intent(Intent.ACTION_VIEW);
             intent.setClass(getContext(), com.android.settings.MediaFormat.class);
-            intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, mStorageVolume);
-        } else if (preference == mPreferences[APPLICATIONS]) {
+            intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, mVolume);
+        } else if (pref == mItemApps) {
             intent = new Intent(Intent.ACTION_MANAGE_PACKAGE_STORAGE);
             intent.setClass(getContext(),
                     com.android.settings.Settings.ManageApplicationsActivity.class);
-        } else if (preference == mPreferences[DOWNLOADS]) {
+        } else if (pref == mItemDownloads) {
             intent = new Intent(DownloadManager.ACTION_VIEW_DOWNLOADS).putExtra(
                     DownloadManager.INTENT_EXTRAS_SORT_BY_SIZE, true);
-        } else if (preference == mPreferences[MUSIC]) {
+        } else if (pref == mItemMusic) {
             intent = new Intent(Intent.ACTION_GET_CONTENT);
             intent.setType("audio/mp3");
-        } else if (preference == mPreferences[DCIM]) {
+        } else if (pref == mItemDcim) {
             intent = new Intent(Intent.ACTION_VIEW);
             intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
-            // TODO Create a Videos category, type = vnd.android.cursor.dir/video
-            intent.setType("vnd.android.cursor.dir/image");
-        } else if (preference == mPreferences[MISC]) {
+            // TODO Create a Videos category, MediaStore.Video.Media.EXTERNAL_CONTENT_URI
+            intent.setData(MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+        } else if (pref == mItemMisc) {
             Context context = getContext().getApplicationContext();
-            if (mMeasurement.getMiscSize() > 0) {
-                intent = new Intent(context, MiscFilesHandler.class);
-                intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, mStorageVolume);
-            }
+            intent = new Intent(context, MiscFilesHandler.class);
+            intent.putExtra(StorageVolume.EXTRA_STORAGE_VOLUME, mVolume);
         }
 
         return intent;
     }
+
+    public static class PreferenceHeader extends Preference {
+        public PreferenceHeader(Context context, int titleRes) {
+            super(context, null, com.android.internal.R.attr.preferenceCategoryStyle);
+            setTitle(titleRes);
+        }
+
+        public PreferenceHeader(Context context, CharSequence title) {
+            super(context, null, com.android.internal.R.attr.preferenceCategoryStyle);
+            setTitle(title);
+        }
+
+        @Override
+        public boolean isEnabled() {
+            return false;
+        }
+    }
+
+    /**
+     * Return list of other users, excluding the current user.
+     */
+    private List<UserInfo> getUsersExcluding(UserInfo excluding) {
+        final List<UserInfo> users = mUserManager.getUsers();
+        final Iterator<UserInfo> i = users.iterator();
+        while (i.hasNext()) {
+            if (i.next().id == excluding.id) {
+                i.remove();
+            }
+        }
+        return users;
+    }
 }
diff --git a/src/com/android/settings/deviceinfo/UsageBarPreference.java b/src/com/android/settings/deviceinfo/UsageBarPreference.java
index 5aeaef5..371c772 100644
--- a/src/com/android/settings/deviceinfo/UsageBarPreference.java
+++ b/src/com/android/settings/deviceinfo/UsageBarPreference.java
@@ -16,15 +16,16 @@
 
 package com.android.settings.deviceinfo;
 
-import com.android.settings.R;
-
 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;
 
 /**
  * Creates a percentage bar chart inside a preference.
@@ -32,7 +33,7 @@
 public class UsageBarPreference extends Preference {
     private PercentageBarChart mChart = null;
 
-    private final Collection<PercentageBarChart.Entry> mEntries = new ArrayList<PercentageBarChart.Entry>();
+    private final List<PercentageBarChart.Entry> mEntries = Lists.newArrayList();
 
     public UsageBarPreference(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
@@ -49,8 +50,9 @@
         setLayoutResource(R.layout.preference_memoryusage);
     }
 
-    public void addEntry(float percentage, int color) {
-        mEntries.add(PercentageBarChart.createEntry(percentage, color));
+    public void addEntry(int order, float percentage, int color) {
+        mEntries.add(PercentageBarChart.createEntry(order, percentage, color));
+        Collections.sort(mEntries);
     }
 
     @Override
@@ -58,7 +60,6 @@
         super.onBindView(view);
 
         mChart = (PercentageBarChart) view.findViewById(R.id.percentage_bar_chart);
-
         mChart.setEntries(mEntries);
     }
 
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..55a0457 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -340,7 +340,7 @@
         long uSecTime = mStats.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000,
                 BatteryStats.STATS_SINCE_CHARGED);
         mStatsPeriod = uSecTime;
-        String durationString = Utils.formatElapsedTime(getContext(), mStatsPeriod / 1000);
+        String durationString = Utils.formatElapsedTime(getContext(), mStatsPeriod / 1000, true);
         mDurationString = getContext().getString(R.string.battery_stats_on_battery,
                 durationString);
         mChargingLabel = getContext().getString(R.string.battery_stats_charging_label);
@@ -382,7 +382,7 @@
             mHavePhoneSignal = true;
         }
         if (mHistEnd <= mHistStart) mHistEnd = mHistStart+1;
-        mTotalDurationString = Utils.formatElapsedTime(getContext(), mHistEnd - mHistStart);
+        mTotalDurationString = Utils.formatElapsedTime(getContext(), mHistEnd - mHistStart, true);
     }
 
     @Override
@@ -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) {
@@ -654,19 +654,26 @@
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
-        
+
         final int width = getWidth();
         final int height = getHeight();
-        
+        final boolean layoutRtl = isLayoutRtl();
+        final int textStartX = layoutRtl ? width : 0;
+        mTextPaint.setTextAlign(layoutRtl ? Paint.Align.RIGHT : Paint.Align.LEFT);
+
         canvas.drawPath(mBatLevelPath, mBatteryBackgroundPaint);
         if (mLargeMode) {
-            canvas.drawText(mDurationString, 0, -mTextAscent + (mLineWidth/2),
+            int durationHalfWidth = mTotalDurationStringWidth / 2;
+            if (layoutRtl) durationHalfWidth = -durationHalfWidth;
+            canvas.drawText(mDurationString, textStartX, -mTextAscent + (mLineWidth / 2),
                     mTextPaint);
-            canvas.drawText(mTotalDurationString, (width/2) - (mTotalDurationStringWidth/2),
+            canvas.drawText(mTotalDurationString, (width / 2) - durationHalfWidth,
                     mLevelBottom - mTextAscent + mThinLineWidth, mTextPaint);
         } else {
-            canvas.drawText(mDurationString, (width/2) - (mDurationStringWidth/2),
-                    (height/2) - ((mTextDescent-mTextAscent)/2) - mTextAscent, mTextPaint);
+            int durationHalfWidth = mDurationStringWidth / 2;
+            if (layoutRtl) durationHalfWidth = -durationHalfWidth;
+            canvas.drawText(mDurationString, (width / 2) - durationHalfWidth,
+                    (height / 2) - ((mTextDescent - mTextAscent) / 2) - mTextAscent, mTextPaint);
         }
         if (!mBatGoodPath.isEmpty()) {
             canvas.drawPath(mBatGoodPath, mBatteryGoodPaint);
@@ -703,22 +710,22 @@
 
         if (mLargeMode) {
             if (mHavePhoneSignal) {
-                canvas.drawText(mPhoneSignalLabel, 0,
+                canvas.drawText(mPhoneSignalLabel, textStartX,
                         height - mPhoneSignalOffset - mTextDescent, mTextPaint);
             }
             if (mHaveGps) {
-                canvas.drawText(mGpsOnLabel, 0,
+                canvas.drawText(mGpsOnLabel, textStartX,
                         height - mGpsOnOffset - mTextDescent, mTextPaint);
             }
             if (mHaveWifi) {
-                canvas.drawText(mWifiRunningLabel, 0,
+                canvas.drawText(mWifiRunningLabel, textStartX,
                         height - mWifiRunningOffset - mTextDescent, mTextPaint);
             }
-            canvas.drawText(mWakeLockLabel, 0,
+            canvas.drawText(mWakeLockLabel, textStartX,
                     height - mWakeLockOffset - mTextDescent, mTextPaint);
-            canvas.drawText(mChargingLabel, 0,
+            canvas.drawText(mChargingLabel, textStartX,
                     height - mChargingOffset - mTextDescent, mTextPaint);
-            canvas.drawText(mScreenOnLabel, 0,
+            canvas.drawText(mScreenOnLabel, textStartX,
                     height - mScreenOnOffset - mTextDescent, mTextPaint);
             canvas.drawLine(0, mLevelBottom+(mThinLineWidth/2), width,
                     mLevelBottom+(mThinLineWidth/2), mTextPaint);
diff --git a/src/com/android/settings/fuelgauge/BatterySipper.java b/src/com/android/settings/fuelgauge/BatterySipper.java
index dbd664a..fcc8f69 100644
--- a/src/com/android/settings/fuelgauge/BatterySipper.java
+++ b/src/com/android/settings/fuelgauge/BatterySipper.java
@@ -30,9 +30,14 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
-class BatterySipper implements Comparable<BatterySipper> {
+/**
+ * Contains information about package name, icon image, power usage about an
+ * application or a system service.
+ */
+public 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;
@@ -48,11 +53,14 @@
     long wifiRunningTime;
     long cpuFgTime;
     long wakeLockTime;
-    long tcpBytesReceived;
-    long tcpBytesSent;
+    long mobileRxBytes;
+    long mobileTxBytes;
+    long wifiRxBytes;
+    long wifiTxBytes;
     double percent;
     double noCoveragePercent;
     String defaultPackageName;
+    String[] mPackages;
 
     static class UidToDetail {
         String name;
@@ -87,27 +95,49 @@
         return values;
     }
 
-    Drawable getIcon() {
+    public Drawable getIcon() {
         return icon;
     }
 
+    /**
+     * Gets the application name
+     */
+    public String getLabel() {
+        return name;
+    }
+
+    @Override
     public int compareTo(BatterySipper other) {
         // Return the flipped value because we want the items in descending order
-        return (int) (other.getSortValue() - getSortValue());
+        return Double.compare(other.getSortValue(), getSortValue());
+    }
+
+    /**
+     * Gets a list of packages associated with the current user
+     */
+    public String[] getPackages() {
+        return mPackages;
+    }
+
+    public int getUid() {
+        // Bail out if the current sipper is not an App sipper.
+        if (uidObj == null) {
+            return 0;
+        }
+        return uidObj.getUid();
     }
 
     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;
             return;
         }
         PackageManager pm = mContext.getPackageManager();
-        final Drawable defaultActivityIcon = pm.getDefaultActivityIcon();
         String[] packages = pm.getPackagesForUid(uid);
         icon = pm.getDefaultActivityIcon();
         if (packages == null) {
@@ -123,27 +153,36 @@
         } else {
             //name = packages[0];
         }
-        synchronized (mRequestQueue) {
-            mRequestQueue.add(this);
+        if (mHandler != null) {
+            synchronized (mRequestQueue) {
+                mRequestQueue.add(this);
+            }
         }
     }
 
+    public static void clearUidCache() {
+        sUidCache.clear();
+    }
+
     /**
-     * Sets name and icon
-     * @param uid Uid of the application
+     * Loads the app label and icon image and stores into the cache.
      */
-    void getNameIcon() {
+    public void loadNameAndIcon() {
+        // Bail out if the current sipper is not an App sipper.
+        if (uidObj == null) {
+            return;
+        }
         PackageManager pm = mContext.getPackageManager();
         final int uid = uidObj.getUid();
         final Drawable defaultActivityIcon = pm.getDefaultActivityIcon();
-        String[] packages = pm.getPackagesForUid(uid);
-        if (packages == null) {
+        mPackages = pm.getPackagesForUid(uid);
+        if (mPackages == null) {
             name = Integer.toString(uid);
             return;
         }
 
-        String[] packageLabels = new String[packages.length];
-        System.arraycopy(packages, 0, packageLabels, 0, packages.length);
+        String[] packageLabels = new String[mPackages.length];
+        System.arraycopy(mPackages, 0, packageLabels, 0, mPackages.length);
 
         int preferredIndex = -1;
         // Convert package names to user-facing labels where possible
@@ -157,7 +196,7 @@
                     packageLabels[i] = label.toString();
                 }
                 if (ai.icon != 0) {
-                    defaultPackageName = packages[i];
+                    defaultPackageName = mPackages[i];
                     icon = ai.loadIcon(pm);
                     break;
                 }
@@ -170,7 +209,7 @@
             name = packageLabels[0];
         } else {
             // Look for an official name for this UID.
-            for (String pkgName : packages) {
+            for (String pkgName : mPackages) {
                 try {
                     final PackageInfo pi = pm.getPackageInfo(pkgName, 0);
                     if (pi.sharedUserLabel != 0) {
@@ -194,7 +233,10 @@
         utd.name = name;
         utd.icon = icon;
         utd.packageName = defaultPackageName;
-        mUidCache.put(uidString, utd);
-        mHandler.sendMessage(mHandler.obtainMessage(PowerUsageSummary.MSG_UPDATE_NAME_ICON, this));
+        sUidCache.put(uidString, utd);
+        if (mHandler != null) {
+            mHandler.sendMessage(
+                    mHandler.obtainMessage(BatteryStatsHelper.MSG_UPDATE_NAME_ICON, this));
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryStatsHelper.java b/src/com/android/settings/fuelgauge/BatteryStatsHelper.java
new file mode 100644
index 0000000..71c69a3
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryStatsHelper.java
@@ -0,0 +1,827 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge;
+
+import static android.os.BatteryStats.NETWORK_MOBILE_RX_BYTES;
+import static android.os.BatteryStats.NETWORK_MOBILE_TX_BYTES;
+import static android.os.BatteryStats.NETWORK_WIFI_RX_BYTES;
+import static android.os.BatteryStats.NETWORK_WIFI_TX_BYTES;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.graphics.drawable.Drawable;
+import android.hardware.Sensor;
+import android.hardware.SensorManager;
+import android.os.BatteryStats;
+import android.os.BatteryStats.Uid;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Parcel;
+import android.os.Process;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemClock;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.preference.PreferenceActivity;
+import android.telephony.SignalStrength;
+import android.util.Log;
+import android.util.SparseArray;
+
+import com.android.internal.app.IBatteryStats;
+import com.android.internal.os.BatteryStatsImpl;
+import com.android.internal.os.PowerProfile;
+import com.android.internal.util.FastPrintWriter;
+import com.android.settings.R;
+import com.android.settings.fuelgauge.PowerUsageDetail.DrainType;
+import com.android.settings.users.UserUtils;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A helper class for retrieving the power usage information for all applications and services.
+ *
+ * The caller must initialize this class as soon as activity object is ready to use (for example, in
+ * onAttach() for Fragment), call create() in onCreate() and call destroy() in onDestroy().
+ */
+public class BatteryStatsHelper {
+
+    private static final boolean DEBUG = false;
+
+    private static final String TAG = BatteryStatsHelper.class.getSimpleName();
+
+    private static BatteryStatsImpl sStatsXfer;
+    private IBatteryStats mBatteryInfo;
+    private UserManager mUm;
+    private BatteryStatsImpl mStats;
+    private PowerProfile mPowerProfile;
+
+    private final List<BatterySipper> mUsageList = new ArrayList<BatterySipper>();
+    private final List<BatterySipper> mWifiSippers = new ArrayList<BatterySipper>();
+    private final List<BatterySipper> mBluetoothSippers = new ArrayList<BatterySipper>();
+    private final SparseArray<List<BatterySipper>> mUserSippers
+            = new SparseArray<List<BatterySipper>>();
+    private final SparseArray<Double> mUserPower = new SparseArray<Double>();
+
+    private int mStatsType = BatteryStats.STATS_SINCE_CHARGED;
+
+    private long mStatsPeriod = 0;
+    private double mMaxPower = 1;
+    private double mTotalPower;
+    private double mWifiPower;
+    private double mBluetoothPower;
+
+    // How much the apps together have left WIFI running.
+    private long mAppWifiRunning;
+
+    /** Queue for fetching name and icon for an application */
+    private ArrayList<BatterySipper> mRequestQueue = new ArrayList<BatterySipper>();
+
+    private Activity mActivity;
+    private Handler mHandler;
+
+    private class NameAndIconLoader extends Thread {
+        private boolean mAbort = false;
+
+        public NameAndIconLoader() {
+            super("BatteryUsage Icon Loader");
+        }
+
+        public void abort() {
+            mAbort = true;
+        }
+
+        @Override
+        public void run() {
+            while (true) {
+                BatterySipper bs;
+                synchronized (mRequestQueue) {
+                    if (mRequestQueue.isEmpty() || mAbort) {
+                        mHandler.sendEmptyMessage(MSG_REPORT_FULLY_DRAWN);
+                        return;
+                    }
+                    bs = mRequestQueue.remove(0);
+                }
+                bs.loadNameAndIcon();
+            }
+        }
+    }
+
+    private NameAndIconLoader mRequestThread;
+
+    public BatteryStatsHelper(Activity activity, Handler handler) {
+        mActivity = activity;
+        mHandler = handler;
+    }
+
+    /** Clears the current stats and forces recreating for future use. */
+    public void clearStats() {
+        mStats = null;
+    }
+
+    public BatteryStatsImpl getStats() {
+        if (mStats == null) {
+            load();
+        }
+        return mStats;
+    }
+
+    public PowerProfile getPowerProfile() {
+        return mPowerProfile;
+    }
+
+    public void create(Bundle icicle) {
+        if (icicle != null) {
+            mStats = sStatsXfer;
+        }
+        mBatteryInfo = IBatteryStats.Stub.asInterface(
+                ServiceManager.getService(BatteryStats.SERVICE_NAME));
+        mUm = (UserManager) mActivity.getSystemService(Context.USER_SERVICE);
+        mPowerProfile = new PowerProfile(mActivity);
+    }
+
+    public void pause() {
+        if (mRequestThread != null) {
+            mRequestThread.abort();
+        }
+    }
+
+    public void destroy() {
+        if (mActivity.isChangingConfigurations()) {
+            sStatsXfer = mStats;
+        } else {
+            BatterySipper.sUidCache.clear();
+        }
+    }
+
+    public void startBatteryDetailPage(
+            PreferenceActivity caller, BatterySipper sipper, boolean showLocationButton) {
+        // Initialize mStats if necessary.
+        getStats();
+
+        Bundle args = new Bundle();
+        args.putString(PowerUsageDetail.EXTRA_TITLE, sipper.name);
+        args.putInt(PowerUsageDetail.EXTRA_PERCENT, (int)
+                Math.ceil(sipper.getSortValue() * 100 / mTotalPower));
+        args.putInt(PowerUsageDetail.EXTRA_GAUGE, (int)
+                Math.ceil(sipper.getSortValue() * 100 / mMaxPower));
+        args.putLong(PowerUsageDetail.EXTRA_USAGE_DURATION, mStatsPeriod);
+        args.putString(PowerUsageDetail.EXTRA_ICON_PACKAGE, sipper.defaultPackageName);
+        args.putInt(PowerUsageDetail.EXTRA_ICON_ID, sipper.iconId);
+        args.putDouble(PowerUsageDetail.EXTRA_NO_COVERAGE, sipper.noCoveragePercent);
+        if (sipper.uidObj != null) {
+            args.putInt(PowerUsageDetail.EXTRA_UID, sipper.uidObj.getUid());
+        }
+        args.putSerializable(PowerUsageDetail.EXTRA_DRAIN_TYPE, sipper.drainType);
+        args.putBoolean(PowerUsageDetail.EXTRA_SHOW_LOCATION_BUTTON, showLocationButton);
+
+        int[] types;
+        double[] values;
+        switch (sipper.drainType) {
+            case APP:
+            case USER:
+            {
+                Uid uid = sipper.uidObj;
+                types = new int[] {
+                    R.string.usage_type_cpu,
+                    R.string.usage_type_cpu_foreground,
+                    R.string.usage_type_wake_lock,
+                    R.string.usage_type_gps,
+                    R.string.usage_type_wifi_running,
+                    R.string.usage_type_data_recv,
+                    R.string.usage_type_data_send,
+                    R.string.usage_type_data_wifi_recv,
+                    R.string.usage_type_data_wifi_send,
+                    R.string.usage_type_audio,
+                    R.string.usage_type_video,
+                };
+                values = new double[] {
+                    sipper.cpuTime,
+                    sipper.cpuFgTime,
+                    sipper.wakeLockTime,
+                    sipper.gpsTime,
+                    sipper.wifiRunningTime,
+                    sipper.mobileRxBytes,
+                    sipper.mobileTxBytes,
+                    sipper.wifiRxBytes,
+                    sipper.wifiTxBytes,
+                    0,
+                    0
+                };
+
+                if (sipper.drainType == DrainType.APP) {
+                    Writer result = new StringWriter();
+                    PrintWriter printWriter = new FastPrintWriter(result, false, 1024);
+                    mStats.dumpLocked(printWriter, "", mStatsType, uid.getUid());
+                    printWriter.flush();
+                    args.putString(PowerUsageDetail.EXTRA_REPORT_DETAILS, result.toString());
+
+                    result = new StringWriter();
+                    printWriter = new FastPrintWriter(result, false, 1024);
+                    mStats.dumpCheckinLocked(printWriter, mStatsType, uid.getUid());
+                    printWriter.flush();
+                    args.putString(PowerUsageDetail.EXTRA_REPORT_CHECKIN_DETAILS,
+                            result.toString());
+                }
+            }
+            break;
+            case CELL:
+            {
+                types = new int[] {
+                    R.string.usage_type_on_time,
+                    R.string.usage_type_no_coverage
+                };
+                values = new double[] {
+                    sipper.usageTime,
+                    sipper.noCoveragePercent
+                };
+            }
+            break;
+            case WIFI:
+            {
+                types = new int[] {
+                    R.string.usage_type_wifi_running,
+                    R.string.usage_type_cpu,
+                    R.string.usage_type_cpu_foreground,
+                    R.string.usage_type_wake_lock,
+                    R.string.usage_type_data_recv,
+                    R.string.usage_type_data_send,
+                    R.string.usage_type_data_wifi_recv,
+                    R.string.usage_type_data_wifi_send,
+                };
+                values = new double[] {
+                    sipper.usageTime,
+                    sipper.cpuTime,
+                    sipper.cpuFgTime,
+                    sipper.wakeLockTime,
+                    sipper.mobileRxBytes,
+                    sipper.mobileTxBytes,
+                    sipper.wifiRxBytes,
+                    sipper.wifiTxBytes,
+                };
+            } break;
+            case BLUETOOTH:
+            {
+                types = new int[] {
+                    R.string.usage_type_on_time,
+                    R.string.usage_type_cpu,
+                    R.string.usage_type_cpu_foreground,
+                    R.string.usage_type_wake_lock,
+                    R.string.usage_type_data_recv,
+                    R.string.usage_type_data_send,
+                    R.string.usage_type_data_wifi_recv,
+                    R.string.usage_type_data_wifi_send,
+                };
+                values = new double[] {
+                    sipper.usageTime,
+                    sipper.cpuTime,
+                    sipper.cpuFgTime,
+                    sipper.wakeLockTime,
+                    sipper.mobileRxBytes,
+                    sipper.mobileTxBytes,
+                    sipper.wifiRxBytes,
+                    sipper.wifiTxBytes,
+                };
+            } break;
+            default:
+            {
+                types = new int[] {
+                    R.string.usage_type_on_time
+                };
+                values = new double[] {
+                    sipper.usageTime
+                };
+            }
+        }
+        args.putIntArray(PowerUsageDetail.EXTRA_DETAIL_TYPES, types);
+        args.putDoubleArray(PowerUsageDetail.EXTRA_DETAIL_VALUES, values);
+        caller.startPreferencePanel(PowerUsageDetail.class.getName(), args,
+                R.string.details_title, null, null, 0);
+    }
+
+    /**
+     * Refreshes the power usage list.
+     * @param includeZeroConsumption whether includes those applications which have consumed very
+     *                               little power up till now.
+     */
+    public void refreshStats(boolean includeZeroConsumption) {
+        // Initialize mStats if necessary.
+        getStats();
+
+        mMaxPower = 0;
+        mTotalPower = 0;
+        mWifiPower = 0;
+        mBluetoothPower = 0;
+        mAppWifiRunning = 0;
+
+        mUsageList.clear();
+        mWifiSippers.clear();
+        mBluetoothSippers.clear();
+        mUserSippers.clear();
+        mUserPower.clear();
+
+        processAppUsage(includeZeroConsumption);
+        processMiscUsage();
+
+        Collections.sort(mUsageList);
+
+        if (mHandler != null) {
+            synchronized (mRequestQueue) {
+                if (!mRequestQueue.isEmpty()) {
+                    if (mRequestThread != null) {
+                        mRequestThread.abort();
+                    }
+                    mRequestThread = new NameAndIconLoader();
+                    mRequestThread.setPriority(Thread.MIN_PRIORITY);
+                    mRequestThread.start();
+                    mRequestQueue.notify();
+                }
+            }
+        }
+    }
+
+    private void processAppUsage(boolean includeZeroConsumption) {
+        SensorManager sensorManager = (SensorManager) mActivity.getSystemService(
+                Context.SENSOR_SERVICE);
+        final int which = mStatsType;
+        final int speedSteps = mPowerProfile.getNumSpeedSteps();
+        final double[] powerCpuNormal = new double[speedSteps];
+        final long[] cpuSpeedStepTimes = new long[speedSteps];
+        for (int p = 0; p < speedSteps; p++) {
+            powerCpuNormal[p] = mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_ACTIVE, p);
+        }
+        final double mobilePowerPerByte = getMobilePowerPerByte();
+        final double wifiPowerPerByte = getWifiPowerPerByte();
+        long uSecTime = mStats.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000, which);
+        long appWakelockTime = 0;
+        BatterySipper osApp = null;
+        mStatsPeriod = uSecTime;
+        SparseArray<? extends Uid> uidStats = mStats.getUidStats();
+        final int NU = uidStats.size();
+        for (int iu = 0; iu < NU; iu++) {
+            Uid u = uidStats.valueAt(iu);
+            double p; // in mAs
+            double power = 0; // in mAs
+            double highestDrain = 0;
+            String packageWithHighestDrain = null;
+            //mUsageList.add(new AppUsage(u.getUid(), new double[] {power}));
+            Map<String, ? extends BatteryStats.Uid.Proc> processStats = u.getProcessStats();
+            long cpuTime = 0;
+            long cpuFgTime = 0;
+            long wakelockTime = 0;
+            long gpsTime = 0;
+            if (DEBUG) Log.i(TAG, "UID " + u.getUid());
+            if (processStats.size() > 0) {
+                // Process CPU time
+                for (Map.Entry<String, ? extends BatteryStats.Uid.Proc> ent
+                        : processStats.entrySet()) {
+                    Uid.Proc ps = ent.getValue();
+                    final long userTime = ps.getUserTime(which);
+                    final long systemTime = ps.getSystemTime(which);
+                    final long foregroundTime = ps.getForegroundTime(which);
+                    cpuFgTime += foregroundTime * 10; // convert to millis
+                    final long tmpCpuTime = (userTime + systemTime) * 10; // convert to millis
+                    int totalTimeAtSpeeds = 0;
+                    // Get the total first
+                    for (int step = 0; step < speedSteps; step++) {
+                        cpuSpeedStepTimes[step] = ps.getTimeAtCpuSpeedStep(step, which);
+                        totalTimeAtSpeeds += cpuSpeedStepTimes[step];
+                    }
+                    if (totalTimeAtSpeeds == 0) totalTimeAtSpeeds = 1;
+                    // Then compute the ratio of time spent at each speed
+                    double processPower = 0;
+                    for (int step = 0; step < speedSteps; step++) {
+                        double ratio = (double) cpuSpeedStepTimes[step] / totalTimeAtSpeeds;
+                        processPower += ratio * tmpCpuTime * powerCpuNormal[step];
+                    }
+                    cpuTime += tmpCpuTime;
+                    if (DEBUG && processPower != 0) {
+                        Log.i(TAG, String.format("process %s, cpu power=%.2f",
+                                ent.getKey(), processPower / 1000));
+                    }
+                    power += processPower;
+                    if (packageWithHighestDrain == null
+                            || packageWithHighestDrain.startsWith("*")) {
+                        highestDrain = processPower;
+                        packageWithHighestDrain = ent.getKey();
+                    } else if (highestDrain < processPower
+                            && !ent.getKey().startsWith("*")) {
+                        highestDrain = processPower;
+                        packageWithHighestDrain = ent.getKey();
+                    }
+                }
+            }
+            if (cpuFgTime > cpuTime) {
+                if (DEBUG && cpuFgTime > cpuTime + 10000) {
+                    Log.i(TAG, "WARNING! Cputime is more than 10 seconds behind Foreground time");
+                }
+                cpuTime = cpuFgTime; // Statistics may not have been gathered yet.
+            }
+            power /= 1000;
+            if (DEBUG && power != 0) Log.i(TAG, String.format("total cpu power=%.2f", power));
+
+            // Process wake lock usage
+            Map<String, ? extends BatteryStats.Uid.Wakelock> wakelockStats = u.getWakelockStats();
+            for (Map.Entry<String, ? extends BatteryStats.Uid.Wakelock> wakelockEntry
+                    : wakelockStats.entrySet()) {
+                Uid.Wakelock wakelock = wakelockEntry.getValue();
+                // Only care about partial wake locks since full wake locks
+                // are canceled when the user turns the screen off.
+                BatteryStats.Timer timer = wakelock.getWakeTime(BatteryStats.WAKE_TYPE_PARTIAL);
+                if (timer != null) {
+                    wakelockTime += timer.getTotalTimeLocked(uSecTime, which);
+                }
+            }
+            wakelockTime /= 1000; // convert to millis
+            appWakelockTime += wakelockTime;
+
+            // Add cost of holding a wake lock
+            p = (wakelockTime
+                    * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("wakelock power=%.2f", p));
+
+            // Add cost of mobile traffic
+            final long mobileRx = u.getNetworkActivityCount(NETWORK_MOBILE_RX_BYTES, mStatsType);
+            final long mobileTx = u.getNetworkActivityCount(NETWORK_MOBILE_TX_BYTES, mStatsType);
+            p = (mobileRx + mobileTx) * mobilePowerPerByte;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("mobile power=%.2f", p));
+
+            // Add cost of wifi traffic
+            final long wifiRx = u.getNetworkActivityCount(NETWORK_WIFI_RX_BYTES, mStatsType);
+            final long wifiTx = u.getNetworkActivityCount(NETWORK_WIFI_TX_BYTES, mStatsType);
+            p = (wifiRx + wifiTx) * wifiPowerPerByte;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("wifi power=%.2f", p));
+
+            // Add cost of keeping WIFI running.
+            long wifiRunningTimeMs = u.getWifiRunningTime(uSecTime, which) / 1000;
+            mAppWifiRunning += wifiRunningTimeMs;
+            p = (wifiRunningTimeMs
+                    * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)) / 1000;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("wifi running power=%.2f", p));
+
+            // Add cost of WIFI scans
+            long wifiScanTimeMs = u.getWifiScanTime(uSecTime, which) / 1000;
+            p = (wifiScanTimeMs
+                    * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_SCAN)) / 1000;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("wifi scanning power=%.2f", p));
+
+            // Process Sensor usage
+            Map<Integer, ? extends BatteryStats.Uid.Sensor> sensorStats = u.getSensorStats();
+            for (Map.Entry<Integer, ? extends BatteryStats.Uid.Sensor> sensorEntry
+                    : sensorStats.entrySet()) {
+                Uid.Sensor sensor = sensorEntry.getValue();
+                int sensorHandle = sensor.getHandle();
+                BatteryStats.Timer timer = sensor.getSensorTime();
+                long sensorTime = timer.getTotalTimeLocked(uSecTime, which) / 1000;
+                double multiplier = 0;
+                switch (sensorHandle) {
+                    case Uid.Sensor.GPS:
+                        multiplier = mPowerProfile.getAveragePower(PowerProfile.POWER_GPS_ON);
+                        gpsTime = sensorTime;
+                        break;
+                    default:
+                        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;
+                power += p;
+                if (DEBUG && p != 0) {
+                    Log.i(TAG, String.format("sensor %s power=%.2f", sensor.toString(), p));
+                }
+            }
+
+            if (DEBUG) Log.i(TAG, String.format("UID %d total power=%.2f", u.getUid(), power));
+
+            // Add the app to the list if it is consuming power
+            boolean isOtherUser = false;
+            final int userId = UserHandle.getUserId(u.getUid());
+            if (power != 0 || includeZeroConsumption || u.getUid() == 0) {
+                BatterySipper app = new BatterySipper(mActivity, mRequestQueue, mHandler,
+                        packageWithHighestDrain, DrainType.APP, 0, u,
+                        new double[] {power});
+                app.cpuTime = cpuTime;
+                app.gpsTime = gpsTime;
+                app.wifiRunningTime = wifiRunningTimeMs;
+                app.cpuFgTime = cpuFgTime;
+                app.wakeLockTime = wakelockTime;
+                app.mobileRxBytes = mobileRx;
+                app.mobileTxBytes = mobileTx;
+                app.wifiRxBytes = wifiRx;
+                app.wifiTxBytes = wifiTx;
+                if (u.getUid() == Process.WIFI_UID) {
+                    mWifiSippers.add(app);
+                } else if (u.getUid() == Process.BLUETOOTH_UID) {
+                    mBluetoothSippers.add(app);
+                } else if (userId != UserHandle.myUserId()
+                        && UserHandle.getAppId(u.getUid()) >= Process.FIRST_APPLICATION_UID) {
+                    isOtherUser = true;
+                    List<BatterySipper> list = mUserSippers.get(userId);
+                    if (list == null) {
+                        list = new ArrayList<BatterySipper>();
+                        mUserSippers.put(userId, list);
+                    }
+                    list.add(app);
+                } else {
+                    mUsageList.add(app);
+                }
+                if (u.getUid() == 0) {
+                    osApp = app;
+                }
+            }
+            if (power != 0 || includeZeroConsumption) {
+                if (u.getUid() == Process.WIFI_UID) {
+                    mWifiPower += power;
+                } else if (u.getUid() == Process.BLUETOOTH_UID) {
+                    mBluetoothPower += power;
+                } else if (isOtherUser) {
+                    Double userPower = mUserPower.get(userId);
+                    if (userPower == null) {
+                        userPower = power;
+                    } else {
+                        userPower += power;
+                    }
+                    mUserPower.put(userId, userPower);
+                } else {
+                    if (power > mMaxPower) mMaxPower = power;
+                    mTotalPower += power;
+                }
+            }
+        }
+
+        // The device has probably been awake for longer than the screen on
+        // time and application wake lock time would account for.  Assign
+        // this remainder to the OS, if possible.
+        if (osApp != null) {
+            long wakeTimeMillis = mStats.computeBatteryUptime(
+                    SystemClock.uptimeMillis() * 1000, which) / 1000;
+            wakeTimeMillis -= appWakelockTime + (mStats.getScreenOnTime(
+                    SystemClock.elapsedRealtime(), which) / 1000);
+            if (wakeTimeMillis > 0) {
+                double power = (wakeTimeMillis
+                        * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000;
+                if (DEBUG) Log.i(TAG, "OS wakeLockTime " + wakeTimeMillis + " power " + power);
+                osApp.wakeLockTime += wakeTimeMillis;
+                osApp.value += power;
+                osApp.values[0] += power;
+                if (osApp.value > mMaxPower) mMaxPower = osApp.value;
+                mTotalPower += power;
+            }
+        }
+    }
+
+    private void addPhoneUsage(long uSecNow) {
+        long phoneOnTimeMs = mStats.getPhoneOnTime(uSecNow, mStatsType) / 1000;
+        double phoneOnPower = mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE)
+                * phoneOnTimeMs / 1000;
+        addEntry(mActivity.getString(R.string.power_phone), DrainType.PHONE, phoneOnTimeMs,
+                R.drawable.ic_settings_voice_calls, phoneOnPower);
+    }
+
+    private void addScreenUsage(long uSecNow) {
+        double power = 0;
+        long screenOnTimeMs = mStats.getScreenOnTime(uSecNow, mStatsType) / 1000;
+        power += screenOnTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_SCREEN_ON);
+        final double screenFullPower =
+                mPowerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL);
+        for (int i = 0; i < BatteryStats.NUM_SCREEN_BRIGHTNESS_BINS; i++) {
+            double screenBinPower = screenFullPower * (i + 0.5f)
+                    / BatteryStats.NUM_SCREEN_BRIGHTNESS_BINS;
+            long brightnessTime = mStats.getScreenBrightnessTime(i, uSecNow, mStatsType) / 1000;
+            power += screenBinPower * brightnessTime;
+            if (DEBUG) {
+                Log.i(TAG, "Screen bin power = " + (int) screenBinPower + ", time = "
+                        + brightnessTime);
+            }
+        }
+        power /= 1000; // To seconds
+        addEntry(mActivity.getString(R.string.power_screen), DrainType.SCREEN, screenOnTimeMs,
+                R.drawable.ic_settings_display, power);
+    }
+
+    private void addRadioUsage(long uSecNow) {
+        double power = 0;
+        final int BINS = SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
+        long signalTimeMs = 0;
+        for (int i = 0; i < BINS; i++) {
+            long strengthTimeMs = mStats.getPhoneSignalStrengthTime(i, uSecNow, mStatsType) / 1000;
+            power += strengthTimeMs / 1000
+                    * mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ON, i);
+            signalTimeMs += strengthTimeMs;
+        }
+        long scanningTimeMs = mStats.getPhoneSignalScanningTime(uSecNow, mStatsType) / 1000;
+        power += scanningTimeMs / 1000 * mPowerProfile.getAveragePower(
+                PowerProfile.POWER_RADIO_SCANNING);
+        BatterySipper bs =
+                addEntry(mActivity.getString(R.string.power_cell), DrainType.CELL,
+                        signalTimeMs, R.drawable.ic_settings_cell_standby, power);
+        if (signalTimeMs != 0) {
+            bs.noCoveragePercent = mStats.getPhoneSignalStrengthTime(0, uSecNow, mStatsType)
+                    / 1000 * 100.0 / signalTimeMs;
+        }
+    }
+
+    private void aggregateSippers(BatterySipper bs, List<BatterySipper> from, String tag) {
+        for (int i=0; i<from.size(); i++) {
+            BatterySipper wbs = from.get(i);
+            if (DEBUG) Log.i(TAG, tag + " adding sipper " + wbs + ": cpu=" + wbs.cpuTime);
+            bs.cpuTime += wbs.cpuTime;
+            bs.gpsTime += wbs.gpsTime;
+            bs.wifiRunningTime += wbs.wifiRunningTime;
+            bs.cpuFgTime += wbs.cpuFgTime;
+            bs.wakeLockTime += wbs.wakeLockTime;
+            bs.mobileRxBytes += wbs.mobileRxBytes;
+            bs.mobileTxBytes += wbs.mobileTxBytes;
+            bs.wifiRxBytes += wbs.wifiRxBytes;
+            bs.wifiTxBytes += wbs.wifiTxBytes;
+        }
+    }
+
+    private void addWiFiUsage(long uSecNow) {
+        long onTimeMs = mStats.getWifiOnTime(uSecNow, mStatsType) / 1000;
+        long runningTimeMs = mStats.getGlobalWifiRunningTime(uSecNow, mStatsType) / 1000;
+        if (DEBUG) Log.i(TAG, "WIFI runningTime=" + runningTimeMs
+                + " app runningTime=" + mAppWifiRunning);
+        runningTimeMs -= mAppWifiRunning;
+        if (runningTimeMs < 0) runningTimeMs = 0;
+        double wifiPower = (onTimeMs * 0 /* TODO */
+                * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)
+            + runningTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)) / 1000;
+        if (DEBUG) Log.i(TAG, "WIFI power=" + wifiPower + " from procs=" + mWifiPower);
+        BatterySipper bs = addEntry(mActivity.getString(R.string.power_wifi), DrainType.WIFI,
+                runningTimeMs, R.drawable.ic_settings_wifi, wifiPower + mWifiPower);
+        aggregateSippers(bs, mWifiSippers, "WIFI");
+    }
+
+    private void addIdleUsage(long uSecNow) {
+        long idleTimeMs = (uSecNow - mStats.getScreenOnTime(uSecNow, mStatsType)) / 1000;
+        double idlePower = (idleTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_IDLE))
+                / 1000;
+        addEntry(mActivity.getString(R.string.power_idle), DrainType.IDLE, idleTimeMs,
+                R.drawable.ic_settings_phone_idle, idlePower);
+    }
+
+    private void addBluetoothUsage(long uSecNow) {
+        long btOnTimeMs = mStats.getBluetoothOnTime(uSecNow, mStatsType) / 1000;
+        double btPower = btOnTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_BLUETOOTH_ON)
+                / 1000;
+        int btPingCount = mStats.getBluetoothPingCount();
+        btPower += (btPingCount
+                * mPowerProfile.getAveragePower(PowerProfile.POWER_BLUETOOTH_AT_CMD)) / 1000;
+        BatterySipper bs = addEntry(mActivity.getString(R.string.power_bluetooth),
+                DrainType.BLUETOOTH, btOnTimeMs, R.drawable.ic_settings_bluetooth,
+                btPower + mBluetoothPower);
+        aggregateSippers(bs, mBluetoothSippers, "Bluetooth");
+    }
+
+    private void addUserUsage() {
+        for (int i=0; i<mUserSippers.size(); i++) {
+            final int userId = mUserSippers.keyAt(i);
+            final List<BatterySipper> sippers = mUserSippers.valueAt(i);
+            UserInfo info = mUm.getUserInfo(userId);
+            Drawable icon;
+            String name;
+            if (info != null) {
+                icon = UserUtils.getUserIcon(mActivity, mUm, info, mActivity.getResources());
+                name = info != null ? info.name : null;
+                if (name == null) {
+                    name = Integer.toString(info.id);
+                }
+                name = mActivity.getResources().getString(
+                        R.string.running_process_item_user_label, name);
+            } else {
+                icon = null;
+                name = mActivity.getResources().getString(
+                        R.string.running_process_item_removed_user_label);
+            }
+            Double userPower = mUserPower.get(userId);
+            double power = (userPower != null) ? userPower : 0.0;
+            BatterySipper bs = addEntry(name, DrainType.USER, 0, 0, power);
+            bs.icon = icon;
+            aggregateSippers(bs, sippers, "User");
+        }
+    }
+
+    /**
+     * Return estimated power (in mAs) of sending a byte with the mobile radio.
+     */
+    private double getMobilePowerPerByte() {
+        final long MOBILE_BPS = 200000; // TODO: Extract average bit rates from system
+        final double MOBILE_POWER = mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE)
+                / 3600;
+
+        final long mobileRx = mStats.getNetworkActivityCount(NETWORK_MOBILE_RX_BYTES, mStatsType);
+        final long mobileTx = mStats.getNetworkActivityCount(NETWORK_MOBILE_TX_BYTES, mStatsType);
+        final long mobileData = mobileRx + mobileTx;
+
+        final long radioDataUptimeMs = mStats.getRadioDataUptime() / 1000;
+        final long mobileBps = radioDataUptimeMs != 0
+                ? mobileData * 8 * 1000 / radioDataUptimeMs
+                : MOBILE_BPS;
+
+        return MOBILE_POWER / (mobileBps / 8);
+    }
+
+    /**
+     * Return estimated power (in mAs) of sending a byte with the Wi-Fi radio.
+     */
+    private double getWifiPowerPerByte() {
+        final long WIFI_BPS = 1000000; // TODO: Extract average bit rates from system
+        final double WIFI_POWER = mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ACTIVE)
+                / 3600;
+        return WIFI_POWER / (WIFI_BPS / 8);
+    }
+
+    private void processMiscUsage() {
+        final int which = mStatsType;
+        long uSecTime = SystemClock.elapsedRealtime() * 1000;
+        final long uSecNow = mStats.computeBatteryRealtime(uSecTime, which);
+        final long timeSinceUnplugged = uSecNow;
+        if (DEBUG) {
+            Log.i(TAG, "Uptime since last unplugged = " + (timeSinceUnplugged / 1000));
+        }
+
+        addUserUsage();
+        addPhoneUsage(uSecNow);
+        addScreenUsage(uSecNow);
+        addWiFiUsage(uSecNow);
+        addBluetoothUsage(uSecNow);
+        addIdleUsage(uSecNow); // Not including cellular idle power
+        // Don't compute radio usage if it's a wifi-only device
+        if (!com.android.settings.Utils.isWifiOnly(mActivity)) {
+            addRadioUsage(uSecNow);
+        }
+    }
+
+    private BatterySipper addEntry(String label, DrainType drainType, long time, int iconId,
+            double power) {
+        if (power > mMaxPower) mMaxPower = power;
+        mTotalPower += power;
+        BatterySipper bs = new BatterySipper(mActivity, mRequestQueue, mHandler,
+                label, drainType, iconId, null, new double[] {power});
+        bs.usageTime = time;
+        bs.iconId = iconId;
+        mUsageList.add(bs);
+        return bs;
+    }
+
+    public List<BatterySipper> getUsageList() {
+        return mUsageList;
+    }
+
+    static final int MSG_UPDATE_NAME_ICON = 1;
+    static final int MSG_REPORT_FULLY_DRAWN = 2;
+
+    public double getMaxPower() {
+        return mMaxPower;
+    }
+
+    public double getTotalPower() {
+        return mTotalPower;
+    }
+
+    private void load() {
+        try {
+            byte[] data = mBatteryInfo.getStatistics();
+            Parcel parcel = Parcel.obtain();
+            parcel.unmarshall(data, 0, data.length);
+            parcel.setDataPosition(0);
+            mStats = com.android.internal.os.BatteryStatsImpl.CREATOR
+                    .createFromParcel(parcel);
+            mStats.distributeWorkLocked(BatteryStats.STATS_SINCE_CHARGED);
+        } catch (RemoteException e) {
+            Log.e(TAG, "RemoteException:", e);
+        }
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
index 7b11ae1..c8bfa21 100644
--- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java
+++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
@@ -17,6 +17,7 @@
 package com.android.settings.fuelgauge;
 
 import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.preference.Preference;
 import android.view.View;
@@ -37,7 +38,7 @@
     public PowerGaugePreference(Context context, Drawable icon, BatterySipper info) {
         super(context);
         setLayoutResource(R.layout.app_percentage_item);
-        setIcon(icon);
+        setIcon(icon != null ? icon : new ColorDrawable(0));
         mInfo = info;
     }
 
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index 79cbac6..45e4516 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.fuelgauge;
 
+import static com.android.settings.Utils.prepareCustomPreferencesList;
+
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.ApplicationErrorReport;
@@ -34,9 +36,11 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Process;
+import android.os.UserHandle;
 import android.preference.PreferenceActivity;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.text.format.Formatter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -46,11 +50,11 @@
 import android.widget.TextView;
 
 import com.android.settings.DisplaySettings;
-import com.android.settings.LocationSettings;
 import com.android.settings.R;
 import com.android.settings.WirelessSettings;
 import com.android.settings.applications.InstalledAppDetails;
 import com.android.settings.bluetooth.BluetoothSettings;
+import com.android.settings.location.LocationSettings;
 import com.android.settings.wifi.WifiSettings;
 
 public class PowerUsageDetail extends Fragment implements Button.OnClickListener {
@@ -62,7 +66,8 @@
         WIFI,
         BLUETOOTH,
         SCREEN,
-        APP
+        APP,
+        USER
     }
 
     // Note: Must match the sequence of the DrainType
@@ -73,7 +78,8 @@
         R.string.battery_desc_wifi,
         R.string.battery_desc_bluetooth,
         R.string.battery_desc_display,
-        R.string.battery_desc_apps
+        R.string.battery_desc_apps,
+        R.string.battery_desc_users,
     };
 
     public static final int ACTION_DISPLAY_SETTINGS = 1;
@@ -102,6 +108,7 @@
     public static final String EXTRA_ICON_PACKAGE = "iconPackage"; // String
     public static final String EXTRA_NO_COVERAGE = "noCoverage";
     public static final String EXTRA_ICON_ID = "iconId"; // Int
+    public static final String EXTRA_SHOW_LOCATION_BUTTON = "showLocationButton";  // Boolean
 
     private PackageManager mPm;
     private DevicePolicyManager mDpm;
@@ -123,13 +130,14 @@
     private double mNoCoverage; // Percentage of time that there was no coverage
 
     private boolean mUsesGps;
+    private boolean mShowLocationButton;
 
     private static final String TAG = "PowerUsageDetail";
     private String[] mPackages;
 
     ApplicationInfo mApp;
     ComponentName mInstaller;
-    
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -138,8 +146,12 @@
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = mRootView = inflater.inflate(R.layout.power_usage_details, null);
+    public View onCreateView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        final View view = inflater.inflate(R.layout.power_usage_details, container, false);
+        prepareCustomPreferencesList(container, view, view, false);
+
+        mRootView = view;
         createDetails();
         return view;
     }
@@ -167,6 +179,7 @@
         mNoCoverage = args.getDouble(EXTRA_NO_COVERAGE, 0);
         String iconPackage = args.getString(EXTRA_ICON_PACKAGE);
         int iconId = args.getInt(EXTRA_ICON_ID, 0);
+        mShowLocationButton = args.getBoolean(EXTRA_SHOW_LOCATION_BUTTON);
         if (!TextUtils.isEmpty(iconPackage)) {
             try {
                 final PackageManager pm = getActivity().getPackageManager();
@@ -225,8 +238,8 @@
             mReportButton.setOnClickListener(this);
             
             // check if error reporting is enabled in secure settings
-            int enabled = Settings.Secure.getInt(getActivity().getContentResolver(),
-                    Settings.Secure.SEND_ACTION_APP_ERROR, 0);
+            int enabled = Settings.Global.getInt(getActivity().getContentResolver(),
+                    Settings.Global.SEND_ACTION_APP_ERROR, 0);
             if (enabled != 0) {
                 if (mPackages != null && mPackages.length > 0) {
                     try {
@@ -307,16 +320,20 @@
                 switch (mTypes[i]) {
                     case R.string.usage_type_data_recv:
                     case R.string.usage_type_data_send:
-                        value = Utils.formatBytes(getActivity(), mValues[i]);
+                    case R.string.usage_type_data_wifi_recv:
+                    case R.string.usage_type_data_wifi_send:
+                        final long bytes = (long) (mValues[i]);
+                        value = Formatter.formatFileSize(getActivity(), bytes);
                         break;
                     case R.string.usage_type_no_coverage:
-                        value = String.format("%d%%", (int) Math.floor(mValues[i]));
+                        final int percentage = (int) Math.floor(mValues[i]);
+                        value = getActivity().getString(R.string.percentage, percentage);
                         break;
                     case R.string.usage_type_gps:
                         mUsesGps = true;
                         // Fall through
                     default:
-                        value = Utils.formatElapsedTime(getActivity(), mValues[i]);
+                        value = Utils.formatElapsedTime(getActivity(), mValues[i], true);
                 }
                 ViewGroup item = (ViewGroup) inflater.inflate(R.layout.power_usage_detail_item_text,
                         null);
@@ -337,20 +354,21 @@
             pi = packages != null ? pm.getPackageInfo(packages[0], 0) : null;
         } catch (NameNotFoundException nnfe) { /* Nothing */ }
         ApplicationInfo ai = pi != null? pi.applicationInfo : null;
-        boolean isSystem = ai != null? (ai.flags & ApplicationInfo.FLAG_SYSTEM) != 0 : false;
 
         boolean removeHeader = true;
         switch (mDrainType) {
             case APP:
-                // If it is a Java application and it's not a system application
-                if (packages != null && !isSystem) {
+                // If it is a Java application and only one package is associated with the Uid
+                if (packages != null && packages.length == 1) {
                     addControl(R.string.battery_action_app_details,
                             R.string.battery_sugg_apps_info, ACTION_APP_DETAILS);
                     removeHeader = false;
                     // If the application has a settings screen, jump to  that
                     // TODO:
                 }
-                if (mUsesGps) {
+                // If power usage detail page is launched from location page, suppress "Location"
+                // button to prevent circular loops.
+                if (mUsesGps && mShowLocationButton) {
                     addControl(R.string.location_settings_title,
                             R.string.battery_sugg_apps_gps, ACTION_LOCATION_SETTINGS);
                     removeHeader = false;
@@ -453,6 +471,7 @@
                 Uri.fromParts("package", mPackages[0], null));
         intent.putExtra(Intent.EXTRA_PACKAGES, mPackages);
         intent.putExtra(Intent.EXTRA_UID, mUid);
+        intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.getUserId(mUid));
         getActivity().sendOrderedBroadcast(intent, null, mCheckKillProcessesReceiver, null,
                 Activity.RESULT_CANCELED, null, null);
     }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index fa2b02d..dc86b8d 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -16,54 +16,37 @@
 
 package com.android.settings.fuelgauge;
 
+import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.hardware.SensorManager;
-import android.net.Uri;
 import android.os.BatteryStats;
-import android.os.BatteryStats.Uid;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Parcel;
-import android.os.Process;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.SystemClock;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
-import android.telephony.SignalStrength;
 import android.text.TextUtils;
-import android.util.Log;
-import android.util.SparseArray;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import com.android.internal.app.IBatteryStats;
-import com.android.internal.os.BatteryStatsImpl;
 import com.android.internal.os.PowerProfile;
+import com.android.settings.HelpUtils;
 import com.android.settings.R;
-import com.android.settings.fuelgauge.PowerUsageDetail.DrainType;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Displays a list of apps and subsystems that consume power, ordered by how much power was
  * consumed since the last time it was unplugged.
  */
-public class PowerUsageSummary extends PreferenceFragment implements Runnable {
+public class PowerUsageSummary extends PreferenceFragment {
 
     private static final boolean DEBUG = false;
 
@@ -76,14 +59,6 @@
     private static final int MENU_STATS_REFRESH = Menu.FIRST + 1;
     private static final int MENU_HELP = Menu.FIRST + 2;
 
-    private static BatteryStatsImpl sStatsXfer;
-
-    IBatteryStats mBatteryInfo;
-    BatteryStatsImpl mStats;
-    private final List<BatterySipper> mUsageList = new ArrayList<BatterySipper>();
-    private final List<BatterySipper> mWifiSippers = new ArrayList<BatterySipper>();
-    private final List<BatterySipper> mBluetoothSippers = new ArrayList<BatterySipper>();
-
     private PreferenceGroup mAppListGroup;
     private Preference mBatteryStatusPref;
 
@@ -92,20 +67,7 @@
     private static final int MIN_POWER_THRESHOLD = 5;
     private static final int MAX_ITEMS_TO_LIST = 10;
 
-    private long mStatsPeriod = 0;
-    private double mMaxPower = 1;
-    private double mTotalPower;
-    private double mWifiPower;
-    private double mBluetoothPower;
-    private PowerProfile mPowerProfile;
-
-    // How much the apps together have left WIFI running.
-    private long mAppWifiRunning;
-
-    /** Queue for fetching name and icon for an application */
-    private ArrayList<BatterySipper> mRequestQueue = new ArrayList<BatterySipper>();
-    private Thread mRequestThread;
-    private boolean mAbort;
+    private BatteryStatsHelper mStatsHelper;
 
     private BroadcastReceiver mBatteryInfoReceiver = new BroadcastReceiver() {
 
@@ -119,31 +81,32 @@
                 String batterySummary = context.getResources().getString(
                         R.string.power_usage_level_and_status, batteryLevel, batteryStatus);
                 mBatteryStatusPref.setTitle(batterySummary);
+                mStatsHelper.clearStats();
+                refreshStats();
             }
         }
     };
 
     @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        mStatsHelper = new BatteryStatsHelper(activity, mHandler);
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-
-        if (icicle != null) {
-            mStats = sStatsXfer;
-        }
+        mStatsHelper.create(icicle);
 
         addPreferencesFromResource(R.xml.power_usage_summary);
-        mBatteryInfo = IBatteryStats.Stub.asInterface(
-                ServiceManager.getService("batteryinfo"));
         mAppListGroup = (PreferenceGroup) findPreference(KEY_APP_LIST);
         mBatteryStatusPref = mAppListGroup.findPreference(KEY_BATTERY_STATUS);
-        mPowerProfile = new PowerProfile(getActivity());
         setHasOptionsMenu(true);
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        mAbort = false;
         getActivity().registerReceiver(mBatteryInfoReceiver,
                 new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
         refreshStats();
@@ -151,10 +114,8 @@
 
     @Override
     public void onPause() {
-        synchronized (mRequestQueue) {
-            mAbort = true;
-        }
-        mHandler.removeMessages(MSG_UPDATE_NAME_ICON);
+        mStatsHelper.pause();
+        mHandler.removeMessages(BatteryStatsHelper.MSG_UPDATE_NAME_ICON);
         getActivity().unregisterReceiver(mBatteryInfoReceiver);
         super.onPause();
     }
@@ -162,16 +123,14 @@
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (getActivity().isChangingConfigurations()) {
-            sStatsXfer = mStats;
-        }
+        mStatsHelper.destroy();
     }
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         if (preference instanceof BatteryHistoryPreference) {
             Parcel hist = Parcel.obtain();
-            mStats.writeToParcelWithoutUids(hist, 0);
+            mStatsHelper.getStats().writeToParcelWithoutUids(hist, 0);
             byte[] histData = hist.marshall();
             Bundle args = new Bundle();
             args.putByteArray(BatteryHistoryDetail.EXTRA_STATS, histData);
@@ -185,127 +144,7 @@
         }
         PowerGaugePreference pgp = (PowerGaugePreference) preference;
         BatterySipper sipper = pgp.getInfo();
-        Bundle args = new Bundle();
-        args.putString(PowerUsageDetail.EXTRA_TITLE, sipper.name);
-        args.putInt(PowerUsageDetail.EXTRA_PERCENT, (int)
-                Math.ceil(sipper.getSortValue() * 100 / mTotalPower));
-        args.putInt(PowerUsageDetail.EXTRA_GAUGE, (int)
-                Math.ceil(sipper.getSortValue() * 100 / mMaxPower));
-        args.putLong(PowerUsageDetail.EXTRA_USAGE_DURATION, mStatsPeriod);
-        args.putString(PowerUsageDetail.EXTRA_ICON_PACKAGE, sipper.defaultPackageName);
-        args.putInt(PowerUsageDetail.EXTRA_ICON_ID, sipper.iconId);
-        args.putDouble(PowerUsageDetail.EXTRA_NO_COVERAGE, sipper.noCoveragePercent);
-        if (sipper.uidObj != null) {
-            args.putInt(PowerUsageDetail.EXTRA_UID, sipper.uidObj.getUid());
-        }
-        args.putSerializable(PowerUsageDetail.EXTRA_DRAIN_TYPE, sipper.drainType);
-
-        int[] types;
-        double[] values;
-        switch (sipper.drainType) {
-            case APP:
-            {
-                Uid uid = sipper.uidObj;
-                types = new int[] {
-                    R.string.usage_type_cpu,
-                    R.string.usage_type_cpu_foreground,
-                    R.string.usage_type_wake_lock,
-                    R.string.usage_type_gps,
-                    R.string.usage_type_wifi_running,
-                    R.string.usage_type_data_send,
-                    R.string.usage_type_data_recv,
-                    R.string.usage_type_audio,
-                    R.string.usage_type_video,
-                };
-                values = new double[] {
-                    sipper.cpuTime,
-                    sipper.cpuFgTime,
-                    sipper.wakeLockTime,
-                    sipper.gpsTime,
-                    sipper.wifiRunningTime,
-                    sipper.tcpBytesSent,
-                    sipper.tcpBytesReceived,
-                    0,
-                    0
-                };
-
-                Writer result = new StringWriter();
-                PrintWriter printWriter = new PrintWriter(result);
-                mStats.dumpLocked(printWriter, "", mStatsType, uid.getUid());
-                args.putString(PowerUsageDetail.EXTRA_REPORT_DETAILS, result.toString());
-                
-                result = new StringWriter();
-                printWriter = new PrintWriter(result);
-                mStats.dumpCheckinLocked(printWriter, mStatsType, uid.getUid());
-                args.putString(PowerUsageDetail.EXTRA_REPORT_CHECKIN_DETAILS, result.toString());
-            }
-            break;
-            case CELL:
-            {
-                types = new int[] {
-                    R.string.usage_type_on_time,
-                    R.string.usage_type_no_coverage
-                };
-                values = new double[] {
-                    sipper.usageTime,
-                    sipper.noCoveragePercent
-                };
-            }
-            break;
-            case WIFI:
-            {
-                types = new int[] {
-                    R.string.usage_type_wifi_running,
-                    R.string.usage_type_cpu,
-                    R.string.usage_type_cpu_foreground,
-                    R.string.usage_type_wake_lock,
-                    R.string.usage_type_data_send,
-                    R.string.usage_type_data_recv,
-                };
-                values = new double[] {
-                    sipper.usageTime,
-                    sipper.cpuTime,
-                    sipper.cpuFgTime,
-                    sipper.wakeLockTime,
-                    sipper.tcpBytesSent,
-                    sipper.tcpBytesReceived,
-                };
-            } break;
-            case BLUETOOTH:
-            {
-                types = new int[] {
-                    R.string.usage_type_on_time,
-                    R.string.usage_type_cpu,
-                    R.string.usage_type_cpu_foreground,
-                    R.string.usage_type_wake_lock,
-                    R.string.usage_type_data_send,
-                    R.string.usage_type_data_recv,
-                };
-                values = new double[] {
-                    sipper.usageTime,
-                    sipper.cpuTime,
-                    sipper.cpuFgTime,
-                    sipper.wakeLockTime,
-                    sipper.tcpBytesSent,
-                    sipper.tcpBytesReceived,
-                };
-            } break;
-            default:
-            {
-                types = new int[] {
-                    R.string.usage_type_on_time
-                };
-                values = new double[] {
-                    sipper.usageTime
-                };
-            }
-        }
-        args.putIntArray(PowerUsageDetail.EXTRA_DETAIL_TYPES, types);
-        args.putDoubleArray(PowerUsageDetail.EXTRA_DETAIL_VALUES, values);
-        PreferenceActivity pa = (PreferenceActivity)getActivity();
-        pa.startPreferencePanel(PowerUsageDetail.class.getName(), args,
-                R.string.details_title, null, null, 0);
-
+        mStatsHelper.startBatteryDetailPage((PreferenceActivity) getActivity(), sipper, true);
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
@@ -325,11 +164,7 @@
         String helpUrl;
         if (!TextUtils.isEmpty(helpUrl = getResources().getString(R.string.help_url_battery))) {
             final MenuItem help = menu.add(0, MENU_HELP, 0, R.string.help_label);
-            Intent helpIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(helpUrl));
-            helpIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
-            help.setIntent(helpIntent);
-            help.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+            HelpUtils.prepareHelpMenuItem(getActivity(), help, helpUrl);
         }
     }
 
@@ -345,7 +180,7 @@
                 refreshStats();
                 return true;
             case MENU_STATS_REFRESH:
-                mStats = null;
+                mStatsHelper.clearStats();
                 refreshStats();
                 return true;
             default:
@@ -360,41 +195,32 @@
     }
 
     private void refreshStats() {
-        if (mStats == null) {
-            load();
-        }
-        mMaxPower = 0;
-        mTotalPower = 0;
-        mWifiPower = 0;
-        mBluetoothPower = 0;
-        mAppWifiRunning = 0;
-
         mAppListGroup.removeAll();
-        mUsageList.clear();
-        mWifiSippers.clear();
-        mBluetoothSippers.clear();
         mAppListGroup.setOrderingAsAdded(false);
 
         mBatteryStatusPref.setOrder(-2);
         mAppListGroup.addPreference(mBatteryStatusPref);
-        BatteryHistoryPreference hist = new BatteryHistoryPreference(getActivity(), mStats);
+        BatteryHistoryPreference hist = new BatteryHistoryPreference(
+                getActivity(), mStatsHelper.getStats());
         hist.setOrder(-1);
         mAppListGroup.addPreference(hist);
-        
-        if (mPowerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL) < 10) {
+
+        if (mStatsHelper.getPowerProfile().getAveragePower(
+                PowerProfile.POWER_SCREEN_FULL) < 10) {
             addNotAvailableMessage();
             return;
         }
-        processAppUsage();
-        processMiscUsage();
-
-        Collections.sort(mUsageList);
-        for (BatterySipper sipper : mUsageList) {
+        mStatsHelper.refreshStats(false);
+        List<BatterySipper> usageList = mStatsHelper.getUsageList();
+        for (BatterySipper sipper : usageList) {
             if (sipper.getSortValue() < MIN_POWER_THRESHOLD) continue;
-            final double percentOfTotal =  ((sipper.getSortValue() / mTotalPower) * 100);
+            final double percentOfTotal =
+                    ((sipper.getSortValue() / mStatsHelper.getTotalPower()) * 100);
             if (percentOfTotal < 1) continue;
-            PowerGaugePreference pref = new PowerGaugePreference(getActivity(), sipper.getIcon(), sipper);
-            final double percentOfMax = (sipper.getSortValue() * 100) / mMaxPower;
+            PowerGaugePreference pref =
+                    new PowerGaugePreference(getActivity(), sipper.getIcon(), sipper);
+            final double percentOfMax =
+                    (sipper.getSortValue() * 100) / mStatsHelper.getMaxPower();
             sipper.percent = percentOfTotal;
             pref.setTitle(sipper.name);
             pref.setOrder(Integer.MAX_VALUE - (int) sipper.getSortValue()); // Invert the order
@@ -405,406 +231,16 @@
             mAppListGroup.addPreference(pref);
             if (mAppListGroup.getPreferenceCount() > (MAX_ITEMS_TO_LIST+1)) break;
         }
-        synchronized (mRequestQueue) {
-            if (!mRequestQueue.isEmpty()) {
-                if (mRequestThread == null) {
-                    mRequestThread = new Thread(this, "BatteryUsage Icon Loader");
-                    mRequestThread.setPriority(Thread.MIN_PRIORITY);
-                    mRequestThread.start();
-                }
-                mRequestQueue.notify();
-            }
-        }
     }
 
-    private void processAppUsage() {
-        SensorManager sensorManager = (SensorManager)getActivity().getSystemService(
-                Context.SENSOR_SERVICE);
-        final int which = mStatsType;
-        final int speedSteps = mPowerProfile.getNumSpeedSteps();
-        final double[] powerCpuNormal = new double[speedSteps];
-        final long[] cpuSpeedStepTimes = new long[speedSteps];
-        for (int p = 0; p < speedSteps; p++) {
-            powerCpuNormal[p] = mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_ACTIVE, p);
-        }
-        final double averageCostPerByte = getAverageDataCost();
-        long uSecTime = mStats.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000, which);
-        long appWakelockTime = 0;
-        BatterySipper osApp = null;
-        mStatsPeriod = uSecTime;
-        SparseArray<? extends Uid> uidStats = mStats.getUidStats();
-        final int NU = uidStats.size();
-        for (int iu = 0; iu < NU; iu++) {
-            Uid u = uidStats.valueAt(iu);
-            double power = 0;
-            double highestDrain = 0;
-            String packageWithHighestDrain = null;
-            //mUsageList.add(new AppUsage(u.getUid(), new double[] {power}));
-            Map<String, ? extends BatteryStats.Uid.Proc> processStats = u.getProcessStats();
-            long cpuTime = 0;
-            long cpuFgTime = 0;
-            long wakelockTime = 0;
-            long gpsTime = 0;
-            if (processStats.size() > 0) {
-                // Process CPU time
-                for (Map.Entry<String, ? extends BatteryStats.Uid.Proc> ent
-                        : processStats.entrySet()) {
-                    if (DEBUG) Log.i(TAG, "Process name = " + ent.getKey());
-                    Uid.Proc ps = ent.getValue();
-                    final long userTime = ps.getUserTime(which);
-                    final long systemTime = ps.getSystemTime(which);
-                    final long foregroundTime = ps.getForegroundTime(which);
-                    cpuFgTime += foregroundTime * 10; // convert to millis
-                    final long tmpCpuTime = (userTime + systemTime) * 10; // convert to millis
-                    int totalTimeAtSpeeds = 0;
-                    // Get the total first
-                    for (int step = 0; step < speedSteps; step++) {
-                        cpuSpeedStepTimes[step] = ps.getTimeAtCpuSpeedStep(step, which);
-                        totalTimeAtSpeeds += cpuSpeedStepTimes[step];
-                    }
-                    if (totalTimeAtSpeeds == 0) totalTimeAtSpeeds = 1;
-                    // Then compute the ratio of time spent at each speed
-                    double processPower = 0;
-                    for (int step = 0; step < speedSteps; step++) {
-                        double ratio = (double) cpuSpeedStepTimes[step] / totalTimeAtSpeeds;
-                        processPower += ratio * tmpCpuTime * powerCpuNormal[step];
-                    }
-                    cpuTime += tmpCpuTime;
-                    power += processPower;
-                    if (packageWithHighestDrain == null
-                            || packageWithHighestDrain.startsWith("*")) {
-                        highestDrain = processPower;
-                        packageWithHighestDrain = ent.getKey();
-                    } else if (highestDrain < processPower
-                            && !ent.getKey().startsWith("*")) {
-                        highestDrain = processPower;
-                        packageWithHighestDrain = ent.getKey();
-                    }
-                }
-                if (DEBUG) Log.i(TAG, "Max drain of " + highestDrain 
-                        + " by " + packageWithHighestDrain);
-            }
-            if (cpuFgTime > cpuTime) {
-                if (DEBUG && cpuFgTime > cpuTime + 10000) {
-                    Log.i(TAG, "WARNING! Cputime is more than 10 seconds behind Foreground time");
-                }
-                cpuTime = cpuFgTime; // Statistics may not have been gathered yet.
-            }
-            power /= 1000;
-
-            // Process wake lock usage
-            Map<String, ? extends BatteryStats.Uid.Wakelock> wakelockStats = u.getWakelockStats();
-            for (Map.Entry<String, ? extends BatteryStats.Uid.Wakelock> wakelockEntry
-                    : wakelockStats.entrySet()) {
-                Uid.Wakelock wakelock = wakelockEntry.getValue();
-                // Only care about partial wake locks since full wake locks
-                // are canceled when the user turns the screen off.
-                BatteryStats.Timer timer = wakelock.getWakeTime(BatteryStats.WAKE_TYPE_PARTIAL);
-                if (timer != null) {
-                    wakelockTime += timer.getTotalTimeLocked(uSecTime, which);
-                }
-            }
-            wakelockTime /= 1000; // convert to millis
-            appWakelockTime += wakelockTime;
-
-            // Add cost of holding a wake lock
-            power += (wakelockTime
-                    * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000;
-            
-            // Add cost of data traffic
-            long tcpBytesReceived = u.getTcpBytesReceived(mStatsType);
-            long tcpBytesSent = u.getTcpBytesSent(mStatsType);
-            power += (tcpBytesReceived+tcpBytesSent) * averageCostPerByte;
-
-            // Add cost of keeping WIFI running.
-            long wifiRunningTimeMs = u.getWifiRunningTime(uSecTime, which) / 1000;
-            mAppWifiRunning += wifiRunningTimeMs;
-            power += (wifiRunningTimeMs
-                    * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)) / 1000;
-
-            // Process Sensor usage
-            Map<Integer, ? extends BatteryStats.Uid.Sensor> sensorStats = u.getSensorStats();
-            for (Map.Entry<Integer, ? extends BatteryStats.Uid.Sensor> sensorEntry
-                    : sensorStats.entrySet()) {
-                Uid.Sensor sensor = sensorEntry.getValue();
-                int sensorType = sensor.getHandle();
-                BatteryStats.Timer timer = sensor.getSensorTime();
-                long sensorTime = timer.getTotalTimeLocked(uSecTime, which) / 1000;
-                double multiplier = 0;
-                switch (sensorType) {
-                    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();
-                            if (DEBUG) {
-                                Log.i(TAG, "Got sensor " + sensorData.getName() + " with power = "
-                                        + multiplier);
-                            }
-                        }
-                }
-                power += (multiplier * sensorTime) / 1000;
-            }
-
-            if (DEBUG) Log.i(TAG, "UID " + u.getUid() + ": power=" + power);
-
-            // Add the app to the list if it is consuming power
-            if (power != 0 || u.getUid() == 0) {
-                BatterySipper app = new BatterySipper(getActivity(), mRequestQueue, mHandler,
-                        packageWithHighestDrain, DrainType.APP, 0, u,
-                        new double[] {power});
-                app.cpuTime = cpuTime;
-                app.gpsTime = gpsTime;
-                app.wifiRunningTime = wifiRunningTimeMs;
-                app.cpuFgTime = cpuFgTime;
-                app.wakeLockTime = wakelockTime;
-                app.tcpBytesReceived = tcpBytesReceived;
-                app.tcpBytesSent = tcpBytesSent;
-                if (u.getUid() == Process.WIFI_UID) {
-                    mWifiSippers.add(app);
-                } else if (u.getUid() == Process.BLUETOOTH_GID) {
-                    mBluetoothSippers.add(app);
-                } else {
-                    mUsageList.add(app);
-                }
-                if (u.getUid() == 0) {
-                    osApp = app;
-                }
-            }
-            if (u.getUid() == Process.WIFI_UID) {
-                mWifiPower += power;
-            } else if (u.getUid() == Process.BLUETOOTH_GID) {
-                mBluetoothPower += power;
-            } else {
-                if (power > mMaxPower) mMaxPower = power;
-                mTotalPower += power;
-            }
-            if (DEBUG) Log.i(TAG, "Added power = " + power);
-        }
-
-        // The device has probably been awake for longer than the screen on
-        // time and application wake lock time would account for.  Assign
-        // this remainder to the OS, if possible.
-        if (osApp != null) {
-            long wakeTimeMillis = mStats.computeBatteryUptime(
-                    SystemClock.uptimeMillis() * 1000, which) / 1000;
-            wakeTimeMillis -= appWakelockTime + (mStats.getScreenOnTime(
-                    SystemClock.elapsedRealtime(), which) / 1000);
-            if (wakeTimeMillis > 0) {
-                double power = (wakeTimeMillis
-                        * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000;
-                if (DEBUG) Log.i(TAG, "OS wakeLockTime " + wakeTimeMillis + " power " + power);
-                osApp.wakeLockTime += wakeTimeMillis;
-                osApp.value += power;
-                osApp.values[0] += power;
-                if (osApp.value > mMaxPower) mMaxPower = osApp.value;
-                mTotalPower += power;
-            }
-        }
-    }
-
-    private void addPhoneUsage(long uSecNow) {
-        long phoneOnTimeMs = mStats.getPhoneOnTime(uSecNow, mStatsType) / 1000;
-        double phoneOnPower = mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE)
-                * phoneOnTimeMs / 1000;
-        addEntry(getActivity().getString(R.string.power_phone), DrainType.PHONE, phoneOnTimeMs,
-                R.drawable.ic_settings_voice_calls, phoneOnPower);
-    }
-
-    private void addScreenUsage(long uSecNow) {
-        double power = 0;
-        long screenOnTimeMs = mStats.getScreenOnTime(uSecNow, mStatsType) / 1000;
-        power += screenOnTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_SCREEN_ON);
-        final double screenFullPower =
-                mPowerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL);
-        for (int i = 0; i < BatteryStats.NUM_SCREEN_BRIGHTNESS_BINS; i++) {
-            double screenBinPower = screenFullPower * (i + 0.5f)
-                    / BatteryStats.NUM_SCREEN_BRIGHTNESS_BINS;
-            long brightnessTime = mStats.getScreenBrightnessTime(i, uSecNow, mStatsType) / 1000;
-            power += screenBinPower * brightnessTime;
-            if (DEBUG) {
-                Log.i(TAG, "Screen bin power = " + (int) screenBinPower + ", time = "
-                        + brightnessTime);
-            }
-        }
-        power /= 1000; // To seconds
-        addEntry(getActivity().getString(R.string.power_screen), DrainType.SCREEN, screenOnTimeMs,
-                R.drawable.ic_settings_display, power);
-    }
-
-    private void addRadioUsage(long uSecNow) {
-        double power = 0;
-        final int BINS = SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
-        long signalTimeMs = 0;
-        for (int i = 0; i < BINS; i++) {
-            long strengthTimeMs = mStats.getPhoneSignalStrengthTime(i, uSecNow, mStatsType) / 1000;
-            power += strengthTimeMs / 1000
-                    * mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ON, i);
-            signalTimeMs += strengthTimeMs;
-        }
-        long scanningTimeMs = mStats.getPhoneSignalScanningTime(uSecNow, mStatsType) / 1000;
-        power += scanningTimeMs / 1000 * mPowerProfile.getAveragePower(
-                PowerProfile.POWER_RADIO_SCANNING);
-        BatterySipper bs =
-                addEntry(getActivity().getString(R.string.power_cell), DrainType.CELL,
-                        signalTimeMs, R.drawable.ic_settings_cell_standby, power);
-        if (signalTimeMs != 0) {
-            bs.noCoveragePercent = mStats.getPhoneSignalStrengthTime(0, uSecNow, mStatsType)
-                    / 1000 * 100.0 / signalTimeMs;
-        }
-    }
-
-    private void aggregateSippers(BatterySipper bs, List<BatterySipper> from, String tag) {
-        for (int i=0; i<from.size(); i++) {
-            BatterySipper wbs = from.get(i);
-            if (DEBUG) Log.i(TAG, tag + " adding sipper " + wbs + ": cpu=" + wbs.cpuTime);
-            bs.cpuTime += wbs.cpuTime;
-            bs.gpsTime += wbs.gpsTime;
-            bs.wifiRunningTime += wbs.wifiRunningTime;
-            bs.cpuFgTime += wbs.cpuFgTime;
-            bs.wakeLockTime += wbs.wakeLockTime;
-            bs.tcpBytesReceived += wbs.tcpBytesReceived;
-            bs.tcpBytesSent += wbs.tcpBytesSent;
-        }
-    }
-
-    private void addWiFiUsage(long uSecNow) {
-        long onTimeMs = mStats.getWifiOnTime(uSecNow, mStatsType) / 1000;
-        long runningTimeMs = mStats.getGlobalWifiRunningTime(uSecNow, mStatsType) / 1000;
-        if (DEBUG) Log.i(TAG, "WIFI runningTime=" + runningTimeMs
-                + " app runningTime=" + mAppWifiRunning);
-        runningTimeMs -= mAppWifiRunning;
-        if (runningTimeMs < 0) runningTimeMs = 0;
-        double wifiPower = (onTimeMs * 0 /* TODO */
-                * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)
-            + runningTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)) / 1000;
-        if (DEBUG) Log.i(TAG, "WIFI power=" + wifiPower + " from procs=" + mWifiPower);
-        BatterySipper bs = addEntry(getActivity().getString(R.string.power_wifi), DrainType.WIFI,
-                runningTimeMs, R.drawable.ic_settings_wifi, wifiPower + mWifiPower);
-        aggregateSippers(bs, mWifiSippers, "WIFI");
-    }
-
-    private void addIdleUsage(long uSecNow) {
-        long idleTimeMs = (uSecNow - mStats.getScreenOnTime(uSecNow, mStatsType)) / 1000;
-        double idlePower = (idleTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_IDLE))
-                / 1000;
-        addEntry(getActivity().getString(R.string.power_idle), DrainType.IDLE, idleTimeMs,
-                R.drawable.ic_settings_phone_idle, idlePower);
-    }
-
-    private void addBluetoothUsage(long uSecNow) {
-        long btOnTimeMs = mStats.getBluetoothOnTime(uSecNow, mStatsType) / 1000;
-        double btPower = btOnTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_BLUETOOTH_ON)
-                / 1000;
-        int btPingCount = mStats.getBluetoothPingCount();
-        btPower += (btPingCount
-                * mPowerProfile.getAveragePower(PowerProfile.POWER_BLUETOOTH_AT_CMD)) / 1000;
-        BatterySipper bs = addEntry(getActivity().getString(R.string.power_bluetooth),
-                DrainType.BLUETOOTH, btOnTimeMs, R.drawable.ic_settings_bluetooth,
-                btPower + mBluetoothPower);
-        aggregateSippers(bs, mBluetoothSippers, "Bluetooth");
-    }
-
-    private double getAverageDataCost() {
-        final long WIFI_BPS = 1000000; // TODO: Extract average bit rates from system 
-        final long MOBILE_BPS = 200000; // TODO: Extract average bit rates from system
-        final double WIFI_POWER = mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ACTIVE)
-                / 3600;
-        final double MOBILE_POWER = mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE)
-                / 3600;
-        final long mobileData = mStats.getMobileTcpBytesReceived(mStatsType) +
-                mStats.getMobileTcpBytesSent(mStatsType);
-        final long wifiData = mStats.getTotalTcpBytesReceived(mStatsType) +
-                mStats.getTotalTcpBytesSent(mStatsType) - mobileData;
-        final long radioDataUptimeMs = mStats.getRadioDataUptime() / 1000;
-        final long mobileBps = radioDataUptimeMs != 0
-                ? mobileData * 8 * 1000 / radioDataUptimeMs
-                : MOBILE_BPS;
-
-        double mobileCostPerByte = MOBILE_POWER / (mobileBps / 8);
-        double wifiCostPerByte = WIFI_POWER / (WIFI_BPS / 8);
-        if (wifiData + mobileData != 0) {
-            return (mobileCostPerByte * mobileData + wifiCostPerByte * wifiData)
-                    / (mobileData + wifiData);
-        } else {
-            return 0;
-        }
-    }
-
-    private void processMiscUsage() {
-        final int which = mStatsType;
-        long uSecTime = SystemClock.elapsedRealtime() * 1000;
-        final long uSecNow = mStats.computeBatteryRealtime(uSecTime, which);
-        final long timeSinceUnplugged = uSecNow;
-        if (DEBUG) {
-            Log.i(TAG, "Uptime since last unplugged = " + (timeSinceUnplugged / 1000));
-        }
-
-        addPhoneUsage(uSecNow);
-        addScreenUsage(uSecNow);
-        addWiFiUsage(uSecNow);
-        addBluetoothUsage(uSecNow);
-        addIdleUsage(uSecNow); // Not including cellular idle power
-        // Don't compute radio usage if it's a wifi-only device
-        if (!com.android.settings.Utils.isWifiOnly(getActivity())) {
-            addRadioUsage(uSecNow);
-        }
-    }
-
-    private BatterySipper addEntry(String label, DrainType drainType, long time, int iconId,
-            double power) {
-        if (power > mMaxPower) mMaxPower = power;
-        mTotalPower += power;
-        BatterySipper bs = new BatterySipper(getActivity(), mRequestQueue, mHandler,
-                label, drainType, iconId, null, new double[] {power});
-        bs.usageTime = time;
-        bs.iconId = iconId;
-        mUsageList.add(bs);
-        return bs;
-    }
-
-    private void load() {
-        try {
-            byte[] data = mBatteryInfo.getStatistics();
-            Parcel parcel = Parcel.obtain();
-            parcel.unmarshall(data, 0, data.length);
-            parcel.setDataPosition(0);
-            mStats = com.android.internal.os.BatteryStatsImpl.CREATOR
-                    .createFromParcel(parcel);
-            mStats.distributeWorkLocked(BatteryStats.STATS_SINCE_CHARGED);
-        } catch (RemoteException e) {
-            Log.e(TAG, "RemoteException:", e);
-        }
-    }
-
-    public void run() {
-        while (true) {
-            BatterySipper bs;
-            synchronized (mRequestQueue) {
-                if (mRequestQueue.isEmpty() || mAbort) {
-                    mRequestThread = null;
-                    return;
-                }
-                bs = mRequestQueue.remove(0);
-            }
-            bs.getNameIcon();
-        }
-    }
-
-    static final int MSG_UPDATE_NAME_ICON = 1;
-
     Handler mHandler = new Handler() {
 
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
-                case MSG_UPDATE_NAME_ICON:
+                case BatteryStatsHelper.MSG_UPDATE_NAME_ICON:
                     BatterySipper bs = (BatterySipper) msg.obj;
-                    PowerGaugePreference pgp = 
+                    PowerGaugePreference pgp =
                             (PowerGaugePreference) findPreference(
                                     Integer.toString(bs.uidObj.getUid()));
                     if (pgp != null) {
@@ -812,6 +248,12 @@
                         pgp.setTitle(bs.name);
                     }
                     break;
+                case BatteryStatsHelper.MSG_REPORT_FULLY_DRAWN:
+                    Activity activity = getActivity();
+                    if (activity != null) {
+                        activity.reportFullyDrawn();
+                    }
+                    break;
             }
             super.handleMessage(msg);
         }
diff --git a/src/com/android/settings/fuelgauge/Utils.java b/src/com/android/settings/fuelgauge/Utils.java
index 2ffc9de..1ff358e 100644
--- a/src/com/android/settings/fuelgauge/Utils.java
+++ b/src/com/android/settings/fuelgauge/Utils.java
@@ -35,9 +35,13 @@
      * @param millis the elapsed time in milli seconds
      * @return the formatted elapsed time
      */
-    public static String formatElapsedTime(Context context, double millis) {
+    public static String formatElapsedTime(Context context, double millis, boolean inclSeconds) {
         StringBuilder sb = new StringBuilder();
         int seconds = (int) Math.floor(millis / 1000);
+        if (!inclSeconds) {
+            // Round up.
+            seconds += 30;
+        }
 
         int days = 0, hours = 0, minutes = 0;
         if (seconds > SECONDS_PER_DAY) {
@@ -52,33 +56,29 @@
             minutes = seconds / SECONDS_PER_MINUTE;
             seconds -= minutes * SECONDS_PER_MINUTE;
         }
-        if (days > 0) {
-            sb.append(context.getString(R.string.battery_history_days,
-                    days, hours, minutes, seconds));
-        } else if (hours > 0) {
-            sb.append(context.getString(R.string.battery_history_hours, hours, minutes, seconds));
-        } else if (minutes > 0) {
-            sb.append(context.getString(R.string.battery_history_minutes, minutes, seconds));
+        if (inclSeconds) {
+            if (days > 0) {
+                sb.append(context.getString(R.string.battery_history_days,
+                        days, hours, minutes, seconds));
+            } else if (hours > 0) {
+                sb.append(context.getString(R.string.battery_history_hours,
+                        hours, minutes, seconds));
+            } else if (minutes > 0) {
+                sb.append(context.getString(R.string.battery_history_minutes, minutes, seconds));
+            } else {
+                sb.append(context.getString(R.string.battery_history_seconds, seconds));
+            }
         } else {
-            sb.append(context.getString(R.string.battery_history_seconds, seconds));
+            if (days > 0) {
+                sb.append(context.getString(R.string.battery_history_days_no_seconds,
+                        days, hours, minutes));
+            } else if (hours > 0) {
+                sb.append(context.getString(R.string.battery_history_hours_no_seconds,
+                        hours, minutes));
+            } else {
+                sb.append(context.getString(R.string.battery_history_minutes_no_seconds, minutes));
+            }
         }
         return sb.toString();
     }
-
-    /**
-     * Formats data size in KB, MB, from the given bytes.
-     * @param context the application context
-     * @param bytes data size in bytes
-     * @return the formatted size such as 4.52 MB or 245 KB or 332 bytes
-     */
-    public static String formatBytes(Context context, double bytes) {
-        // TODO: I18N
-        if (bytes > 1000 * 1000) {
-            return String.format("%.2f MB", ((int) (bytes / 1000)) / 1000f);
-        } else if (bytes > 1024) {
-            return String.format("%.2f KB", ((int) (bytes / 10)) / 100f);
-        } else {
-            return String.format("%d bytes", (int) bytes);
-        }
-    }
 }
diff --git a/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java b/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java
index 28b8616..f440bc8 100644
--- a/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java
+++ b/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java
@@ -18,6 +18,7 @@
 
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
 
 import android.content.Context;
 import android.content.Intent;
@@ -29,7 +30,6 @@
 import android.widget.TextView;
 
 public class CheckBoxAndSettingsPreference extends CheckBoxPreference {
-    private static final float DISABLED_ALPHA = 0.4f;
 
     private SettingsPreferenceFragment mFragment;
     private TextView mTitleText;
@@ -103,7 +103,7 @@
                 mSettingsButton.setClickable(checked);
                 mSettingsButton.setFocusable(checked);
                 if (!checked) {
-                    mSettingsButton.setAlpha(DISABLED_ALPHA);
+                    mSettingsButton.setAlpha(Utils.DISABLED_ALPHA);
                 }
             }
         }
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index c2ff0d9..a2700cf 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -20,10 +20,12 @@
 import com.android.settings.Settings.KeyboardLayoutPickerActivity;
 import com.android.settings.Settings.SpellCheckersSettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.UserDictionarySettings;
 import com.android.settings.Utils;
 import com.android.settings.VoiceInputOutputSettings;
 
 import android.app.Activity;
+import android.app.Fragment;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -38,6 +40,8 @@
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
@@ -46,6 +50,7 @@
 import android.view.InputDevice;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.BaseAdapter;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -83,12 +88,23 @@
             new ArrayList<PreferenceScreen>();
     private InputManager mIm;
     private InputMethodManager mImm;
-    private List<InputMethodInfo> mImis;
     private boolean mIsOnlyImeSettings;
     private Handler mHandler;
-    @SuppressWarnings("unused")
     private SettingsObserver mSettingsObserver;
     private Intent mIntentWaitingForResult;
+    private InputMethodSettingValuesWrapper mInputMethodSettingValues;
+
+    private final OnPreferenceChangeListener mOnImePreferenceChangedListener =
+            new OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference arg0, Object arg1) {
+                    InputMethodSettingValuesWrapper.getInstance(
+                            arg0.getContext()).refreshAllInputMethodAndSubtypes();
+                    ((BaseAdapter)getPreferenceScreen().getRootAdapter()).notifyDataSetChanged();
+                    updateInputMethodPreferenceViews();
+                    return true;
+                }
+            };
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -140,7 +156,7 @@
 
         // Build IME preference category.
         mImm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        mImis = mImm.getInputMethodList();
+        mInputMethodSettingValues = InputMethodSettingValuesWrapper.getInstance(getActivity());
 
         mKeyboardSettingsCategory.removeAll();
         if (!mIsOnlyImeSettings) {
@@ -150,18 +166,22 @@
             mKeyboardSettingsCategory.addPreference(currentIme);
         }
 
-        mInputMethodPreferenceList.clear();
-        final int N = (mImis == null ? 0 : mImis.size());
-        for (int i = 0; i < N; ++i) {
-            final InputMethodInfo imi = mImis.get(i);
-            final InputMethodPreference pref = getInputMethodPreference(imi, N);
-            mInputMethodPreferenceList.add(pref);
-        }
-
-        if (!mInputMethodPreferenceList.isEmpty()) {
-            Collections.sort(mInputMethodPreferenceList);
+        synchronized (mInputMethodPreferenceList) {
+            mInputMethodPreferenceList.clear();
+            final List<InputMethodInfo> imis = mInputMethodSettingValues.getInputMethodList();
+            final int N = (imis == null ? 0 : imis.size());
             for (int i = 0; i < N; ++i) {
-                mKeyboardSettingsCategory.addPreference(mInputMethodPreferenceList.get(i));
+                final InputMethodInfo imi = imis.get(i);
+                final InputMethodPreference pref = getInputMethodPreference(imi);
+                pref.setOnImePreferenceChangeListener(mOnImePreferenceChangedListener);
+                mInputMethodPreferenceList.add(pref);
+            }
+
+            if (!mInputMethodPreferenceList.isEmpty()) {
+                Collections.sort(mInputMethodPreferenceList);
+                for (int i = 0; i < N; ++i) {
+                    mKeyboardSettingsCategory.addPreference(mInputMethodPreferenceList.get(i));
+                }
             }
         }
 
@@ -193,31 +213,41 @@
 
     private void updateUserDictionaryPreference(Preference userDictionaryPreference) {
         final Activity activity = getActivity();
-        final TreeSet<String> localeList = UserDictionaryList.getUserDictionaryLocalesSet(activity);
-        if (null == localeList) {
+        final TreeSet<String> localeSet = UserDictionaryList.getUserDictionaryLocalesSet(activity);
+        if (null == localeSet) {
             // The locale list is null if and only if the user dictionary service is
             // not present or disabled. In this case we need to remove the preference.
             getPreferenceScreen().removePreference(userDictionaryPreference);
-        } else if (localeList.size() <= 1) {
-            final Intent intent =
-                    new Intent(UserDictionaryList.USER_DICTIONARY_SETTINGS_INTENT_ACTION);
-            userDictionaryPreference.setTitle(R.string.user_dict_single_settings_title);
-            userDictionaryPreference.setIntent(intent);
-            userDictionaryPreference.setFragment(
-                    com.android.settings.UserDictionarySettings.class.getName());
-            // If the size of localeList is 0, we don't set the locale parameter in the
-            // extras. This will be interpreted by the UserDictionarySettings class as
-            // meaning "the current locale".
-            // Note that with the current code for UserDictionaryList#getUserDictionaryLocalesSet()
-            // the locale list always has at least one element, since it always includes the current
-            // locale explicitly. @see UserDictionaryList.getUserDictionaryLocalesSet().
-            if (localeList.size() == 1) {
-                final String locale = (String)localeList.toArray()[0];
-                userDictionaryPreference.getExtras().putString("locale", locale);
-            }
         } else {
-            userDictionaryPreference.setTitle(R.string.user_dict_multiple_settings_title);
-            userDictionaryPreference.setFragment(UserDictionaryList.class.getName());
+            userDictionaryPreference.setOnPreferenceClickListener(
+                    new OnPreferenceClickListener() {
+                        @Override
+                        public boolean onPreferenceClick(Preference arg0) {
+                            // Redirect to UserDictionarySettings if the user needs only one
+                            // language.
+                            final Bundle extras = new Bundle();
+                            final Class<? extends Fragment> targetFragment;
+                            if (localeSet.size() <= 1) {
+                                if (!localeSet.isEmpty()) {
+                                    // If the size of localeList is 0, we don't set the locale
+                                    // parameter in the extras. This will be interpreted by the
+                                    // UserDictionarySettings class as meaning
+                                    // "the current locale". Note that with the current code for
+                                    // UserDictionaryList#getUserDictionaryLocalesSet()
+                                    // the locale list always has at least one element, since it
+                                    // always includes the current locale explicitly.
+                                    // @see UserDictionaryList.getUserDictionaryLocalesSet().
+                                    extras.putString("locale", localeSet.first());
+                                }
+                                targetFragment = UserDictionarySettings.class;
+                            } else {
+                                targetFragment = UserDictionaryList.class;
+                            }
+                            startFragment(InputMethodAndLanguageSettings.this,
+                                    targetFragment.getCanonicalName(), -1, extras);
+                            return true;
+                        }
+                    });
         }
     }
 
@@ -238,7 +268,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 {
@@ -269,10 +308,14 @@
 
         updateInputDevices();
 
-        // IME
+        // Refresh internal states in mInputMethodSettingValues to keep the latest
+        // "InputMethodInfo"s and "InputMethodSubtype"s
+        mInputMethodSettingValues.refreshAllInputMethodAndSubtypes();
+        // TODO: Consolidate the logic to InputMethodSettingsWrapper
         InputMethodAndSubtypeUtil.loadInputMethodSubtypeList(
-                this, getContentResolver(), mImis, null);
-        updateActiveInputMethodsSummary();
+                this, getContentResolver(),
+                mInputMethodSettingValues.getInputMethodList(), null);
+        updateInputMethodPreferenceViews();
     }
 
     @Override
@@ -285,8 +328,10 @@
         if (SHOW_INPUT_METHOD_SWITCHER_SETTINGS) {
             mShowInputMethodSelectorPref.setOnPreferenceChangeListener(null);
         }
+        // TODO: Consolidate the logic to InputMethodSettingsWrapper
         InputMethodAndSubtypeUtil.saveInputMethodSubtypeList(
-                this, getContentResolver(), mImis, !mHardKeyboardPreferenceList.isEmpty());
+                this, getContentResolver(), mInputMethodSettingValues.getInputMethodList(),
+                !mHardKeyboardPreferenceList.isEmpty());
     }
 
     @Override
@@ -380,10 +425,12 @@
         return false;
     }
 
-    private void updateActiveInputMethodsSummary() {
-        for (Preference pref : mInputMethodPreferenceList) {
-            if (pref instanceof InputMethodPreference) {
-                ((InputMethodPreference)pref).updateSummary();
+    private void updateInputMethodPreferenceViews() {
+        synchronized (mInputMethodPreferenceList) {
+            for (Preference pref : mInputMethodPreferenceList) {
+                if (pref instanceof InputMethodPreference) {
+                    ((InputMethodPreference) pref).updatePreferenceViews();
+                }
             }
         }
         updateCurrentImeName();
@@ -394,8 +441,8 @@
         if (context == null || mImm == null) return;
         final Preference curPref = getPreferenceScreen().findPreference(KEY_CURRENT_INPUT_METHOD);
         if (curPref != null) {
-            final CharSequence curIme = InputMethodAndSubtypeUtil.getCurrentInputMethodName(
-                    context, getContentResolver(), mImm, mImis, getPackageManager());
+            final CharSequence curIme =
+                    mInputMethodSettingValues.getCurrentInputMethodName(context);
             if (!TextUtils.isEmpty(curIme)) {
                 synchronized(this) {
                     curPref.setSummary(curIme);
@@ -404,7 +451,7 @@
         }
     }
 
-    private InputMethodPreference getInputMethodPreference(InputMethodInfo imi, int imiSize) {
+    private InputMethodPreference getInputMethodPreference(InputMethodInfo imi) {
         final PackageManager pm = getPackageManager();
         final CharSequence label = imi.loadLabel(pm);
         // IME settings
@@ -418,7 +465,8 @@
         }
 
         // Add a check box for enabling/disabling IME
-        InputMethodPreference pref = new InputMethodPreference(this, intent, mImm, imi, imiSize);
+        final InputMethodPreference pref =
+                new InputMethodPreference(this, intent, mImm, imi);
         pref.setKey(imi.getId());
         pref.setTitle(label);
         return pref;
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
index 13f4435..419a877 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.inputmethod;
 
+import com.android.internal.inputmethod.InputMethodUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
@@ -36,10 +37,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 +58,7 @@
     private String mInputMethodId;
     private String mTitle;
     private String mSystemLocale = "";
+    private Collator mCollator = Collator.getInstance();
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -84,7 +89,9 @@
             }
         }
 
-        mSystemLocale = config.locale.toString();
+        final Locale locale = config.locale;
+        mSystemLocale = locale.toString();
+        mCollator = Collator.getInstance(locale);
         onCreateIMM();
         setPreferenceScreen(createPreferenceHierarchy());
     }
@@ -100,6 +107,10 @@
     @Override
     public void onResume() {
         super.onResume();
+        // Refresh internal states in mInputMethodSettingValues to keep the latest
+        // "InputMethodInfo"s and "InputMethodSubtype"s
+        InputMethodSettingValuesWrapper
+                .getInstance(getActivity()).refreshAllInputMethodAndSubtypes();
         InputMethodAndSubtypeUtil.loadInputMethodSubtypeList(
                 this, getContentResolver(), mInputMethodProperties, mInputMethodAndSubtypePrefsMap);
         updateAutoSelectionCB();
@@ -139,7 +150,7 @@
                     InputMethodInfo imi = mInputMethodProperties.get(i);
                     if (id.equals(imi.getId())) {
                         selImi = imi;
-                        if (InputMethodAndSubtypeUtil.isSystemIme(imi)) {
+                        if (InputMethodUtils.isSystemIme(imi)) {
                             InputMethodAndSubtypeUtil.setSubtypesPreferenceEnabled(
                                     this, mInputMethodProperties, id, true);
                             // This is a built-in IME, so no need to warn.
@@ -259,7 +270,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 +381,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 +394,7 @@
                 mIsSystemLanguage = mIsSystemLocale
                         || subtypeLocale.startsWith(systemLocale.substring(0, 2));
             }
+            mCollator = collator;
         }
 
         @Override
@@ -411,10 +424,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/InputMethodAndSubtypeEnablerActivity.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerActivity.java
index d70d5e4..5693e20 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerActivity.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerActivity.java
@@ -15,9 +15,12 @@
  */
 package com.android.settings.inputmethod;
 
+import android.app.Fragment;
 import android.content.Intent;
 import android.preference.PreferenceActivity;
 
+import com.android.settings.ChooseLockPassword.ChooseLockPasswordFragment;
+
 public class InputMethodAndSubtypeEnablerActivity extends PreferenceActivity {
     @Override
     public Intent getIntent() {
@@ -28,4 +31,11 @@
         }
         return modIntent;
     }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (InputMethodAndSubtypeEnabler.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
+
 }
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
index c7d8c89..561302a 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
@@ -16,13 +16,10 @@
 
 package com.android.settings.inputmethod;
 
+import com.android.internal.inputmethod.InputMethodUtils;
 import com.android.settings.SettingsPreferenceFragment;
 
 import android.content.ContentResolver;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
@@ -31,13 +28,11 @@
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.InputMethodSubtype;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
 public class InputMethodAndSubtypeUtil {
@@ -48,7 +43,6 @@
     private static final char INPUT_METHOD_SEPARATER = ':';
     private static final char INPUT_METHOD_SUBTYPE_SEPARATER = ';';
     private static final int NOT_A_SUBTYPE_ID = -1;
-    private static final Locale ENGLISH_LOCALE = new Locale("en");
 
     private static final TextUtils.SimpleStringSplitter sStringInputMethodSplitter
             = new TextUtils.SimpleStringSplitter(INPUT_METHOD_SEPARATER);
@@ -154,28 +148,6 @@
         return set;
     }
 
-    public static CharSequence getCurrentInputMethodName(Context context, ContentResolver resolver,
-            InputMethodManager imm, List<InputMethodInfo> imis, PackageManager pm) {
-        if (resolver == null || imis == null) return null;
-        final String currentInputMethodId = Settings.Secure.getString(resolver,
-                Settings.Secure.DEFAULT_INPUT_METHOD);
-        if (TextUtils.isEmpty(currentInputMethodId)) return null;
-        for (InputMethodInfo imi : imis) {
-            if (currentInputMethodId.equals(imi.getId())) {
-                final InputMethodSubtype subtype = imm.getCurrentInputMethodSubtype();
-                final CharSequence imiLabel = imi.loadLabel(pm);
-                final CharSequence summary = subtype != null
-                        ? TextUtils.concat(subtype.getDisplayName(context,
-                                    imi.getPackageName(), imi.getServiceInfo().applicationInfo),
-                                            (TextUtils.isEmpty(imiLabel) ?
-                                                    "" : " - " + imiLabel))
-                        : imiLabel;
-                return summary;
-            }
-        }
-        return null;
-    }
-
     public static void saveInputMethodSubtypeList(SettingsPreferenceFragment context,
             ContentResolver resolver, List<InputMethodInfo> inputMethodInfos,
             boolean hasHardKeyboard) {
@@ -198,8 +170,9 @@
                     ((CheckBoxPreference) pref).isChecked()
                     : enabledIMEAndSubtypesMap.containsKey(imiId);
             final boolean isCurrentInputMethod = imiId.equals(currentInputMethodId);
-            final boolean systemIme = isSystemIme(imi);
-            if ((!hasHardKeyboard && isAlwaysCheckedIme(imi, context.getActivity(), imiCount))
+            final boolean systemIme = InputMethodUtils.isSystemIme(imi);
+            if ((!hasHardKeyboard && InputMethodSettingValuesWrapper.getInstance(
+                    context.getActivity()).isAlwaysCheckedIme(imi, context.getActivity()))
                     || isImeChecked) {
                 if (!enabledIMEAndSubtypesMap.containsKey(imiId)) {
                     // imiId has just been enabled
@@ -367,56 +340,4 @@
             }
         }
     }
-
-    public static boolean isSystemIme(InputMethodInfo property) {
-        return (property.getServiceInfo().applicationInfo.flags
-                & ApplicationInfo.FLAG_SYSTEM) != 0;
-    }
-
-    public static boolean isAuxiliaryIme(InputMethodInfo imi) {
-        return imi.isAuxiliaryIme();
-    }
-
-    public static boolean isAlwaysCheckedIme(InputMethodInfo imi, Context context, int imiCount) {
-        if (imiCount <= 1) {
-            return true;
-        }
-        if (!isSystemIme(imi)) {
-            return false;
-        }
-        if (isAuxiliaryIme(imi)) {
-            return false;
-        }
-        if (isValidDefaultIme(imi, context)) {
-            return true;
-        }
-        return containsSubtypeOf(imi, ENGLISH_LOCALE.getLanguage());
-    }
-
-    private static boolean isValidDefaultIme(InputMethodInfo imi, Context context) {
-        if (imi.getIsDefaultResourceId() != 0) {
-            try {
-                Resources res = context.createPackageContext(
-                        imi.getPackageName(), 0).getResources();
-                if (res.getBoolean(imi.getIsDefaultResourceId())
-                        && containsSubtypeOf(imi, context.getResources().getConfiguration().
-                                locale.getLanguage())) {
-                    return true;
-                }
-            } catch (PackageManager.NameNotFoundException ex) {
-            } catch (Resources.NotFoundException ex) {
-            }
-        }
-        return false;
-    }
-
-    private static boolean containsSubtypeOf(InputMethodInfo imi, String language) {
-        final int N = imi.getSubtypeCount();
-        for (int i = 0; i < N; ++i) {
-            if (imi.getSubtypeAt(i).getLocale().startsWith(language)) {
-                return true;
-            }
-        }
-        return false;
-    }
 }
diff --git a/src/com/android/settings/inputmethod/InputMethodPreference.java b/src/com/android/settings/inputmethod/InputMethodPreference.java
index 103481e..aa6430f 100644
--- a/src/com/android/settings/inputmethod/InputMethodPreference.java
+++ b/src/com/android/settings/inputmethod/InputMethodPreference.java
@@ -16,17 +16,21 @@
 
 package com.android.settings.inputmethod;
 
+import com.android.internal.inputmethod.InputMethodUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
 
 import android.app.AlertDialog;
 import android.app.Fragment;
 import android.content.ActivityNotFoundException;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 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;
@@ -41,25 +45,25 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import java.util.Comparator;
+import java.text.Collator;
 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 static final float DISABLED_ALPHA = 0.4f;
     private final SettingsPreferenceFragment mFragment;
     private final InputMethodInfo mImi;
     private final InputMethodManager mImm;
+    private final boolean mIsValidSystemNonAuxAsciiCapableIme;
     private final Intent mSettingsIntent;
-    private final boolean mAlwaysChecked;
     private final boolean mIsSystemIme;
+    private final Collator mCollator;
 
     private AlertDialog mDialog = null;
     private ImageView mInputMethodSettingsButton;
     private TextView mTitleText;
     private TextView mSummaryText;
     private View mInputMethodPref;
+    private OnPreferenceChangeListener mOnImePreferenceChangeListener;
 
     private final OnClickListener mPrefOnclickListener = new OnClickListener() {
         @Override
@@ -80,7 +84,7 @@
     };
 
     public InputMethodPreference(SettingsPreferenceFragment fragment, Intent settingsIntent,
-            InputMethodManager imm, InputMethodInfo imi, int imiCount) {
+            InputMethodManager imm, InputMethodInfo imi) {
         super(fragment.getActivity(), null, R.style.InputMethodPreferenceStyle);
         setLayoutResource(R.layout.preference_inputmethod);
         setWidgetLayoutResource(R.layout.preference_inputmethod_widget);
@@ -88,13 +92,12 @@
         mSettingsIntent = settingsIntent;
         mImm = imm;
         mImi = imi;
-        updateSummary();
-        mAlwaysChecked = InputMethodAndSubtypeUtil.isAlwaysCheckedIme(
-                imi, fragment.getActivity(), imiCount);
-        mIsSystemIme = InputMethodAndSubtypeUtil.isSystemIme(imi);
-        if (mAlwaysChecked) {
-            setEnabled(false);
-        }
+        mIsSystemIme = InputMethodUtils.isSystemIme(imi);
+        mCollator = Collator.getInstance(fragment.getResources().getConfiguration().locale);
+        final Context context = fragment.getActivity();
+        mIsValidSystemNonAuxAsciiCapableIme = InputMethodSettingValuesWrapper
+                .getInstance(context).isValidSystemNonAuxAsciiCapableIme(imi, context);
+        updatePreferenceViews();
     }
 
     @Override
@@ -154,9 +157,8 @@
         }
         if (mSettingsIntent == null) {
             mInputMethodSettingsButton.setVisibility(View.GONE);
-        } else {
-            updatePreferenceViews();
         }
+        updatePreferenceViews();
     }
 
     @Override
@@ -165,14 +167,23 @@
         updatePreferenceViews();
     }
 
-    private void updatePreferenceViews() {
+    public void updatePreferenceViews() {
+        final boolean isAlwaysChecked =
+                InputMethodSettingValuesWrapper.getInstance(getContext()).isAlwaysCheckedIme(
+                        mImi, getContext());
+        if (isAlwaysChecked) {
+            super.setChecked(true);
+            super.setEnabled(false);
+        } else {
+            super.setEnabled(true);
+        }
         final boolean checked = isChecked();
         if (mInputMethodSettingsButton != null) {
             mInputMethodSettingsButton.setEnabled(checked);
             mInputMethodSettingsButton.setClickable(checked);
             mInputMethodSettingsButton.setFocusable(checked);
             if (!checked) {
-                mInputMethodSettingsButton.setAlpha(DISABLED_ALPHA);
+                mInputMethodSettingsButton.setAlpha(Utils.DISABLED_ALPHA);
             }
         }
         if (mTitleText != null) {
@@ -190,6 +201,7 @@
                 mInputMethodPref.setBackgroundColor(0);
             }
         }
+        updateSummary();
     }
 
     public static boolean startFragment(
@@ -207,7 +219,7 @@
         }
     }
 
-    public String getSummaryString() {
+    private String getSummaryString() {
         final StringBuilder builder = new StringBuilder();
         final List<InputMethodSubtype> subtypes = mImm.getEnabledInputMethodSubtypeList(mImi, true);
         for (InputMethodSubtype subtype : subtypes) {
@@ -221,7 +233,7 @@
         return builder.toString();
     }
 
-    public void updateSummary() {
+    private void updateSummary() {
         final String summary = getSummaryString();
         if (TextUtils.isEmpty(summary)) {
             return;
@@ -234,17 +246,19 @@
      * @param checked whether to check the box
      * @param save whether to save IME settings
      */
-    public void setChecked(boolean checked, boolean save) {
+    private void setChecked(boolean checked, boolean save) {
+        final boolean wasChecked = isChecked();
         super.setChecked(checked);
         if (save) {
             saveImeSettings();
+            if (wasChecked != checked && mOnImePreferenceChangeListener != null) {
+                mOnImePreferenceChangeListener.onPreferenceChange(this, checked);
+            }
         }
-        updateSummary();
     }
 
-    @Override
-    public void setChecked(boolean checked) {
-        setChecked(checked, false);
+    public void setOnImePreferenceChangeListener(OnPreferenceChangeListener listener) {
+        mOnImePreferenceChangeListener = listener;
     }
 
     private void showSecurityWarnDialog(InputMethodInfo imi, final InputMethodPreference chkPref) {
@@ -276,13 +290,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 && mIsValidSystemNonAuxAsciiCapableIme;
+        final boolean priority1 = imp.mIsSystemIme && imp.mIsValidSystemNonAuxAsciiCapableIme;
+        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/inputmethod/InputMethodSettingValuesWrapper.java b/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java
new file mode 100644
index 0000000..ccba143
--- /dev/null
+++ b/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java
@@ -0,0 +1,204 @@
+/*
+ * 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.inputmethod;
+
+import com.android.internal.inputmethod.InputMethodUtils;
+import com.android.internal.inputmethod.InputMethodUtils.InputMethodSettings;
+
+import android.app.ActivityManagerNative;
+import android.content.Context;
+import android.os.RemoteException;
+import android.util.Log;
+import android.util.Slog;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.InputMethodSubtype;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * This class is a wrapper for InputMethodSettings. You need to refresh internal states
+ * manually on some events when "InputMethodInfo"s and "InputMethodSubtype"s can be
+ * changed.
+ */
+public class InputMethodSettingValuesWrapper {
+    private static final String TAG = InputMethodSettingValuesWrapper.class.getSimpleName();
+    private static final Locale ENGLISH_LOCALE = new Locale("en");
+
+    private static volatile InputMethodSettingValuesWrapper sInstance;
+    private final ArrayList<InputMethodInfo> mMethodList = new ArrayList<InputMethodInfo>();
+    private final HashMap<String, InputMethodInfo> mMethodMap =
+            new HashMap<String, InputMethodInfo>();
+    private final InputMethodSettings mSettings;
+    private final InputMethodManager mImm;
+    private final HashSet<InputMethodInfo> mAsciiCapableEnabledImis =
+            new HashSet<InputMethodInfo>();
+
+    public static InputMethodSettingValuesWrapper getInstance(Context context) {
+        if (sInstance == null) {
+            synchronized(TAG) {
+                if (sInstance == null) {
+                    sInstance = new InputMethodSettingValuesWrapper(context);
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    private static int getDefaultCurrentUserId() {
+        try {
+            return ActivityManagerNative.getDefault().getCurrentUser().id;
+        } catch (RemoteException e) {
+            Slog.w(TAG, "Couldn't get current user ID; guessing it's 0", e);
+        }
+        return 0;
+    }
+
+    // Ensure singleton
+    private InputMethodSettingValuesWrapper(Context context) {
+        mSettings =
+                new InputMethodSettings(context.getResources(), context.getContentResolver(),
+                        mMethodMap, mMethodList, getDefaultCurrentUserId());
+        mImm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        refreshAllInputMethodAndSubtypes();
+    }
+
+    public void refreshAllInputMethodAndSubtypes() {
+        synchronized (mMethodMap) {
+            mMethodList.clear();
+            mMethodMap.clear();
+            final List<InputMethodInfo> imms = mImm.getInputMethodList();
+            mMethodList.addAll(imms);
+            for (InputMethodInfo imi : imms) {
+                mMethodMap.put(imi.getId(), imi);
+            }
+            updateAsciiCapableEnabledImis();
+        }
+    }
+
+    // TODO: Add a cts to ensure at least one AsciiCapableSubtypeEnabledImis exist
+    private void updateAsciiCapableEnabledImis() {
+        synchronized (mMethodMap) {
+            mAsciiCapableEnabledImis.clear();
+            final List<InputMethodInfo> enabledImis = mSettings.getEnabledInputMethodListLocked();
+            for (final InputMethodInfo imi : enabledImis) {
+                final int subtypeCount = imi.getSubtypeCount();
+                for (int i = 0; i < subtypeCount; ++i) {
+                    final InputMethodSubtype subtype = imi.getSubtypeAt(i);
+                    if (InputMethodUtils.SUBTYPE_MODE_KEYBOARD.equalsIgnoreCase(subtype.getMode())
+                            && subtype.isAsciiCapable()) {
+                        mAsciiCapableEnabledImis.add(imi);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    public List<InputMethodInfo> getInputMethodList() {
+        synchronized (mMethodMap) {
+            return mMethodList;
+        }
+    }
+
+    public CharSequence getCurrentInputMethodName(Context context) {
+        synchronized (mMethodMap) {
+            final InputMethodInfo imi = mMethodMap.get(mSettings.getSelectedInputMethod());
+            if (imi == null) {
+                Log.w(TAG, "Invalid selected imi: " + mSettings.getSelectedInputMethod());
+                return "";
+            }
+            final InputMethodSubtype subtype = mImm.getCurrentInputMethodSubtype();
+            return InputMethodUtils.getImeAndSubtypeDisplayName(context, imi, subtype);
+        }
+    }
+
+    public boolean isAlwaysCheckedIme(InputMethodInfo imi, Context context) {
+        final boolean isEnabled = isEnabledImi(imi);
+        synchronized (mMethodMap) {
+            if (mSettings.getEnabledInputMethodListLocked().size() <= 1 && isEnabled) {
+                return true;
+            }
+        }
+
+        final int enabledValidSystemNonAuxAsciiCapableImeCount =
+                getEnabledValidSystemNonAuxAsciiCapableImeCount(context);
+        if (enabledValidSystemNonAuxAsciiCapableImeCount > 1) {
+            return false;
+        }
+
+        if (enabledValidSystemNonAuxAsciiCapableImeCount == 1 && !isEnabled) {
+            return false;
+        }
+
+        if (!InputMethodUtils.isSystemIme(imi)) {
+            return false;
+        }
+        return isValidSystemNonAuxAsciiCapableIme(imi, context);
+    }
+
+    private int getEnabledValidSystemNonAuxAsciiCapableImeCount(Context context) {
+        int count = 0;
+        final List<InputMethodInfo> enabledImis;
+        synchronized(mMethodMap) {
+            enabledImis = mSettings.getEnabledInputMethodListLocked();
+        }
+        for (final InputMethodInfo imi : enabledImis) {
+            if (isValidSystemNonAuxAsciiCapableIme(imi, context)) {
+                ++count;
+            }
+        }
+        if (count == 0) {
+            Log.w(TAG, "No \"enabledValidSystemNonAuxAsciiCapableIme\"s found.");
+        }
+        return count;
+    }
+
+    private boolean isEnabledImi(InputMethodInfo imi) {
+        final List<InputMethodInfo> enabledImis;
+        synchronized(mMethodMap) {
+            enabledImis = mSettings.getEnabledInputMethodListLocked();
+        }
+        for (final InputMethodInfo tempImi : enabledImis) {
+            if (tempImi.getId().equals(imi.getId())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean isValidSystemNonAuxAsciiCapableIme(InputMethodInfo imi,
+            Context context) {
+        if (imi.isAuxiliaryIme()) {
+            return false;
+        }
+        if (InputMethodUtils.isValidSystemDefaultIme(true /* isSystemReady */, imi, context)) {
+            return true;
+        }
+        if (mAsciiCapableEnabledImis.isEmpty()) {
+            Log.w(TAG, "ascii capable subtype enabled imi not found. Fall back to English"
+                    + " Keyboard subtype.");
+            return InputMethodUtils.containsSubtypeOf(imi, ENGLISH_LOCALE.getLanguage(),
+                    InputMethodUtils.SUBTYPE_MODE_KEYBOARD);
+        }
+        return mAsciiCapableEnabledImis.contains(imi);
+    }
+}
diff --git a/src/com/android/settings/inputmethod/SingleSpellCheckerPreference.java b/src/com/android/settings/inputmethod/SingleSpellCheckerPreference.java
index 5b28142..5ea8bd7 100644
--- a/src/com/android/settings/inputmethod/SingleSpellCheckerPreference.java
+++ b/src/com/android/settings/inputmethod/SingleSpellCheckerPreference.java
@@ -17,6 +17,7 @@
 package com.android.settings.inputmethod;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
@@ -37,7 +38,6 @@
 import android.widget.Toast;
 
 public class SingleSpellCheckerPreference extends Preference {
-    private static final float DISABLED_ALPHA = 0.4f;
     private static final String TAG = SingleSpellCheckerPreference.class.getSimpleName();
     private static final boolean DBG = false;
 
@@ -198,7 +198,7 @@
                 mSettingsButton.setClickable(enabled);
                 mSettingsButton.setFocusable(enabled);
                 if (!enabled) {
-                    mSettingsButton.setAlpha(DISABLED_ALPHA);
+                    mSettingsButton.setAlpha(Utils.DISABLED_ALPHA);
                 }
             }
         }
@@ -210,7 +210,7 @@
                 mSubtypeButton.setClickable(enabled);
                 mSubtypeButton.setFocusable(enabled);
                 if (!enabled) {
-                    mSubtypeButton.setAlpha(DISABLED_ALPHA);
+                    mSubtypeButton.setAlpha(Utils.DISABLED_ALPHA);
                 }
             }
         }
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
index e52ab7a..2901673 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
@@ -21,15 +21,20 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Message;
+import android.os.Messenger;
+import android.os.RemoteException;
 import android.view.View;
 
 public class UserDictionaryAddWordActivity extends Activity {
 
-    private static final String STATE_KEY_IS_OPEN = "isOpen";
-
     public static final String MODE_EDIT_ACTION = "com.android.settings.USER_DICTIONARY_EDIT";
     public static final String MODE_INSERT_ACTION = "com.android.settings.USER_DICTIONARY_INSERT";
 
+    /* package */ static final int CODE_WORD_ADDED = 0;
+    /* package */ static final int CODE_CANCEL = 1;
+    /* package */ static final int CODE_ALREADY_PRESENT = 2;
+
     private UserDictionaryAddWordContents mContents;
 
     @Override
@@ -67,12 +72,31 @@
         mContents.saveStateIntoBundle(outState);
     }
 
+    private void reportBackToCaller(final int resultCode, final Bundle result) {
+        final Intent senderIntent = getIntent();
+        final Object listener = senderIntent.getExtras().get("listener");
+        if (!(listener instanceof Messenger)) return; // This will work if listener is null too.
+        final Messenger messenger = (Messenger)listener;
+
+        final Message m = Message.obtain();
+        m.obj = result;
+        m.what = resultCode;
+        try {
+            messenger.send(m);
+        } catch (RemoteException e) {
+            // Couldn't report back, but there is nothing we can do to fix it
+        }
+    }
+
     public void onClickCancel(final View v) {
+        reportBackToCaller(CODE_CANCEL, null);
         finish();
     }
 
     public void onClickConfirm(final View v) {
-        mContents.apply(this);
+        final Bundle parameters = new Bundle();
+        final int resultCode = mContents.apply(this, parameters);
+        reportBackToCaller(resultCode, parameters);
         finish();
     }
 }
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
index e46b19c..d81703e 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
@@ -43,6 +43,8 @@
     public static final String EXTRA_WORD = "word";
     public static final String EXTRA_SHORTCUT = "shortcut";
     public static final String EXTRA_LOCALE = "locale";
+    public static final String EXTRA_ORIGINAL_WORD = "originalWord";
+    public static final String EXTRA_ORIGINAL_SHORTCUT = "originalShortcut";
 
     public static final int MODE_EDIT = 0;
     public static final int MODE_INSERT = 1;
@@ -55,6 +57,8 @@
     private String mLocale;
     private final String mOldWord;
     private final String mOldShortcut;
+    private String mSavedWord;
+    private String mSavedShortcut;
 
     /* package */ UserDictionaryAddWordContents(final View view, final Bundle args) {
         mWordEditText = (EditText)view.findViewById(R.id.user_dictionary_add_word_text);
@@ -62,7 +66,9 @@
         final String word = args.getString(EXTRA_WORD);
         if (null != word) {
             mWordEditText.setText(word);
-            mWordEditText.setSelection(word.length());
+            // Use getText in case the edit text modified the text we set. This happens when
+            // it's too long to be edited.
+            mWordEditText.setSelection(mWordEditText.getText().length());
         }
         final String shortcut = args.getString(EXTRA_SHORTCUT);
         if (null != shortcut && null != mShortcutEditText) {
@@ -74,6 +80,16 @@
         updateLocale(args.getString(EXTRA_LOCALE));
     }
 
+    /* package */ UserDictionaryAddWordContents(final View view,
+            final UserDictionaryAddWordContents oldInstanceToBeEdited) {
+        mWordEditText = (EditText)view.findViewById(R.id.user_dictionary_add_word_text);
+        mShortcutEditText = (EditText)view.findViewById(R.id.user_dictionary_add_shortcut);
+        mMode = MODE_EDIT;
+        mOldWord = oldInstanceToBeEdited.mSavedWord;
+        mOldShortcut = oldInstanceToBeEdited.mSavedShortcut;
+        updateLocale(mLocale);
+    }
+
     // locale may be null, this means default locale
     // It may also be the empty string, which means "all locales"
     /* package */ void updateLocale(final String locale) {
@@ -82,9 +98,13 @@
 
     /* package */ void saveStateIntoBundle(final Bundle outState) {
         outState.putString(EXTRA_WORD, mWordEditText.getText().toString());
+        outState.putString(EXTRA_ORIGINAL_WORD, mOldWord);
         if (null != mShortcutEditText) {
             outState.putString(EXTRA_SHORTCUT, mShortcutEditText.getText().toString());
         }
+        if (null != mOldShortcut) {
+            outState.putString(EXTRA_ORIGINAL_SHORTCUT, mOldShortcut);
+        }
         outState.putString(EXTRA_LOCALE, mLocale);
     }
 
@@ -97,7 +117,8 @@
         // If we are in add mode, nothing was added, so we don't need to do anything.
     }
 
-    /* package */ void apply(final Context context) {
+    /* package */ int apply(final Context context, final Bundle outParameters) {
+        if (null != outParameters) saveStateIntoBundle(outParameters);
         final ContentResolver resolver = context.getContentResolver();
         if (MODE_EDIT == mMode && !TextUtils.isEmpty(mOldWord)) {
             // Mode edit: remove the old entry.
@@ -117,13 +138,15 @@
         }
         if (TextUtils.isEmpty(newWord)) {
             // If the word is somehow empty, don't insert it.
-            return;
+            return UserDictionaryAddWordActivity.CODE_CANCEL;
         }
+        mSavedWord = newWord;
+        mSavedShortcut = newShortcut;
         // If there is no shortcut, and the word already exists in the database, then we
         // should not insert, because either A. the word exists with no shortcut, in which
         // case the exact same thing we want to insert is already there, or B. the word
         // exists with at least one shortcut, in which case it has priority on our word.
-        if (hasWord(newWord, context)) return;
+        if (hasWord(newWord, context)) return UserDictionaryAddWordActivity.CODE_ALREADY_PRESENT;
 
         // Disallow duplicates. If the same word with no shortcut is defined, remove it; if
         // the same word with the same shortcut is defined, remove it; but we don't mind if
@@ -139,6 +162,8 @@
         UserDictionary.Words.addWord(context, newWord.toString(),
                 FREQUENCY_FOR_USER_DICTIONARY_ADDS, newShortcut,
                 TextUtils.isEmpty(mLocale) ? null : Utils.createLocaleFromString(mLocale));
+
+        return UserDictionaryAddWordActivity.CODE_WORD_ADDED;
     }
 
     private static final String[] HAS_WORD_PROJECTION = { UserDictionary.Words.WORD };
@@ -228,4 +253,8 @@
         localesList.add(new LocaleRenderer(activity, null)); // meaning: select another locale
         return localesList;
     }
+
+    public String getCurrentUserDictionaryLocale() {
+        return mLocale;
+    }
 }
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
index 97ffa19..86c3e79 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.android.settings.inputmethod;
 
 import android.app.Fragment;
@@ -26,7 +27,6 @@
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.Spinner;
 
 import com.android.settings.R;
 import com.android.settings.inputmethod.UserDictionaryAddWordContents.LocaleRenderer;
@@ -51,23 +51,39 @@
     private boolean mIsDeleting = false;
 
     @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
+    public void onActivityCreated(final Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         setHasOptionsMenu(true);
+        getActivity().getActionBar().setTitle(R.string.user_dict_settings_title);
+        // Keep the instance so that we remember mContents when configuration changes (eg rotation)
+        setRetainInstance(true);
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
+    public View onCreateView(final LayoutInflater inflater, final ViewGroup container,
+            final Bundle savedState) {
         mRootView = inflater.inflate(R.layout.user_dictionary_add_word_fullscreen, null);
         mIsDeleting = false;
+        // If we have a non-null mContents object, it's the old value before a configuration
+        // change (eg rotation) so we need to use its values. Otherwise, read from the arguments.
         if (null == mContents) {
             mContents = new UserDictionaryAddWordContents(mRootView, getArguments());
+        } else {
+            // We create a new mContents object to account for the new situation : a word has
+            // been added to the user dictionary when we started rotating, and we are now editing
+            // it. That means in particular if the word undergoes any change, the old version should
+            // be updated, so the mContents object needs to switch to EDIT mode if it was in
+            // INSERT mode.
+            mContents = new UserDictionaryAddWordContents(mRootView,
+                    mContents /* oldInstanceToBeEdited */);
         }
+        getActivity().getActionBar().setSubtitle(UserDictionarySettingsUtils.getLocaleDisplayName(
+                getActivity(), mContents.getCurrentUserDictionaryLocale()));
         return mRootView;
     }
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+    public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
         MenuItem actionItem = menu.add(0, OPTIONS_MENU_DELETE, 0, R.string.delete)
                 .setIcon(android.R.drawable.ic_menu_delete);
         actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
@@ -102,13 +118,9 @@
     private void updateSpinner() {
         final ArrayList<LocaleRenderer> localesList = mContents.getLocalesList(getActivity());
 
-        final Spinner localeSpinner =
-                (Spinner)mRootView.findViewById(R.id.user_dictionary_add_locale);
         final ArrayAdapter<LocaleRenderer> adapter = new ArrayAdapter<LocaleRenderer>(getActivity(),
                 android.R.layout.simple_spinner_item, localesList);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        localeSpinner.setAdapter(adapter);
-        localeSpinner.setOnItemSelectedListener(this);
     }
 
     @Override
@@ -116,7 +128,7 @@
         super.onPause();
         // We are being hidden: commit changes to the user dictionary, unless we were deleting it
         if (!mIsDeleting) {
-            mContents.apply(getActivity());
+            mContents.apply(getActivity(), null);
         }
     }
 
diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java
index 5390be6..24acb4a 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryList.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryList.java
@@ -21,45 +21,104 @@
 import com.android.settings.Utils;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
 import android.provider.UserDictionary;
+import android.text.TextUtils;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.InputMethodSubtype;
 
+import java.util.List;
 import java.util.Locale;
 import java.util.TreeSet;
 
 public class UserDictionaryList extends SettingsPreferenceFragment {
-
     public static final String USER_DICTIONARY_SETTINGS_INTENT_ACTION =
             "android.settings.USER_DICTIONARY_SETTINGS";
+    private String mLocale;
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getActivity()));
+        getActivity().getActionBar().setTitle(R.string.user_dict_settings_title);
     }
 
-    static TreeSet<String> getUserDictionaryLocalesSet(Activity activity) {
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        final Intent intent = getActivity().getIntent();
+        final String localeFromIntent =
+                null == intent ? null : intent.getStringExtra("locale");
+
+        final Bundle arguments = getArguments();
+        final String localeFromArguments =
+                null == arguments ? null : arguments.getString("locale");
+
+        final String locale;
+        if (null != localeFromArguments) {
+            locale = localeFromArguments;
+        } else if (null != localeFromIntent) {
+            locale = localeFromIntent;
+        } else {
+            locale = null;
+        }
+        mLocale = locale;
+    }
+
+    public static TreeSet<String> getUserDictionaryLocalesSet(Activity activity) {
         @SuppressWarnings("deprecation")
         final Cursor cursor = activity.managedQuery(UserDictionary.Words.CONTENT_URI,
                 new String[] { UserDictionary.Words.LOCALE },
                 null, null, null);
-        final TreeSet<String> localeList = new TreeSet<String>();
+        final TreeSet<String> localeSet = new TreeSet<String>();
         if (null == cursor) {
             // The user dictionary service is not present or disabled. Return null.
             return null;
         } else if (cursor.moveToFirst()) {
             final int columnIndex = cursor.getColumnIndex(UserDictionary.Words.LOCALE);
             do {
-                String locale = cursor.getString(columnIndex);
-                localeList.add(null != locale ? locale : "");
+                final String locale = cursor.getString(columnIndex);
+                localeSet.add(null != locale ? locale : "");
             } while (cursor.moveToNext());
         }
-        localeList.add(Locale.getDefault().toString());
-        return localeList;
+        // CAVEAT: Keep this for consistency of the implementation between Keyboard and Settings
+        // if (!UserDictionarySettings.IS_SHORTCUT_API_SUPPORTED) {
+        //     // For ICS, we need to show "For all languages" in case that the keyboard locale
+        //     // is different from the system locale
+        //     localeSet.add("");
+        // }
+
+        final InputMethodManager imm =
+                (InputMethodManager)activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+        final List<InputMethodInfo> imis = imm.getEnabledInputMethodList();
+        for (final InputMethodInfo imi : imis) {
+            final List<InputMethodSubtype> subtypes =
+                    imm.getEnabledInputMethodSubtypeList(
+                            imi, true /* allowsImplicitlySelectedSubtypes */);
+            for (InputMethodSubtype subtype : subtypes) {
+                final String locale = subtype.getLocale();
+                if (!TextUtils.isEmpty(locale)) {
+                    localeSet.add(locale);
+                }
+            }
+        }
+
+        // We come here after we have collected locales from existing user dictionary entries and
+        // enabled subtypes. If we already have the locale-without-country version of the system
+        // locale, we don't add the system locale to avoid confusion even though it's technically
+        // correct to add it.
+        if (!localeSet.contains(Locale.getDefault().getLanguage().toString())) {
+            localeSet.add(Locale.getDefault().toString());
+        }
+
+        return localeSet;
     }
 
     /**
@@ -69,13 +128,23 @@
     protected void createUserDictSettings(PreferenceGroup userDictGroup) {
         final Activity activity = getActivity();
         userDictGroup.removeAll();
-        final TreeSet<String> localeList =
+        final TreeSet<String> localeSet =
                 UserDictionaryList.getUserDictionaryLocalesSet(activity);
+        if (mLocale != null) {
+            // If the caller explicitly specify empty string as a locale, we'll show "all languages"
+            // in the list.
+            localeSet.add(mLocale);
+        }
+        if (localeSet.size() > 1) {
+            // Have an "All languages" entry in the languages list if there are two or more active
+            // languages
+            localeSet.add("");
+        }
 
-        if (localeList.isEmpty()) {
+        if (localeSet.isEmpty()) {
             userDictGroup.addPreference(createUserDictionaryPreference(null, activity));
         } else {
-            for (String locale : localeList) {
+            for (String locale : localeSet) {
                 userDictGroup.addPreference(createUserDictionaryPreference(locale, activity));
             }
         }
diff --git a/src/com/android/settings/inputmethod/UserDictionarySettingsUtils.java b/src/com/android/settings/inputmethod/UserDictionarySettingsUtils.java
new file mode 100644
index 0000000..e77f9c5
--- /dev/null
+++ b/src/com/android/settings/inputmethod/UserDictionarySettingsUtils.java
@@ -0,0 +1,41 @@
+/*
+ * 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.inputmethod;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import java.util.Locale;
+
+/**
+ * Utilities of the user dictionary settings
+ */
+public class UserDictionarySettingsUtils {
+    public static String getLocaleDisplayName(Context context, String localeStr) {
+        if (TextUtils.isEmpty(localeStr)) {
+            // CAVEAT: localeStr should not be null because a null locale stands for the system
+            // locale in UserDictionary.Words.addWord.
+            return context.getResources().getString(R.string.user_dict_settings_all_languages);
+        }
+        final Locale locale = Utils.createLocaleFromString(localeStr);
+        final Locale systemLocale = context.getResources().getConfiguration().locale;
+        return locale.getDisplayName(systemLocale);
+    }
+}
diff --git a/src/com/android/settings/location/InjectedSetting.java b/src/com/android/settings/location/InjectedSetting.java
new file mode 100644
index 0000000..d8a3f49
--- /dev/null
+++ b/src/com/android/settings/location/InjectedSetting.java
@@ -0,0 +1,128 @@
+/*
+ * 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.location;
+
+import android.content.Intent;
+import android.text.TextUtils;
+import android.util.Log;
+import com.android.internal.annotations.Immutable;
+import com.android.internal.util.Preconditions;
+
+/**
+ * Specifies a setting that is being injected into Settings > Location > Location services.
+ *
+ * @see android.location.SettingInjectorService
+ */
+@Immutable
+class InjectedSetting {
+
+    /**
+     * Package for the subclass of {@link android.location.SettingInjectorService} and for the
+     * settings activity.
+     */
+    public final String packageName;
+
+    /**
+     * Class name for the subclass of {@link android.location.SettingInjectorService} that
+     * specifies dynamic values for the location setting.
+     */
+    public final String className;
+
+    /**
+     * The {@link android.preference.Preference#getTitle()} value.
+     */
+    public final String title;
+
+    /**
+     * The {@link android.preference.Preference#getIcon()} value.
+     */
+    public final int iconId;
+
+    /**
+     * The activity to launch to allow the user to modify the settings value. Assumed to be in the
+     * {@link #packageName} package.
+     */
+    public final String settingsActivity;
+
+    private InjectedSetting(String packageName, String className,
+            String title, int iconId, String settingsActivity) {
+        this.packageName = Preconditions.checkNotNull(packageName, "packageName");
+        this.className = Preconditions.checkNotNull(className, "className");
+        this.title = Preconditions.checkNotNull(title, "title");
+        this.iconId = iconId;
+        this.settingsActivity = Preconditions.checkNotNull(settingsActivity);
+    }
+
+    /**
+     * Returns a new instance, or null.
+     */
+    public static InjectedSetting newInstance(String packageName, String className,
+            String title, int iconId, String settingsActivity) {
+        if (packageName == null || className == null ||
+                TextUtils.isEmpty(title) || TextUtils.isEmpty(settingsActivity)) {
+            if (Log.isLoggable(SettingsInjector.TAG, Log.WARN)) {
+                Log.w(SettingsInjector.TAG, "Illegal setting specification: package="
+                        + packageName + ", class=" + className
+                        + ", title=" + title + ", settingsActivity=" + settingsActivity);
+            }
+            return null;
+        }
+        return new InjectedSetting(packageName, className, title, iconId, settingsActivity);
+    }
+
+    @Override
+    public String toString() {
+        return "InjectedSetting{" +
+                "mPackageName='" + packageName + '\'' +
+                ", mClassName='" + className + '\'' +
+                ", label=" + title +
+                ", iconId=" + iconId +
+                ", settingsActivity='" + settingsActivity + '\'' +
+                '}';
+    }
+
+    /**
+     * Returns the intent to start the {@link #className} service.
+     */
+    public Intent getServiceIntent() {
+        Intent intent = new Intent();
+        intent.setClassName(packageName, className);
+        return intent;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof InjectedSetting)) return false;
+
+        InjectedSetting that = (InjectedSetting) o;
+
+        return packageName.equals(that.packageName) && className.equals(that.className)
+                && title.equals(that.title) && iconId == that.iconId
+                && settingsActivity.equals(that.settingsActivity);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = packageName.hashCode();
+        result = 31 * result + className.hashCode();
+        result = 31 * result + title.hashCode();
+        result = 31 * result + iconId;
+        result = 31 * result + settingsActivity.hashCode();
+        return result;
+    }
+}
diff --git a/src/com/android/settings/location/LocationMode.java b/src/com/android/settings/location/LocationMode.java
new file mode 100644
index 0000000..7e95cac
--- /dev/null
+++ b/src/com/android/settings/location/LocationMode.java
@@ -0,0 +1,136 @@
+/*
+ * 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.location;
+
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+
+import com.android.settings.R;
+
+/**
+ * A page with 3 radio buttons to choose the location mode.
+ *
+ * There are 3 location modes when location access is enabled:
+ *
+ * High accuracy: use both GPS and network location.
+ *
+ * Battery saving: use network location only to reduce the power consumption.
+ *
+ * Sensors only: use GPS location only.
+ */
+public class LocationMode extends LocationSettingsBase
+        implements RadioButtonPreference.OnClickListener {
+    private static final String KEY_HIGH_ACCURACY = "high_accuracy";
+    private RadioButtonPreference mHighAccuracy;
+    private static final String KEY_BATTERY_SAVING = "battery_saving";
+    private RadioButtonPreference mBatterySaving;
+    private static final String KEY_SENSORS_ONLY = "sensors_only";
+    private RadioButtonPreference mSensorsOnly;
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        createPreferenceHierarchy();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+    }
+
+    private PreferenceScreen createPreferenceHierarchy() {
+        PreferenceScreen root = getPreferenceScreen();
+        if (root != null) {
+            root.removeAll();
+        }
+        addPreferencesFromResource(R.xml.location_mode);
+        root = getPreferenceScreen();
+
+        mHighAccuracy = (RadioButtonPreference) root.findPreference(KEY_HIGH_ACCURACY);
+        mBatterySaving = (RadioButtonPreference) root.findPreference(KEY_BATTERY_SAVING);
+        mSensorsOnly = (RadioButtonPreference) root.findPreference(KEY_SENSORS_ONLY);
+        mHighAccuracy.setOnClickListener(this);
+        mBatterySaving.setOnClickListener(this);
+        mSensorsOnly.setOnClickListener(this);
+
+        refreshLocationMode();
+        return root;
+    }
+
+    private void updateRadioButtons(RadioButtonPreference activated) {
+        if (activated == null) {
+            mHighAccuracy.setChecked(false);
+            mBatterySaving.setChecked(false);
+            mSensorsOnly.setChecked(false);
+        } else if (activated == mHighAccuracy) {
+            mHighAccuracy.setChecked(true);
+            mBatterySaving.setChecked(false);
+            mSensorsOnly.setChecked(false);
+        } else if (activated == mBatterySaving) {
+            mHighAccuracy.setChecked(false);
+            mBatterySaving.setChecked(true);
+            mSensorsOnly.setChecked(false);
+        } else if (activated == mSensorsOnly) {
+            mHighAccuracy.setChecked(false);
+            mBatterySaving.setChecked(false);
+            mSensorsOnly.setChecked(true);
+        }
+    }
+
+    @Override
+    public void onRadioButtonClicked(RadioButtonPreference emiter) {
+        int mode = Settings.Secure.LOCATION_MODE_OFF;
+        if (emiter == mHighAccuracy) {
+            mode = Settings.Secure.LOCATION_MODE_HIGH_ACCURACY;
+        } else if (emiter == mBatterySaving) {
+            mode = Settings.Secure.LOCATION_MODE_BATTERY_SAVING;
+        } else if (emiter == mSensorsOnly) {
+            mode = Settings.Secure.LOCATION_MODE_SENSORS_ONLY;
+        }
+        setLocationMode(mode);
+    }
+
+    @Override
+    public void onModeChanged(int mode, boolean restricted) {
+        switch (mode) {
+            case Settings.Secure.LOCATION_MODE_OFF:
+                updateRadioButtons(null);
+                break;
+            case Settings.Secure.LOCATION_MODE_SENSORS_ONLY:
+                updateRadioButtons(mSensorsOnly);
+                break;
+            case Settings.Secure.LOCATION_MODE_BATTERY_SAVING:
+                updateRadioButtons(mBatterySaving);
+                break;
+            case Settings.Secure.LOCATION_MODE_HIGH_ACCURACY:
+                updateRadioButtons(mHighAccuracy);
+                break;
+            default:
+                break;
+        }
+
+        boolean enabled = (mode != Settings.Secure.LOCATION_MODE_OFF) && !restricted;
+        mHighAccuracy.setEnabled(enabled);
+        mBatterySaving.setEnabled(enabled);
+        mSensorsOnly.setEnabled(enabled);
+    }
+
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_location_access;
+    }
+}
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
new file mode 100644
index 0000000..06a6650
--- /dev/null
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -0,0 +1,258 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.location;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.location.LocationManager;
+import android.location.SettingInjectorService;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.Gravity;
+import android.widget.CompoundButton;
+import android.widget.Switch;
+
+import com.android.settings.R;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * Location access settings.
+ */
+public class LocationSettings extends LocationSettingsBase
+        implements CompoundButton.OnCheckedChangeListener {
+
+    private static final String TAG = "LocationSettings";
+
+    /** Key for preference screen "Mode" */
+    private static final String KEY_LOCATION_MODE = "location_mode";
+    /** Key for preference category "Recent location requests" */
+    private static final String KEY_RECENT_LOCATION_REQUESTS = "recent_location_requests";
+    /** Key for preference category "Location services" */
+    private static final String KEY_LOCATION_SERVICES = "location_services";
+
+    private Switch mSwitch;
+    private boolean mValidListener;
+    private Preference mLocationMode;
+    private PreferenceCategory mCategoryRecentLocationRequests;
+    /** Receives UPDATE_INTENT  */
+    private BroadcastReceiver mReceiver;
+
+    public LocationSettings() {
+        mValidListener = false;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mSwitch = new Switch(getActivity());
+        mSwitch.setOnCheckedChangeListener(this);
+        mValidListener = true;
+        createPreferenceHierarchy();
+    }
+
+    @Override
+    public void onPause() {
+        try {
+            getActivity().unregisterReceiver(mReceiver);
+        } catch (RuntimeException e) {
+            // Ignore exceptions caused by race condition
+        }
+        super.onPause();
+        mValidListener = false;
+        mSwitch.setOnCheckedChangeListener(null);
+    }
+
+    private void addPreferencesSorted(List<Preference> prefs, PreferenceGroup container) {
+        // If there's some items to display, sort the items and add them to the container.
+        Collections.sort(prefs, new Comparator<Preference>() {
+            @Override
+            public int compare(Preference lhs, Preference rhs) {
+                return lhs.getTitle().toString().compareTo(rhs.getTitle().toString());
+            }
+        });
+        for (Preference entry : prefs) {
+            container.addPreference(entry);
+        }
+    }
+
+    private PreferenceScreen createPreferenceHierarchy() {
+        final PreferenceActivity activity = (PreferenceActivity) getActivity();
+        PreferenceScreen root = getPreferenceScreen();
+        if (root != null) {
+            root.removeAll();
+        }
+        addPreferencesFromResource(R.xml.location_settings);
+        root = getPreferenceScreen();
+
+        mLocationMode = root.findPreference(KEY_LOCATION_MODE);
+        mLocationMode.setOnPreferenceClickListener(
+                new Preference.OnPreferenceClickListener() {
+                    @Override
+                    public boolean onPreferenceClick(Preference preference) {
+                        activity.startPreferencePanel(
+                                LocationMode.class.getName(), null,
+                                R.string.location_mode_screen_title, null, LocationSettings.this,
+                                0);
+                        return true;
+                    }
+                });
+
+        mCategoryRecentLocationRequests =
+                (PreferenceCategory) root.findPreference(KEY_RECENT_LOCATION_REQUESTS);
+        RecentLocationApps recentApps = new RecentLocationApps(activity);
+        List<Preference> recentLocationRequests = recentApps.getAppList();
+        if (recentLocationRequests.size() > 0) {
+            addPreferencesSorted(recentLocationRequests, mCategoryRecentLocationRequests);
+        } else {
+            // If there's no item to display, add a "No recent apps" item.
+            Preference banner = new Preference(activity);
+            banner.setLayoutResource(R.layout.location_list_no_item);
+            banner.setTitle(R.string.location_no_recent_apps);
+            banner.setSelectable(false);
+            mCategoryRecentLocationRequests.addPreference(banner);
+        }
+
+        addLocationServices(activity, root);
+
+        // Only show the master switch when we're not in multi-pane mode, and not being used as
+        // Setup Wizard.
+        if (activity.onIsHidingHeaders() || !activity.onIsMultiPane()) {
+            final int padding = activity.getResources().getDimensionPixelSize(
+                    R.dimen.action_bar_switch_padding);
+            mSwitch.setPaddingRelative(0, 0, padding, 0);
+            activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                    ActionBar.DISPLAY_SHOW_CUSTOM);
+            activity.getActionBar().setCustomView(mSwitch, new ActionBar.LayoutParams(
+                    ActionBar.LayoutParams.WRAP_CONTENT,
+                    ActionBar.LayoutParams.WRAP_CONTENT,
+                    Gravity.CENTER_VERTICAL | Gravity.END));
+        }
+
+        setHasOptionsMenu(true);
+
+        refreshLocationMode();
+        return root;
+    }
+
+    /**
+     * Add the settings injected by external apps into the "App Settings" category. Hides the
+     * category if there are no injected settings.
+     *
+     * Reloads the settings whenever receives
+     * {@link SettingInjectorService#ACTION_INJECTED_SETTING_CHANGED}. As a safety measure,
+     * also reloads on {@link LocationManager#MODE_CHANGED_ACTION} to ensure the settings are
+     * up-to-date after mode changes even if an affected app doesn't send the setting changed
+     * broadcast.
+     */
+    private void addLocationServices(Context context, PreferenceScreen root) {
+        PreferenceCategory categoryLocationServices =
+                (PreferenceCategory) root.findPreference(KEY_LOCATION_SERVICES);
+        final SettingsInjector injector = new SettingsInjector(context);
+        List<Preference> locationServices = injector.getInjectedSettings();
+
+        mReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (Log.isLoggable(TAG, Log.DEBUG)) {
+                    Log.d(TAG, "Received settings change intent: " + intent);
+                }
+                injector.reloadStatusMessages();
+            }
+        };
+
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(SettingInjectorService.ACTION_INJECTED_SETTING_CHANGED);
+        filter.addAction(LocationManager.MODE_CHANGED_ACTION);
+        context.registerReceiver(mReceiver, filter);
+
+        if (locationServices.size() > 0) {
+            addPreferencesSorted(locationServices, categoryLocationServices);
+        } else {
+            // If there's no item to display, remove the whole category.
+            root.removePreference(categoryLocationServices);
+        }
+    }
+
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_location_access;
+    }
+
+    @Override
+    public void onModeChanged(int mode, boolean restricted) {
+        switch (mode) {
+            case Settings.Secure.LOCATION_MODE_OFF:
+                mLocationMode.setSummary(R.string.location_mode_location_off_title);
+                break;
+            case Settings.Secure.LOCATION_MODE_SENSORS_ONLY:
+                mLocationMode.setSummary(R.string.location_mode_sensors_only_title);
+                break;
+            case Settings.Secure.LOCATION_MODE_BATTERY_SAVING:
+                mLocationMode.setSummary(R.string.location_mode_battery_saving_title);
+                break;
+            case Settings.Secure.LOCATION_MODE_HIGH_ACCURACY:
+                mLocationMode.setSummary(R.string.location_mode_high_accuracy_title);
+                break;
+            default:
+                break;
+        }
+
+        // Restricted user can't change the location mode, so disable the master switch. But in some
+        // corner cases, the location might still be enabled. In such case the master switch should
+        // be disabled but checked.
+        boolean enabled = (mode != Settings.Secure.LOCATION_MODE_OFF);
+        mSwitch.setEnabled(!restricted);
+        mLocationMode.setEnabled(enabled && !restricted);
+        mCategoryRecentLocationRequests.setEnabled(enabled);
+
+        if (enabled != mSwitch.isChecked()) {
+            // set listener to null so that that code below doesn't trigger onCheckedChanged()
+            if (mValidListener) {
+                mSwitch.setOnCheckedChangeListener(null);
+            }
+            mSwitch.setChecked(enabled);
+            if (mValidListener) {
+                mSwitch.setOnCheckedChangeListener(this);
+            }
+        }
+    }
+
+    /**
+     * Listens to the state change of the location master switch.
+     */
+    @Override
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        if (isChecked) {
+            setLocationMode(Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
+        } else {
+            setLocationMode(Settings.Secure.LOCATION_MODE_OFF);
+        }
+    }
+}
diff --git a/src/com/android/settings/location/LocationSettingsBase.java b/src/com/android/settings/location/LocationSettingsBase.java
new file mode 100644
index 0000000..86c2ee5
--- /dev/null
+++ b/src/com/android/settings/location/LocationSettingsBase.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.location;
+
+import android.app.LoaderManager.LoaderCallbacks;
+import android.content.Context;
+import android.content.CursorLoader;
+import android.content.Intent;
+import android.content.Loader;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.util.Log;
+
+import com.android.settings.SettingsPreferenceFragment;
+
+/**
+ * A base class that listens to location settings change and modifies location
+ * settings.
+ */
+public abstract class LocationSettingsBase extends SettingsPreferenceFragment
+        implements LoaderCallbacks<Cursor> {
+    private static final String TAG = "LocationSettingsBase";
+    /** Broadcast intent action when the location mode is about to change. */
+    private static final String MODE_CHANGING_ACTION =
+            "com.android.settings.location.MODE_CHANGING";
+    private static final String CURRENT_MODE_KEY = "CURRENT_MODE";
+    private static final String NEW_MODE_KEY = "NEW_MODE";
+
+    private static final int LOADER_ID_LOCATION_MODE = 1;
+    private int mCurrentMode;
+
+    /**
+     * Whether the fragment is actively running.
+     */
+    private boolean mActive = false;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        getLoaderManager().initLoader(LOADER_ID_LOCATION_MODE, null, this);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mActive = true;
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mActive = false;
+    }
+
+    /** Called when location mode has changed. */
+    public abstract void onModeChanged(int mode, boolean restricted);
+
+    private boolean isRestricted() {
+        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        return um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION);
+    }
+
+    public void setLocationMode(int mode) {
+        if (isRestricted()) {
+            // Location toggling disabled by user restriction. Read the current location mode to
+            // update the location master switch.
+            if (Log.isLoggable(TAG, Log.INFO)) {
+                Log.i(TAG, "Restricted user, not setting location mode");
+            }
+            mode = Settings.Secure.getInt(getContentResolver(), Settings.Secure.LOCATION_MODE,
+                    Settings.Secure.LOCATION_MODE_OFF);
+            if (mActive) {
+                onModeChanged(mode, true);
+            }
+            return;
+        }
+        Intent intent = new Intent(MODE_CHANGING_ACTION);
+        intent.putExtra(CURRENT_MODE_KEY, mCurrentMode);
+        intent.putExtra(NEW_MODE_KEY, mode);
+        getActivity().sendBroadcast(intent, android.Manifest.permission.WRITE_SECURE_SETTINGS);
+        Settings.Secure.putInt(getContentResolver(), Settings.Secure.LOCATION_MODE, mode);
+        refreshLocationMode();
+    }
+
+    public void refreshLocationMode() {
+        if (mActive) {
+            int mode = Settings.Secure.getInt(getContentResolver(), Settings.Secure.LOCATION_MODE,
+                    Settings.Secure.LOCATION_MODE_OFF);
+            mCurrentMode = mode;
+            onModeChanged(mode, isRestricted());
+        }
+    }
+
+    @Override
+    public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+        switch (id) {
+            case LOADER_ID_LOCATION_MODE:
+                return new CursorLoader(getActivity(), Settings.Secure.CONTENT_URI, null,
+                        "(" + Settings.System.NAME + "=?)",
+                        new String[] { Settings.Secure.LOCATION_MODE }, null);
+            default:
+                return null;
+        }
+    }
+
+    @Override
+    public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+        refreshLocationMode();
+    }
+
+    @Override
+    public void onLoaderReset(Loader<Cursor> loader) {
+        // Nothing to do here.
+    }
+}
diff --git a/src/com/android/settings/location/RadioButtonPreference.java b/src/com/android/settings/location/RadioButtonPreference.java
new file mode 100644
index 0000000..5589dfa
--- /dev/null
+++ b/src/com/android/settings/location/RadioButtonPreference.java
@@ -0,0 +1,78 @@
+/*
+ * 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.location;
+
+import android.content.Context;
+import android.preference.CheckBoxPreference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+
+import com.android.settings.R;
+
+/**
+ * Check box preference with check box replaced by radio button.
+ *
+ * Functionally speaking, it's actually a CheckBoxPreference. We only modified
+ * the widget to RadioButton to make it "look like" a RadioButtonPreference.
+ *
+ * In other words, there's no "RadioButtonPreferenceGroup" in this
+ * implementation. When you check one RadioButtonPreference, if you want to
+ * uncheck all the other preferences, you should do that by code yourself.
+ */
+public class RadioButtonPreference extends CheckBoxPreference {
+    public interface OnClickListener {
+        public abstract void onRadioButtonClicked(RadioButtonPreference emiter);
+    }
+
+    private OnClickListener mListener = null;
+
+    public RadioButtonPreference(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        setWidgetLayoutResource(R.layout.preference_widget_radiobutton);
+    }
+
+    public RadioButtonPreference(Context context, AttributeSet attrs) {
+        this(context, attrs, com.android.internal.R.attr.checkBoxPreferenceStyle);
+    }
+
+    public RadioButtonPreference(Context context) {
+        this(context, null);
+    }
+
+    void setOnClickListener(OnClickListener listener) {
+        mListener = listener;
+    }
+
+    @Override
+    public void onClick() {
+        if (mListener != null) {
+            mListener.onRadioButtonClicked(this);
+        }
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        TextView title = (TextView) view.findViewById(android.R.id.title);
+        if (title != null) {
+            title.setSingleLine(false);
+            title.setMaxLines(3);
+        }
+    }
+}
diff --git a/src/com/android/settings/location/RecentLocationApps.java b/src/com/android/settings/location/RecentLocationApps.java
new file mode 100644
index 0000000..5708434
--- /dev/null
+++ b/src/com/android/settings/location/RecentLocationApps.java
@@ -0,0 +1,190 @@
+/*
+ * 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.location;
+
+import android.app.ActivityManager;
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.os.Process;
+import android.os.UserHandle;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settings.applications.InstalledAppDetails;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Retrieves the information of applications which accessed location recently.
+ */
+public class RecentLocationApps {
+    private static final String TAG = RecentLocationApps.class.getSimpleName();
+    private static final String ANDROID_SYSTEM_PACKAGE_NAME = "android";
+
+    private static final int RECENT_TIME_INTERVAL_MILLIS = 15 * 60 * 1000;
+
+    private final PreferenceActivity mActivity;
+    private final PackageManager mPackageManager;
+
+    public RecentLocationApps(PreferenceActivity activity) {
+        mActivity = activity;
+        mPackageManager = activity.getPackageManager();
+    }
+
+    private class PackageEntryClickedListener
+            implements Preference.OnPreferenceClickListener {
+        private String mPackage;
+
+        public PackageEntryClickedListener(String packageName) {
+            mPackage = packageName;
+        }
+
+        @Override
+        public boolean onPreferenceClick(Preference preference) {
+            // start new fragment to display extended information
+            Bundle args = new Bundle();
+            args.putString(InstalledAppDetails.ARG_PACKAGE_NAME, mPackage);
+            mActivity.startPreferencePanel(InstalledAppDetails.class.getName(), args,
+                    R.string.application_info_label, null, null, 0);
+            return true;
+        }
+    }
+
+    private Preference createRecentLocationEntry(
+            Drawable icon,
+            CharSequence label,
+            boolean isHighBattery,
+            Preference.OnPreferenceClickListener listener) {
+        Preference pref = new Preference(mActivity);
+        pref.setIcon(icon);
+        pref.setTitle(label);
+        if (isHighBattery) {
+            pref.setSummary(R.string.location_high_battery_use);
+        } else {
+            pref.setSummary(R.string.location_low_battery_use);
+        }
+        pref.setOnPreferenceClickListener(listener);
+        return pref;
+    }
+
+    /**
+     * Fills a list of applications which queried location recently within
+     * specified time.
+     */
+    public List<Preference> getAppList() {
+        // Retrieve a location usage list from AppOps
+        AppOpsManager aoManager =
+                (AppOpsManager) mActivity.getSystemService(Context.APP_OPS_SERVICE);
+        List<AppOpsManager.PackageOps> appOps = aoManager.getPackagesForOps(
+                new int[] {
+                    AppOpsManager.OP_MONITOR_LOCATION,
+                    AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION,
+                });
+
+        // Process the AppOps list and generate a preference list.
+        ArrayList<Preference> prefs = new ArrayList<Preference>();
+        long now = System.currentTimeMillis();
+        for (AppOpsManager.PackageOps ops : appOps) {
+            // Don't show the Android System in the list - it's not actionable for the user.
+            // Also don't show apps belonging to background users.
+            int uid = ops.getUid();
+            boolean isAndroidOs = (uid == Process.SYSTEM_UID)
+                    && ANDROID_SYSTEM_PACKAGE_NAME.equals(ops.getPackageName());
+            if (!isAndroidOs && ActivityManager.getCurrentUser() == UserHandle.getUserId(uid)) {
+                Preference pref = getPreferenceFromOps(now, ops);
+                if (pref != null) {
+                    prefs.add(pref);
+                }
+            }
+        }
+
+        return prefs;
+    }
+
+    /**
+     * Creates a Preference entry for the given PackageOps.
+     *
+     * This method examines the time interval of the PackageOps first. If the PackageOps is older
+     * than the designated interval, this method ignores the PackageOps object and returns null.
+     * When the PackageOps is fresh enough, this method returns a Preference pointing to the App
+     * Info page for that package.
+     */
+    private Preference getPreferenceFromOps(long now, AppOpsManager.PackageOps ops) {
+        String packageName = ops.getPackageName();
+        List<AppOpsManager.OpEntry> entries = ops.getOps();
+        boolean highBattery = false;
+        boolean normalBattery = false;
+        // Earliest time for a location request to end and still be shown in list.
+        long recentLocationCutoffTime = now - RECENT_TIME_INTERVAL_MILLIS;
+        for (AppOpsManager.OpEntry entry : entries) {
+            if (entry.isRunning() || entry.getTime() >= recentLocationCutoffTime) {
+                switch (entry.getOp()) {
+                    case AppOpsManager.OP_MONITOR_LOCATION:
+                        normalBattery = true;
+                        break;
+                    case AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION:
+                        highBattery = true;
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+
+        if (!highBattery && !normalBattery) {
+            if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                Log.v(TAG, packageName + " hadn't used location within the time interval.");
+            }
+            return null;
+        }
+
+        // The package is fresh enough, continue.
+
+        Preference pref = null;
+        try {
+          ApplicationInfo appInfo = mPackageManager.getApplicationInfo(
+              packageName, PackageManager.GET_META_DATA);
+          // Multiple users can install the same package. Each user gets a different Uid for
+          // the same package.
+          //
+          // Here we retrieve the Uid with package name, that will be the Uid for that package
+          // associated with the current active user. If the Uid differs from the Uid in ops,
+          // that means this entry belongs to another inactive user and we should ignore that.
+          if (appInfo.uid == ops.getUid()) {
+            pref = createRecentLocationEntry(
+                mPackageManager.getApplicationIcon(appInfo),
+                mPackageManager.getApplicationLabel(appInfo),
+                highBattery,
+                new PackageEntryClickedListener(packageName));
+          } else if (Log.isLoggable(TAG, Log.VERBOSE)) {
+            Log.v(TAG, "package " + packageName + " with Uid " + ops.getUid() +
+                " belongs to another inactive account, ignored.");
+          }
+        } catch (PackageManager.NameNotFoundException e) {
+          Log.wtf(TAG, "Package not found: " + packageName, e);
+        }
+
+        return pref;
+    }
+}
diff --git a/src/com/android/settings/location/SettingsInjector.java b/src/com/android/settings/location/SettingsInjector.java
new file mode 100644
index 0000000..b919080
--- /dev/null
+++ b/src/com/android/settings/location/SettingsInjector.java
@@ -0,0 +1,469 @@
+/*
+ * 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.location;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.content.res.XmlResourceParser;
+import android.graphics.drawable.Drawable;
+import android.location.SettingInjectorService;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.os.Messenger;
+import android.os.SystemClock;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.Xml;
+import com.android.settings.R;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Adds the preferences specified by the {@link InjectedSetting} objects to a preference group.
+ *
+ * Duplicates some code from {@link android.content.pm.RegisteredServicesCache}. We do not use that
+ * class directly because it is not a good match for our use case: we do not need the caching, and
+ * so do not want the additional resource hit at app install/upgrade time; and we would have to
+ * suppress the tie-breaking between multiple services reporting settings with the same name.
+ * Code-sharing would require extracting {@link
+ * android.content.pm.RegisteredServicesCache#parseServiceAttributes(android.content.res.Resources,
+ * String, android.util.AttributeSet)} into an interface, which didn't seem worth it.
+ */
+class SettingsInjector {
+    static final String TAG = "SettingsInjector";
+
+    /**
+     * If reading the status of a setting takes longer than this, we go ahead and start reading
+     * the next setting.
+     */
+    private static final long INJECTED_STATUS_UPDATE_TIMEOUT_MILLIS = 1000;
+
+    /**
+     * {@link Message#what} value for starting to load status values
+     * in case we aren't already in the process of loading them.
+     */
+    private static final int WHAT_RELOAD = 1;
+
+    /**
+     * {@link Message#what} value sent after receiving a status message.
+     */
+    private static final int WHAT_RECEIVED_STATUS = 2;
+
+    /**
+     * {@link Message#what} value sent after the timeout waiting for a status message.
+     */
+    private static final int WHAT_TIMEOUT = 3;
+
+    private final Context mContext;
+
+    /**
+     * The settings that were injected
+     */
+    private final Set<Setting> mSettings;
+
+    private final Handler mHandler;
+
+    public SettingsInjector(Context context) {
+        mContext = context;
+        mSettings = new HashSet<Setting>();
+        mHandler = new StatusLoadingHandler();
+    }
+
+    /**
+     * Returns a list with one {@link InjectedSetting} object for each {@link android.app.Service}
+     * that responds to {@link SettingInjectorService#ACTION_SERVICE_INTENT} and provides the
+     * expected setting metadata.
+     *
+     * Duplicates some code from {@link android.content.pm.RegisteredServicesCache}.
+     *
+     * TODO: unit test
+     */
+    private List<InjectedSetting> getSettings() {
+        PackageManager pm = mContext.getPackageManager();
+        Intent intent = new Intent(SettingInjectorService.ACTION_SERVICE_INTENT);
+
+        List<ResolveInfo> resolveInfos =
+                pm.queryIntentServices(intent, PackageManager.GET_META_DATA);
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log.d(TAG, "Found services: " + resolveInfos);
+        }
+        List<InjectedSetting> settings = new ArrayList<InjectedSetting>(resolveInfos.size());
+        for (ResolveInfo resolveInfo : resolveInfos) {
+            try {
+                InjectedSetting setting = parseServiceInfo(resolveInfo, pm);
+                if (setting == null) {
+                    Log.w(TAG, "Unable to load service info " + resolveInfo);
+                } else {
+                    settings.add(setting);
+                }
+            } catch (XmlPullParserException e) {
+                Log.w(TAG, "Unable to load service info " + resolveInfo, e);
+            } catch (IOException e) {
+                Log.w(TAG, "Unable to load service info " + resolveInfo, e);
+            }
+        }
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log.d(TAG, "Loaded settings: " + settings);
+        }
+
+        return settings;
+    }
+
+    /**
+     * Returns the settings parsed from the attributes of the
+     * {@link SettingInjectorService#META_DATA_NAME} tag, or null.
+     *
+     * Duplicates some code from {@link android.content.pm.RegisteredServicesCache}.
+     */
+    private static InjectedSetting parseServiceInfo(ResolveInfo service, PackageManager pm)
+            throws XmlPullParserException, IOException {
+
+        ServiceInfo si = service.serviceInfo;
+        ApplicationInfo ai = si.applicationInfo;
+
+        if ((ai.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
+            if (Log.isLoggable(TAG, Log.WARN)) {
+                Log.w(TAG, "Ignoring attempt to inject setting from app not in system image: "
+                        + service);
+                return null;
+            }
+        }
+
+        XmlResourceParser parser = null;
+        try {
+            parser = si.loadXmlMetaData(pm, SettingInjectorService.META_DATA_NAME);
+            if (parser == null) {
+                throw new XmlPullParserException("No " + SettingInjectorService.META_DATA_NAME
+                        + " meta-data for " + service + ": " + si);
+            }
+
+            AttributeSet attrs = Xml.asAttributeSet(parser);
+
+            int type;
+            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
+                    && type != XmlPullParser.START_TAG) {
+            }
+
+            String nodeName = parser.getName();
+            if (!SettingInjectorService.ATTRIBUTES_NAME.equals(nodeName)) {
+                throw new XmlPullParserException("Meta-data does not start with "
+                        + SettingInjectorService.ATTRIBUTES_NAME + " tag");
+            }
+
+            Resources res = pm.getResourcesForApplication(ai);
+            return parseAttributes(si.packageName, si.name, res, attrs);
+        } catch (PackageManager.NameNotFoundException e) {
+            throw new XmlPullParserException(
+                    "Unable to load resources for package " + si.packageName);
+        } finally {
+            if (parser != null) {
+                parser.close();
+            }
+        }
+    }
+
+    /**
+     * Returns an immutable representation of the static attributes for the setting, or null.
+     */
+    private static InjectedSetting parseAttributes(
+            String packageName, String className, Resources res, AttributeSet attrs) {
+
+        TypedArray sa = res.obtainAttributes(attrs, android.R.styleable.SettingInjectorService);
+        try {
+            // Note that to help guard against malicious string injection, we do not allow dynamic
+            // specification of the label (setting title)
+            final String title = sa.getString(android.R.styleable.SettingInjectorService_title);
+            final int iconId =
+                    sa.getResourceId(android.R.styleable.SettingInjectorService_icon, 0);
+            final String settingsActivity =
+                    sa.getString(android.R.styleable.SettingInjectorService_settingsActivity);
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+                Log.d(TAG, "parsed title: " + title + ", iconId: " + iconId
+                        + ", settingsActivity: " + settingsActivity);
+            }
+            return InjectedSetting.newInstance(packageName, className,
+                    title, iconId, settingsActivity);
+        } finally {
+            sa.recycle();
+        }
+    }
+
+    /**
+     * Gets a list of preferences that other apps have injected.
+     */
+    public List<Preference> getInjectedSettings() {
+        Iterable<InjectedSetting> settings = getSettings();
+        ArrayList<Preference> prefs = new ArrayList<Preference>();
+        for (InjectedSetting setting : settings) {
+            Preference pref = addServiceSetting(prefs, setting);
+            mSettings.add(new Setting(setting, pref));
+        }
+
+        reloadStatusMessages();
+
+        return prefs;
+    }
+
+    /**
+     * Reloads the status messages for all the preference items.
+     */
+    public void reloadStatusMessages() {
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log.d(TAG, "reloadingStatusMessages: " + mSettings);
+        }
+        mHandler.sendMessage(mHandler.obtainMessage(WHAT_RELOAD));
+    }
+
+    /**
+     * Adds an injected setting to the root with status "Loading...".
+     */
+    private Preference addServiceSetting(List<Preference> prefs, InjectedSetting info) {
+        Preference pref = new Preference(mContext);
+        pref.setTitle(info.title);
+        pref.setSummary(R.string.location_loading_injected_setting);
+        PackageManager pm = mContext.getPackageManager();
+        Drawable icon = pm.getDrawable(info.packageName, info.iconId, null);
+        pref.setIcon(icon);
+
+        Intent settingIntent = new Intent();
+        settingIntent.setClassName(info.packageName, info.settingsActivity);
+        pref.setIntent(settingIntent);
+
+        prefs.add(pref);
+        return pref;
+    }
+
+    /**
+     * Loads the setting status values one at a time. Each load starts a subclass of {@link
+     * SettingInjectorService}, so to reduce memory pressure we don't want to load too many at
+     * once.
+     */
+    private final class StatusLoadingHandler extends Handler {
+
+        /**
+         * Settings whose status values need to be loaded. A set is used to prevent redundant loads.
+         */
+        private Set<Setting> mSettingsToLoad = new HashSet<Setting>();
+
+        /**
+         * Settings that are being loaded now and haven't timed out. In practice this should have
+         * zero or one elements.
+         */
+        private Set<Setting> mSettingsBeingLoaded = new HashSet<Setting>();
+
+        /**
+         * Settings that are being loaded but have timed out. If only one setting has timed out, we
+         * will go ahead and start loading the next setting so that one slow load won't delay the
+         * load of the other settings.
+         */
+        private Set<Setting> mTimedOutSettings = new HashSet<Setting>();
+
+        private boolean mReloadRequested;
+
+        @Override
+        public void handleMessage(Message msg) {
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+                Log.d(TAG, "handleMessage start: " + msg + ", " + this);
+            }
+
+            // Update state in response to message
+            switch (msg.what) {
+                case WHAT_RELOAD:
+                    mReloadRequested = true;
+                    break;
+                case WHAT_RECEIVED_STATUS:
+                    final Setting receivedSetting = (Setting) msg.obj;
+                    receivedSetting.maybeLogElapsedTime();
+                    mSettingsBeingLoaded.remove(receivedSetting);
+                    mTimedOutSettings.remove(receivedSetting);
+                    removeMessages(WHAT_TIMEOUT, receivedSetting);
+                    break;
+                case WHAT_TIMEOUT:
+                    final Setting timedOutSetting = (Setting) msg.obj;
+                    mSettingsBeingLoaded.remove(timedOutSetting);
+                    mTimedOutSettings.add(timedOutSetting);
+                    if (Log.isLoggable(TAG, Log.WARN)) {
+                        Log.w(TAG, "Timed out after " + timedOutSetting.getElapsedTime()
+                                + " millis trying to get status for: " + timedOutSetting);
+                    }
+                    break;
+                default:
+                    Log.wtf(TAG, "Unexpected what: " + msg);
+            }
+
+            // Decide whether to load additional settings based on the new state. Start by seeing
+            // if we have headroom to load another setting.
+            if (mSettingsBeingLoaded.size() > 0 || mTimedOutSettings.size() > 1) {
+                // Don't load any more settings until one of the pending settings has completed.
+                // To reduce memory pressure, we want to be loading at most one setting (plus at
+                // most one timed-out setting) at a time. This means we'll be responsible for
+                // bringing in at most two services.
+                if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                    Log.v(TAG, "too many services already live for " + msg + ", " + this);
+                }
+                return;
+            }
+
+            if (mReloadRequested && mSettingsToLoad.isEmpty() && mSettingsBeingLoaded.isEmpty()
+                    && mTimedOutSettings.isEmpty()) {
+                if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                    Log.v(TAG, "reloading because idle and reload requesteed " + msg + ", " + this);
+                }
+                // Reload requested, so must reload all settings
+                mSettingsToLoad.addAll(mSettings);
+                mReloadRequested = false;
+            }
+
+            // Remove the next setting to load from the queue, if any
+            Iterator<Setting> iter = mSettingsToLoad.iterator();
+            if (!iter.hasNext()) {
+                if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                    Log.v(TAG, "nothing left to do for " + msg + ", " + this);
+                }
+                return;
+            }
+            Setting setting = iter.next();
+            iter.remove();
+
+            // Request the status value
+            setting.startService();
+            mSettingsBeingLoaded.add(setting);
+
+            // Ensure that if receiving the status value takes too long, we start loading the
+            // next value anyway
+            Message timeoutMsg = obtainMessage(WHAT_TIMEOUT, setting);
+            sendMessageDelayed(timeoutMsg, INJECTED_STATUS_UPDATE_TIMEOUT_MILLIS);
+
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+                Log.d(TAG, "handleMessage end " + msg + ", " + this
+                        + ", started loading " + setting);
+            }
+        }
+
+        @Override
+        public String toString() {
+            return "StatusLoadingHandler{" +
+                    "mSettingsToLoad=" + mSettingsToLoad +
+                    ", mSettingsBeingLoaded=" + mSettingsBeingLoaded +
+                    ", mTimedOutSettings=" + mTimedOutSettings +
+                    ", mReloadRequested=" + mReloadRequested +
+                    '}';
+        }
+    }
+
+    /**
+     * Represents an injected setting and the corresponding preference.
+     */
+    private final class Setting {
+
+        public final InjectedSetting setting;
+        public final Preference preference;
+        public long startMillis;
+
+        private Setting(InjectedSetting setting, Preference preference) {
+            this.setting = setting;
+            this.preference = preference;
+        }
+
+        @Override
+        public String toString() {
+            return "Setting{" +
+                    "setting=" + setting +
+                    ", preference=" + preference +
+                    '}';
+        }
+
+        /**
+         * Returns true if they both have the same {@link #setting} value. Ignores mutable
+         * {@link #preference} and {@link #startMillis} so that it's safe to use in sets.
+         */
+        @Override
+        public boolean equals(Object o) {
+            return this == o || o instanceof Setting && setting.equals(((Setting) o).setting);
+        }
+
+        @Override
+        public int hashCode() {
+            return setting.hashCode();
+        }
+
+        /**
+         * Starts the service to fetch for the current status for the setting, and updates the
+         * preference when the service replies.
+         */
+        public void startService() {
+            Handler handler = new Handler() {
+                @Override
+                public void handleMessage(Message msg) {
+                    Bundle bundle = msg.getData();
+                    String summary = bundle.getString(SettingInjectorService.SUMMARY_KEY);
+                    boolean enabled = bundle.getBoolean(SettingInjectorService.ENABLED_KEY, true);
+                    if (Log.isLoggable(TAG, Log.DEBUG)) {
+                        Log.d(TAG, setting + ": received " + msg + ", bundle: " + bundle);
+                    }
+                    preference.setSummary(summary);
+                    preference.setEnabled(enabled);
+                    mHandler.sendMessage(
+                            mHandler.obtainMessage(WHAT_RECEIVED_STATUS, Setting.this));
+                }
+            };
+            Messenger messenger = new Messenger(handler);
+
+            Intent intent = setting.getServiceIntent();
+            intent.putExtra(SettingInjectorService.MESSENGER_KEY, messenger);
+
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+                Log.d(TAG, setting + ": sending update intent: " + intent
+                        + ", handler: " + handler);
+                startMillis = SystemClock.elapsedRealtime();
+            } else {
+                startMillis = 0;
+            }
+
+            // Start the service, making sure that this is attributed to the current user rather
+            // than the system user.
+            mContext.startServiceAsUser(intent, android.os.Process.myUserHandle());
+        }
+
+        public long getElapsedTime() {
+            long end = SystemClock.elapsedRealtime();
+            return end - startMillis;
+        }
+
+        public void maybeLogElapsedTime() {
+            if (Log.isLoggable(TAG, Log.DEBUG) && startMillis != 0) {
+                long elapsed = getElapsedTime();
+                Log.d(TAG, this + " update took " + elapsed + " millis");
+            }
+        }
+    }
+}
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/net/UidDetailProvider.java b/src/com/android/settings/net/UidDetailProvider.java
index dd2b8c0..aca3e5d 100644
--- a/src/com/android/settings/net/UidDetailProvider.java
+++ b/src/com/android/settings/net/UidDetailProvider.java
@@ -21,20 +21,31 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
 import android.net.TrafficStats;
+import android.os.UserManager;
 import android.text.TextUtils;
 import android.util.SparseArray;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
+import com.android.settings.users.UserUtils;
 
+/**
+ * Return details about a specific UID, handling special cases like
+ * {@link TrafficStats#UID_TETHERING} and {@link UserInfo}.
+ */
 public class UidDetailProvider {
     private final Context mContext;
     private final SparseArray<UidDetail> mUidDetailCache;
 
+    public static int buildKeyForUser(int userHandle) {
+        return -(2000 + userHandle);
+    }
+
     public UidDetailProvider(Context context) {
         mContext = context.getApplicationContext();
         mUidDetailCache = new SparseArray<UidDetail>();
@@ -90,7 +101,9 @@
                 detail.icon = pm.getDefaultActivityIcon();
                 return detail;
             case TrafficStats.UID_REMOVED:
-                detail.label = res.getString(R.string.data_usage_uninstalled_apps);
+                detail.label = res.getString(UserManager.supportsMultipleUsers()
+                        ? R.string.data_usage_uninstalled_apps_users
+                        : R.string.data_usage_uninstalled_apps);
                 detail.icon = pm.getDefaultActivityIcon();
                 return detail;
             case TrafficStats.UID_TETHERING:
@@ -101,10 +114,21 @@
                 return detail;
         }
 
+        // Handle keys that are actually user handles
+        if (uid <= -2000) {
+            final int userHandle = (-uid) - 2000;
+            final UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+            final UserInfo info = um.getUserInfo(userHandle);
+            if (info != null) {
+                detail.label = res.getString(R.string.running_process_item_user_label, info.name);
+                detail.icon = UserUtils.getUserIcon(mContext, um, info, res);
+                return detail;
+            }
+        }
+
         // otherwise fall back to using packagemanager labels
         final String[] packageNames = pm.getPackagesForUid(uid);
         final int length = packageNames != null ? packageNames.length : 0;
-
         try {
             if (length == 1) {
                 final ApplicationInfo info = pm.getApplicationInfo(packageNames[0], 0);
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
index a6bd037..158ca78 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -35,10 +35,9 @@
 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) {
@@ -48,19 +47,17 @@
         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.RIGHT));
-                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);
@@ -77,6 +74,15 @@
         return mView;
     }
 
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        getActivity().getActionBar().setCustomView(null);
+        if (mOldActivityTitle != null) {
+            getActivity().getActionBar().setTitle(mOldActivityTitle);
+        }
+    }
+
     private void initView(View view) {
         mActionBarSwitch.setOnCheckedChangeListener(this);
         mActionBarSwitch.setChecked(mNfcAdapter.isNdefPushEnabled());
diff --git a/src/com/android/settings/nfc/PaymentBackend.java b/src/com/android/settings/nfc/PaymentBackend.java
new file mode 100644
index 0000000..f84bc74
--- /dev/null
+++ b/src/com/android/settings/nfc/PaymentBackend.java
@@ -0,0 +1,92 @@
+/*
+ * 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.nfc;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
+import android.nfc.NfcAdapter;
+import android.nfc.cardemulation.ApduServiceInfo;
+import android.nfc.cardemulation.CardEmulation;
+import android.provider.Settings;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PaymentBackend {
+    public static final String TAG = "Settings.PaymentBackend";
+
+    public static class PaymentAppInfo {
+        CharSequence caption;
+        Drawable banner;
+        boolean isDefault;
+        public ComponentName componentName;
+    }
+
+    private final Context mContext;
+    private final NfcAdapter mAdapter;
+    private final CardEmulation mCardEmuManager;
+
+    public PaymentBackend(Context context) {
+        mContext = context;
+
+        mAdapter = NfcAdapter.getDefaultAdapter(context);
+        mCardEmuManager = CardEmulation.getInstance(mAdapter);
+    }
+
+    public List<PaymentAppInfo> getPaymentAppInfos() {
+        PackageManager pm = mContext.getPackageManager();
+        List<ApduServiceInfo> serviceInfos =
+                mCardEmuManager.getServices(CardEmulation.CATEGORY_PAYMENT);
+        List<PaymentAppInfo> appInfos = new ArrayList<PaymentAppInfo>();
+
+        if (serviceInfos == null) return appInfos;
+
+        ComponentName defaultApp = getDefaultPaymentApp();
+
+        for (ApduServiceInfo service : serviceInfos) {
+            PaymentAppInfo appInfo = new PaymentAppInfo();
+            appInfo.banner = service.loadBanner(pm);
+            appInfo.caption = service.getDescription();
+            if (appInfo.caption == null) {
+                appInfo.caption = service.loadLabel(pm);
+            }
+            appInfo.isDefault = service.getComponent().equals(defaultApp);
+            appInfo.componentName = service.getComponent();
+            appInfos.add(appInfo);
+        }
+
+        return appInfos;
+    }
+
+    ComponentName getDefaultPaymentApp() {
+        String componentString = Settings.Secure.getString(mContext.getContentResolver(),
+                Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT);
+        if (componentString != null) {
+            return ComponentName.unflattenFromString(componentString);
+        } else {
+            return null;
+        }
+    }
+
+    public void setDefaultPaymentApp(ComponentName app) {
+        Settings.Secure.putString(mContext.getContentResolver(),
+                Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT,
+                app != null ? app.flattenToString() : null);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/nfc/PaymentDefaultDialog.java b/src/com/android/settings/nfc/PaymentDefaultDialog.java
new file mode 100644
index 0000000..61c6fdb
--- /dev/null
+++ b/src/com/android/settings/nfc/PaymentDefaultDialog.java
@@ -0,0 +1,139 @@
+/*
+ * 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.nfc;
+
+import android.content.ComponentName;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.nfc.cardemulation.ApduServiceInfo;
+import android.nfc.cardemulation.CardEmulation;
+import android.nfc.cardemulation.HostApduService;
+import android.nfc.cardemulation.OffHostApduService;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.android.internal.app.AlertActivity;
+import com.android.internal.app.AlertController;
+import com.android.settings.R;
+import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.xmlpull.v1.XmlPullParserException;
+
+public final class PaymentDefaultDialog extends AlertActivity implements
+        DialogInterface.OnClickListener {
+
+    public static final String TAG = "PaymentDefaultDialog";
+
+    private PaymentBackend mBackend;
+    private ComponentName mNewDefault;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mBackend = new PaymentBackend(this);
+        Intent intent = getIntent();
+        ComponentName component = intent.getParcelableExtra(
+                CardEmulation.EXTRA_SERVICE_COMPONENT);
+        String category = intent.getStringExtra(CardEmulation.EXTRA_CATEGORY);
+
+        setResult(RESULT_CANCELED);
+        if (!buildDialog(component, category)) {
+            finish();
+        }
+
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        switch (which) {
+            case BUTTON_POSITIVE:
+                mBackend.setDefaultPaymentApp(mNewDefault);
+                setResult(RESULT_OK);
+                break;
+            case BUTTON_NEGATIVE:
+                break;
+        }
+    }
+
+    private boolean buildDialog(ComponentName component, String category) {
+        if (component == null || category == null) {
+            Log.e(TAG, "Component or category are null");
+            return false;
+        }
+
+        if (!CardEmulation.CATEGORY_PAYMENT.equals(category)) {
+            Log.e(TAG, "Don't support defaults for category " + category);
+            return false;
+        }
+
+        // Check if passed in service exists
+        PaymentAppInfo requestedPaymentApp = null;
+        PaymentAppInfo defaultPaymentApp = null;
+
+        List<PaymentAppInfo> services = mBackend.getPaymentAppInfos();
+        for (PaymentAppInfo service : services) {
+            if (component.equals(service.componentName)) {
+                requestedPaymentApp = service;
+            }
+            if (service.isDefault) {
+                defaultPaymentApp = service;
+            }
+        }
+
+        if (requestedPaymentApp == null) {
+            Log.e(TAG, "Component " + component + " is not a registered payment service.");
+            return false;
+        }
+
+        // Get current mode and default component
+        ComponentName defaultComponent = mBackend.getDefaultPaymentApp();
+        if (defaultComponent != null && defaultComponent.equals(component)) {
+            Log.e(TAG, "Component " + component + " is already default.");
+            return false;
+        }
+
+        mNewDefault = component;
+        // Compose dialog; get
+        final AlertController.AlertParams p = mAlertParams;
+        p.mTitle = getString(R.string.nfc_payment_set_default_label);
+        if (defaultPaymentApp == null) {
+            String formatString = getString(R.string.nfc_payment_set_default);
+            String msg = String.format(formatString, requestedPaymentApp.caption);
+            p.mMessage = msg;
+        } else {
+            String formatString = getString(R.string.nfc_payment_set_default_instead_of);
+            String msg = String.format(formatString, requestedPaymentApp.caption,
+                    defaultPaymentApp.caption);
+            p.mMessage = msg;
+        }
+        p.mPositiveButtonText = getString(R.string.yes);
+        p.mNegativeButtonText = getString(R.string.no);
+        p.mPositiveButtonListener = this;
+        p.mNegativeButtonListener = this;
+        setupAlert();
+
+        return true;
+    }
+
+}
diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java
new file mode 100644
index 0000000..7548c50
--- /dev/null
+++ b/src/com/android/settings/nfc/PaymentSettings.java
@@ -0,0 +1,220 @@
+/*
+ * 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.nfc;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.preference.Preference;
+import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.RadioButton;
+import android.widget.TextView;
+
+import com.android.internal.content.PackageMonitor;
+import com.android.settings.HelpUtils;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
+
+import java.util.List;
+
+public class PaymentSettings extends SettingsPreferenceFragment implements
+        OnClickListener {
+    public static final String TAG = "PaymentSettings";
+    private LayoutInflater mInflater;
+    private PaymentBackend mPaymentBackend;
+    private final PackageMonitor mSettingsPackageMonitor = new SettingsPackageMonitor();
+
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mPaymentBackend = new PaymentBackend(getActivity());
+        mInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        setHasOptionsMenu(true);
+    }
+
+    public void refresh() {
+        PreferenceManager manager = getPreferenceManager();
+        PreferenceScreen screen = manager.createPreferenceScreen(getActivity());
+        // Get all payment services
+        List<PaymentAppInfo> appInfos = mPaymentBackend.getPaymentAppInfos();
+        if (appInfos != null && appInfos.size() > 0) {
+            // Add all payment apps
+            for (PaymentAppInfo appInfo : appInfos) {
+                PaymentAppPreference preference =
+                        new PaymentAppPreference(getActivity(), appInfo, this);
+                preference.setTitle(appInfo.caption);
+                if (appInfo.banner != null) {
+                    screen.addPreference(preference);
+                } else {
+                    // Ignore, no banner
+                    Log.e(TAG, "Couldn't load banner drawable of service " + appInfo.componentName);
+                }
+            }
+        }
+        TextView emptyText = (TextView) getView().findViewById(R.id.nfc_payment_empty_text);
+        TextView learnMore = (TextView) getView().findViewById(R.id.nfc_payment_learn_more);
+        ImageView emptyImage = (ImageView) getView().findViewById(R.id.nfc_payment_tap_image);
+        if (screen.getPreferenceCount() == 0) {
+            emptyText.setVisibility(View.VISIBLE);
+            learnMore.setVisibility(View.VISIBLE);
+            emptyImage.setVisibility(View.VISIBLE);
+            getListView().setVisibility(View.GONE);
+        } else {
+            emptyText.setVisibility(View.GONE);
+            learnMore.setVisibility(View.GONE);
+            emptyImage.setVisibility(View.GONE);
+            getListView().setVisibility(View.VISIBLE);
+        }
+        setPreferenceScreen(screen);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        View v = mInflater.inflate(R.layout.nfc_payment, container, false);
+        TextView learnMore = (TextView) v.findViewById(R.id.nfc_payment_learn_more);
+        learnMore.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String helpUrl;
+                if (!TextUtils.isEmpty(helpUrl = getResources().getString(
+                        R.string.help_url_nfc_payment))) {
+                    final Uri fullUri = HelpUtils.uriWithAddedParameters(
+                            PaymentSettings.this.getActivity(), Uri.parse(helpUrl));
+                    Intent intent = new Intent(Intent.ACTION_VIEW, fullUri);
+                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                            | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+                    startActivity(intent);
+                } else {
+                    Log.e(TAG, "Help url not set.");
+                }
+            }
+        });
+        return v;
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getTag() instanceof PaymentAppInfo) {
+            PaymentAppInfo appInfo = (PaymentAppInfo) v.getTag();
+            if (appInfo.componentName != null) {
+                mPaymentBackend.setDefaultPaymentApp(appInfo.componentName);
+            }
+            refresh();
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
+        refresh();
+    }
+
+    @Override
+    public void onPause() {
+        mSettingsPackageMonitor.unregister();
+        super.onPause();
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        String searchUri = Settings.Secure.getString(getContentResolver(),
+                Settings.Secure.PAYMENT_SERVICE_SEARCH_URI);
+        if (!TextUtils.isEmpty(searchUri)) {
+            MenuItem menuItem = menu.add(R.string.nfc_payment_menu_item_add_service);
+            menuItem.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            menuItem.setIntent(new Intent(Intent.ACTION_VIEW,Uri.parse(searchUri)));
+        }
+    }
+
+    private final Handler mHandler = new Handler() {
+        @Override
+        public void dispatchMessage(Message msg) {
+            refresh();
+        }
+    };
+
+    private class SettingsPackageMonitor extends PackageMonitor {
+        @Override
+        public void onPackageAdded(String packageName, int uid) {
+           mHandler.obtainMessage().sendToTarget();
+        }
+
+        @Override
+        public void onPackageAppeared(String packageName, int reason) {
+            mHandler.obtainMessage().sendToTarget();
+        }
+
+        @Override
+        public void onPackageDisappeared(String packageName, int reason) {
+            mHandler.obtainMessage().sendToTarget();
+        }
+
+        @Override
+        public void onPackageRemoved(String packageName, int uid) {
+            mHandler.obtainMessage().sendToTarget();
+        }
+    }
+
+    public static class PaymentAppPreference extends Preference {
+        private final OnClickListener listener;
+        private final PaymentAppInfo appInfo;
+
+        public PaymentAppPreference(Context context, PaymentAppInfo appInfo,
+                OnClickListener listener) {
+            super(context);
+            setLayoutResource(R.layout.nfc_payment_option);
+            this.appInfo = appInfo;
+            this.listener = listener;
+        }
+
+        @Override
+        protected void onBindView(View view) {
+            super.onBindView(view);
+
+            view.setOnClickListener(listener);
+            view.setTag(appInfo);
+
+            RadioButton radioButton = (RadioButton) view.findViewById(android.R.id.button1);
+            radioButton.setChecked(appInfo.isDefault);
+
+            ImageView banner = (ImageView) view.findViewById(R.id.banner);
+            banner.setImageDrawable(appInfo.banner);
+        }
+    }
+}
diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java
new file mode 100644
index 0000000..cfb4cb2
--- /dev/null
+++ b/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -0,0 +1,218 @@
+/*
+ * 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.print;
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.print.PrintJob;
+import android.print.PrintJobId;
+import android.print.PrintJobInfo;
+import android.print.PrintManager;
+import android.print.PrintManager.PrintJobStateChangeListener;
+import android.text.TextUtils;
+import android.text.format.DateUtils;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+import java.text.DateFormat;
+
+/**
+ * Fragment for management of a print job.
+ */
+public class PrintJobSettingsFragment extends SettingsPreferenceFragment {
+    private static final int MENU_ITEM_ID_CANCEL = 1;
+    private static final int MENU_ITEM_ID_RESTART = 2;
+
+    private static final String EXTRA_PRINT_JOB_ID = "EXTRA_PRINT_JOB_ID";
+
+    private static final String PRINT_JOB_PREFERENCE = "print_job_preference";
+    private static final String PRINT_JOB_MESSAGE_PREFERENCE = "print_job_message_preference";
+
+    private Drawable mListDivider;
+
+    private final PrintJobStateChangeListener mPrintJobStateChangeListener =
+            new PrintJobStateChangeListener() {
+        @Override
+        public void onPrintJobStateChanged(PrintJobId printJobId) {
+            updateUi();
+        }
+    };
+
+    private PrintManager mPrintManager;
+
+    private Preference mPrintJobPreference;
+    private Preference mMessagePreference;
+
+    private PrintJobId mPrintJobId;
+    private PrintJob mPrintJob;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        addPreferencesFromResource(R.xml.print_job_settings);
+        mPrintJobPreference = findPreference(PRINT_JOB_PREFERENCE);
+        mMessagePreference = findPreference(PRINT_JOB_MESSAGE_PREFERENCE);
+
+        mPrintManager = ((PrintManager) getActivity().getSystemService(
+                Context.PRINT_SERVICE)).getGlobalPrintManagerForUser(
+                        ActivityManager.getCurrentUser());
+
+        getActivity().setTitle(R.string.print_print_job);
+
+        processArguments();
+
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        getListView().setEnabled(false);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mPrintManager.addPrintJobStateChangeListener(
+                mPrintJobStateChangeListener);
+        updateUi();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mPrintManager.removePrintJobStateChangeListener(
+                mPrintJobStateChangeListener);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+
+        MenuItem cancel = menu.add(0, MENU_ITEM_ID_CANCEL, Menu.NONE,
+                getString(R.string.print_cancel));
+        cancel.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+
+        if (mPrintJob.isFailed()) {
+            MenuItem restart = menu.add(0, MENU_ITEM_ID_RESTART, Menu.NONE,
+                    getString(R.string.print_restart));
+            restart.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case MENU_ITEM_ID_CANCEL: {
+                mPrintJob.cancel();
+                finish();
+                return true;
+            }
+
+            case MENU_ITEM_ID_RESTART: {
+                mPrintJob.restart();
+                finish();
+                return true;
+            }
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void processArguments() {
+        String printJobId = getArguments().getString(EXTRA_PRINT_JOB_ID);
+        mPrintJobId = PrintJobId.unflattenFromString(printJobId);
+        if (mPrintJobId == null) {
+            finish();
+        }
+    }
+
+    private void updateUi() {
+        mPrintJob = mPrintManager.getPrintJob(mPrintJobId);
+
+        if (mPrintJob == null) {
+            finish();
+            return;
+        }
+
+        if (mPrintJob.isCancelled() || mPrintJob.isCompleted()) {
+            finish();
+            return;
+        }
+
+        PrintJobInfo info = mPrintJob.getInfo();
+
+        switch (info.getState()) {
+            case PrintJobInfo.STATE_QUEUED:
+            case PrintJobInfo.STATE_STARTED: {
+                mPrintJobPreference.setTitle(getString(
+                        R.string.print_printing_state_title_template, info.getLabel()));
+            } break;
+
+            case PrintJobInfo.STATE_FAILED: {
+                mPrintJobPreference.setTitle(getString(
+                        R.string.print_failed_state_title_template, info.getLabel()));
+            } break;
+
+            case PrintJobInfo.STATE_BLOCKED: {
+                mPrintJobPreference.setTitle(getString(
+                        R.string.print_blocked_state_title_template, info.getLabel()));
+            } break;
+        }
+
+        mPrintJobPreference.setSummary(getString(R.string.print_job_summary,
+                info.getPrinterName(), DateUtils.formatSameDayTime(
+                        info.getCreationTime(), info.getCreationTime(), DateFormat.SHORT,
+                        DateFormat.SHORT)));
+
+        switch (info.getState()) {
+            case PrintJobInfo.STATE_QUEUED:
+            case PrintJobInfo.STATE_STARTED: {
+                mPrintJobPreference.setIcon(com.android.internal.R.drawable.ic_print);
+            } break;
+
+            case PrintJobInfo.STATE_FAILED:
+            case PrintJobInfo.STATE_BLOCKED: {
+                mPrintJobPreference.setIcon(com.android.internal.R.drawable.ic_print_error);
+            } break;
+        }
+
+        String stateReason = info.getStateReason();
+        if (!TextUtils.isEmpty(stateReason)) {
+            if (getPreferenceScreen().findPreference(PRINT_JOB_MESSAGE_PREFERENCE) == null) {
+                getPreferenceScreen().addPreference(mMessagePreference);
+            }
+            mMessagePreference.setSummary(stateReason);
+            getListView().setDivider(null);
+        } else {
+            getPreferenceScreen().removePreference(mMessagePreference);
+            getListView().setDivider(mListDivider);
+        }
+
+        getActivity().invalidateOptionsMenu();
+    }
+}
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
new file mode 100644
index 0000000..326dd78
--- /dev/null
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -0,0 +1,801 @@
+/*
+ * 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.print;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.LoaderManager;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.Loader;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
+import android.database.ContentObserver;
+import android.database.DataSetObserver;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.preference.PreferenceActivity;
+import android.print.PrintManager;
+import android.print.PrinterDiscoverySession;
+import android.print.PrinterDiscoverySession.OnPrintersChangeListener;
+import android.print.PrinterId;
+import android.print.PrinterInfo;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityManager;
+import android.widget.BaseAdapter;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.Filter;
+import android.widget.Filterable;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.SearchView;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.print.PrintSettingsFragment.ToggleSwitch;
+import com.android.settings.print.PrintSettingsFragment.ToggleSwitch.OnBeforeCheckedChangeListener;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+/**
+ * Fragment with print service settings.
+ */
+public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
+        implements DialogInterface.OnClickListener {
+
+    private static final int LOADER_ID_PRINTERS_LOADER = 1;
+
+    private static final int DIALOG_ID_ENABLE_WARNING = 1;
+
+    private final SettingsContentObserver mSettingsContentObserver =
+            new SettingsContentObserver(new Handler()) {
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            updateUiForServiceState();
+        }
+    };
+
+    private final DataSetObserver mDataObserver = new DataSetObserver() {
+        @Override
+        public void onChanged() {
+            invalidateOptionsMenuIfNeeded();
+            updateEmptyView();
+        }
+
+        @Override
+        public void onInvalidated() {
+            invalidateOptionsMenuIfNeeded();
+        }
+
+        private void invalidateOptionsMenuIfNeeded() {
+            final int unfilteredItemCount = mPrintersAdapter.getUnfilteredCount();
+            if ((mLastUnfilteredItemCount <= 0 && unfilteredItemCount > 0)
+                    || mLastUnfilteredItemCount > 0 && unfilteredItemCount <= 0) {
+                getActivity().invalidateOptionsMenu();
+            }
+            mLastUnfilteredItemCount = unfilteredItemCount;
+        }
+    };
+
+    private ToggleSwitch mToggleSwitch;
+
+    private String mPreferenceKey;
+
+    private CharSequence mSettingsTitle;
+    private Intent mSettingsIntent;
+
+    private CharSequence mAddPrintersTitle;
+    private Intent mAddPrintersIntent;
+
+    private CharSequence mEnableWarningTitle;
+    private CharSequence mEnableWarningMessage;
+
+    private ComponentName mComponentName;
+
+    private PrintersAdapter mPrintersAdapter;
+
+    private int mLastUnfilteredItemCount;
+
+    private boolean mServiceEnabled;
+
+    private AnnounceFilterResult mAnnounceFilterResult;
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mSettingsContentObserver.register(getContentResolver());
+        updateEmptyView();
+        updateUiForServiceState();
+    }
+
+    @Override
+    public void onPause() {
+        mSettingsContentObserver.unregister(getContentResolver());
+        if (mAnnounceFilterResult != null) {
+            mAnnounceFilterResult.remove();
+        }
+        super.onPause();
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        initComponents();
+        updateUiForArguments();
+    }
+
+    @Override
+    public void onDestroyView() {
+        getActivity().getActionBar().setCustomView(null);
+        mToggleSwitch.setOnBeforeCheckedChangeListener(null);
+        super.onDestroyView();
+    }
+
+    private void onPreferenceToggled(String preferenceKey, boolean enabled) {
+        ComponentName service = ComponentName.unflattenFromString(preferenceKey);
+        List<ComponentName> services = SettingsUtils.readEnabledPrintServices(getActivity());
+        if (enabled) {
+            services.add(service);
+        } else {
+            services.remove(service);
+        }
+        SettingsUtils.writeEnabledPrintServices(getActivity(), services);
+    }
+
+    @Override
+    public Dialog onCreateDialog(int dialogId) {
+        CharSequence title = null;
+        CharSequence message = null;
+        switch (dialogId) {
+            case DIALOG_ID_ENABLE_WARNING:
+                title = mEnableWarningTitle;
+                message = mEnableWarningMessage;
+                break;
+            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();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        final boolean checked;
+        switch (which) {
+            case DialogInterface.BUTTON_POSITIVE:
+                checked = true;
+                mToggleSwitch.setCheckedInternal(checked);
+                getArguments().putBoolean(PrintSettingsFragment.EXTRA_CHECKED, checked);
+                onPreferenceToggled(mPreferenceKey, checked);
+                break;
+            case DialogInterface.BUTTON_NEGATIVE:
+                checked = false;
+                mToggleSwitch.setCheckedInternal(checked);
+                getArguments().putBoolean(PrintSettingsFragment.EXTRA_CHECKED, checked);
+                onPreferenceToggled(mPreferenceKey, checked);
+                break;
+            default:
+                throw new IllegalArgumentException();
+        }
+    }
+
+    private void updateEmptyView() {
+        ListView listView = getListView();
+        ViewGroup contentRoot = (ViewGroup) listView.getParent();
+        View emptyView = listView.getEmptyView();
+        if (!mToggleSwitch.isChecked()) {
+            if (emptyView != null && emptyView.getId() != R.id.empty_print_state) {
+                contentRoot.removeView(emptyView);
+                emptyView = null;
+            }
+            if (emptyView == null) {
+                emptyView = getActivity().getLayoutInflater().inflate(
+                        R.layout.empty_print_state, contentRoot, false);
+                emptyView.setContentDescription(getString(R.string.print_service_disabled));
+                TextView textView = (TextView) emptyView.findViewById(R.id.message);
+                textView.setText(R.string.print_service_disabled);
+                contentRoot.addView(emptyView);
+                listView.setEmptyView(emptyView);
+            }
+        } else if (mPrintersAdapter.getUnfilteredCount() <= 0) {
+            if (emptyView != null
+                    && emptyView.getId() != R.id.empty_printers_list_service_enabled) {
+                contentRoot.removeView(emptyView);
+                emptyView = null;
+            }
+            if (emptyView == null) {
+                emptyView = getActivity().getLayoutInflater().inflate(
+                        R.layout.empty_printers_list_service_enabled, contentRoot, false);
+                contentRoot.addView(emptyView);
+                listView.setEmptyView(emptyView);
+            }
+        } else if (mPrintersAdapter.getCount() <= 0) {
+            if (emptyView != null && emptyView.getId() != R.id.empty_print_state) {
+                contentRoot.removeView(emptyView);
+                emptyView = null;
+            }
+            if (emptyView == null) {
+                emptyView = getActivity().getLayoutInflater().inflate(
+                        R.layout.empty_print_state, contentRoot, false);
+                emptyView.setContentDescription(getString(R.string.print_no_printers_found));
+                TextView textView = (TextView) emptyView.findViewById(R.id.message);
+                textView.setText(R.string.print_no_printers_found);
+                contentRoot.addView(emptyView);
+                listView.setEmptyView(emptyView);
+            }
+        }
+    }
+
+    private void updateUiForServiceState() {
+        List<ComponentName> services = SettingsUtils.readEnabledPrintServices(getActivity());
+        mServiceEnabled = services.contains(mComponentName);
+        if (mServiceEnabled) {
+            mToggleSwitch.setCheckedInternal(true);
+            mPrintersAdapter.enable();
+        } else {
+            mToggleSwitch.setCheckedInternal(false);
+            mPrintersAdapter.disable();
+        }
+        getActivity().invalidateOptionsMenu();
+    }
+
+    private void initComponents() {
+        mPrintersAdapter = new PrintersAdapter();
+        mPrintersAdapter.registerDataSetObserver(mDataObserver);
+
+        mToggleSwitch = createAndAddActionBarToggleSwitch(getActivity());
+        mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
+            @Override
+            public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
+                if (checked) {
+                    if (!TextUtils.isEmpty(mEnableWarningMessage)) {
+                        toggleSwitch.setCheckedInternal(false);
+                        getArguments().putBoolean(PrintSettingsFragment.EXTRA_CHECKED, false);
+                        showDialog(DIALOG_ID_ENABLE_WARNING);
+                        return true;
+                    }
+                    onPreferenceToggled(mPreferenceKey, true);
+                } else {
+                    onPreferenceToggled(mPreferenceKey, false);
+                }
+                return false;
+            }
+        });
+        mToggleSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                updateEmptyView();
+            }
+        });
+
+        getListView().setSelector(new ColorDrawable(Color.TRANSPARENT));
+        getListView().setAdapter(mPrintersAdapter);
+    }
+
+    private void updateUiForArguments() {
+        Bundle arguments = getArguments();
+
+        // Key.
+        mPreferenceKey = arguments.getString(PrintSettingsFragment.EXTRA_PREFERENCE_KEY);
+
+        // Enabled.
+        final boolean enabled = arguments.getBoolean(PrintSettingsFragment.EXTRA_CHECKED);
+        mToggleSwitch.setCheckedInternal(enabled);
+
+        // Title.
+        PreferenceActivity activity = (PreferenceActivity) getActivity();
+        if (!activity.onIsMultiPane() || activity.onIsHidingHeaders()) {
+            // PreferenceActivity allows passing as an extra only title by its
+            // resource id but we do not have the resource id for the print
+            // service label. Therefore, we do it ourselves.
+            String title = arguments.getString(PrintSettingsFragment.EXTRA_TITLE);
+            getActivity().setTitle(title);
+        }
+
+        // Settings title and intent.
+        String settingsTitle = arguments.getString(PrintSettingsFragment.EXTRA_SETTINGS_TITLE);
+        String settingsComponentName = arguments.getString(
+                PrintSettingsFragment.EXTRA_SETTINGS_COMPONENT_NAME);
+        if (!TextUtils.isEmpty(settingsTitle) && !TextUtils.isEmpty(settingsComponentName)) {
+            Intent settingsIntent = new Intent(Intent.ACTION_MAIN).setComponent(
+                    ComponentName.unflattenFromString(settingsComponentName.toString()));
+            List<ResolveInfo> resolvedActivities = getPackageManager().queryIntentActivities(
+                    settingsIntent, 0);
+            if (!resolvedActivities.isEmpty()) {
+                // The activity is a component name, therefore it is one or none.
+                if (resolvedActivities.get(0).activityInfo.exported) {
+                    mSettingsTitle = settingsTitle;
+                    mSettingsIntent = settingsIntent;
+                }
+            }
+        }
+
+        // Add printers title and intent.
+        String addPrintersTitle = arguments.getString(
+                PrintSettingsFragment.EXTRA_ADD_PRINTERS_TITLE);
+        String addPrintersComponentName =
+                arguments.getString(PrintSettingsFragment.EXTRA_ADD_PRINTERS_COMPONENT_NAME);
+        if (!TextUtils.isEmpty(addPrintersTitle)
+                && !TextUtils.isEmpty(addPrintersComponentName)) {
+            Intent addPritnersIntent = new Intent(Intent.ACTION_MAIN).setComponent(
+                    ComponentName.unflattenFromString(addPrintersComponentName.toString()));
+            List<ResolveInfo> resolvedActivities = getPackageManager().queryIntentActivities(
+                    addPritnersIntent, 0);
+            if (!resolvedActivities.isEmpty()) {
+                // The activity is a component name, therefore it is one or none.
+                if (resolvedActivities.get(0).activityInfo.exported) {
+                    mAddPrintersTitle = addPrintersTitle;
+                    mAddPrintersIntent = addPritnersIntent;
+                }
+            }
+        }
+
+        // Enable warning title.
+        mEnableWarningTitle = arguments.getCharSequence(
+                PrintSettingsFragment.EXTRA_ENABLE_WARNING_TITLE);
+
+        // Enable warning message.
+        mEnableWarningMessage = arguments.getCharSequence(
+                PrintSettingsFragment.EXTRA_ENABLE_WARNING_MESSAGE);
+
+        // Component name.
+        mComponentName = ComponentName.unflattenFromString(arguments
+                .getString(PrintSettingsFragment.EXTRA_SERVICE_COMPONENT_NAME));
+
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.print_service_settings, menu);
+
+        MenuItem addPrinters = menu.findItem(R.id.print_menu_item_add_printer);
+        if (mServiceEnabled && !TextUtils.isEmpty(mAddPrintersTitle)
+                && mAddPrintersIntent != null) {
+            addPrinters.setIntent(mAddPrintersIntent);
+        } else {
+            menu.removeItem(R.id.print_menu_item_add_printer);
+        }
+
+        MenuItem settings = menu.findItem(R.id.print_menu_item_settings);
+        if (mServiceEnabled && !TextUtils.isEmpty(mSettingsTitle)
+                && mSettingsIntent != null) {
+            settings.setIntent(mSettingsIntent);
+        } else {
+            menu.removeItem(R.id.print_menu_item_settings);
+        }
+
+        MenuItem searchItem = menu.findItem(R.id.print_menu_item_search);
+        if (mServiceEnabled && mPrintersAdapter.getUnfilteredCount() > 0) {
+            SearchView searchView = (SearchView) searchItem.getActionView();
+            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+                @Override
+                public boolean onQueryTextSubmit(String query) {
+                    return true;
+                }
+
+                @Override
+                public boolean onQueryTextChange(String searchString) {
+                    ((Filterable) getListView().getAdapter()).getFilter().filter(searchString);
+                    return true;
+                }
+            });
+            searchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
+                @Override
+                public void onViewAttachedToWindow(View view) {
+                    if (AccessibilityManager.getInstance(getActivity()).isEnabled()) {
+                        view.announceForAccessibility(getString(
+                                R.string.print_search_box_shown_utterance));
+                    }
+                }
+                @Override
+                public void onViewDetachedFromWindow(View view) {
+                    Activity activity = getActivity();
+                    if (activity != null && !activity.isFinishing()
+                            && AccessibilityManager.getInstance(activity).isEnabled()) {
+                        view.announceForAccessibility(getString(
+                                R.string.print_search_box_hidden_utterance));
+                    }
+                }
+            });
+        } else {
+            menu.removeItem(R.id.print_menu_item_search);
+        }
+    }
+
+    private ToggleSwitch createAndAddActionBarToggleSwitch(Activity activity) {
+        ToggleSwitch toggleSwitch = new ToggleSwitch(activity);
+        final int padding = activity.getResources().getDimensionPixelSize(
+                R.dimen.action_bar_switch_padding);
+        toggleSwitch.setPaddingRelative(0, 0, padding, 0);
+        activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                ActionBar.DISPLAY_SHOW_CUSTOM);
+        activity.getActionBar().setCustomView(toggleSwitch,
+                new ActionBar.LayoutParams(ActionBar.LayoutParams.WRAP_CONTENT,
+                        ActionBar.LayoutParams.WRAP_CONTENT,
+                        Gravity.CENTER_VERTICAL | Gravity.END));
+        return toggleSwitch;
+    }
+
+    private static abstract class SettingsContentObserver extends ContentObserver {
+
+        public SettingsContentObserver(Handler handler) {
+            super(handler);
+        }
+
+        public void register(ContentResolver contentResolver) {
+            contentResolver.registerContentObserver(Settings.Secure.getUriFor(
+                    Settings.Secure.ENABLED_PRINT_SERVICES), false, this);
+        }
+
+        public void unregister(ContentResolver contentResolver) {
+            contentResolver.unregisterContentObserver(this);
+        }
+
+        @Override
+        public abstract void onChange(boolean selfChange, Uri uri);
+    }
+
+    private final class AnnounceFilterResult implements Runnable {
+        private static final int SEARCH_RESULT_ANNOUNCEMENT_DELAY = 1000; // 1 sec
+
+        public void post() {
+            remove();
+            getListView().postDelayed(this, SEARCH_RESULT_ANNOUNCEMENT_DELAY);
+        }
+
+        public void remove() {
+            getListView().removeCallbacks(this);
+        }
+
+        @Override
+        public void run() {
+            final int count = getListView().getAdapter().getCount();
+            final String text;
+            if (count <= 0) {
+                text = getString(R.string.print_no_printers_found);
+            } else {
+                text = getActivity().getResources().getQuantityString(
+                    R.plurals.print_search_result_count_utterance, count, count);
+            }
+            getListView().announceForAccessibility(text);
+        }
+    }
+
+    private void announceSearchResult() {
+        if (mAnnounceFilterResult == null) {
+            mAnnounceFilterResult = new AnnounceFilterResult();
+        }
+        mAnnounceFilterResult.post();
+    }
+
+    private final class PrintersAdapter extends BaseAdapter
+            implements LoaderManager.LoaderCallbacks<List<PrinterInfo>>, Filterable {
+        private final Object mLock = new Object();
+
+        private final List<PrinterInfo> mPrinters = new ArrayList<PrinterInfo>();
+
+        private final List<PrinterInfo> mFilteredPrinters = new ArrayList<PrinterInfo>();
+
+        private CharSequence mLastSearchString;
+
+        public void enable() {
+            getLoaderManager().initLoader(LOADER_ID_PRINTERS_LOADER, null, this);
+        }
+
+        public void disable() {
+            getLoaderManager().destroyLoader(LOADER_ID_PRINTERS_LOADER);
+            mPrinters.clear();
+        }
+
+        public int getUnfilteredCount() {
+            return mPrinters.size();
+        }
+
+        @Override
+        public Filter getFilter() {
+            return new Filter() {
+                @Override
+                protected FilterResults performFiltering(CharSequence constraint) {
+                    synchronized (mLock) {
+                        if (TextUtils.isEmpty(constraint)) {
+                            return null;
+                        }
+                        FilterResults results = new FilterResults();
+                        List<PrinterInfo> filteredPrinters = new ArrayList<PrinterInfo>();
+                        String constraintLowerCase = constraint.toString().toLowerCase();
+                        final int printerCount = mPrinters.size();
+                        for (int i = 0; i < printerCount; i++) {
+                            PrinterInfo printer = mPrinters.get(i);
+                            if (printer.getName().toLowerCase().contains(constraintLowerCase)) {
+                                filteredPrinters.add(printer);
+                            }
+                        }
+                        results.values = filteredPrinters;
+                        results.count = filteredPrinters.size();
+                        return results;
+                    }
+                }
+
+                @Override
+                @SuppressWarnings("unchecked")
+                protected void publishResults(CharSequence constraint, FilterResults results) {
+                    final boolean resultCountChanged;
+                    synchronized (mLock) {
+                        final int oldPrinterCount = mFilteredPrinters.size();
+                        mLastSearchString = constraint;
+                        mFilteredPrinters.clear();
+                        if (results == null) {
+                            mFilteredPrinters.addAll(mPrinters);
+                        } else {
+                            List<PrinterInfo> printers = (List<PrinterInfo>) results.values;
+                            mFilteredPrinters.addAll(printers);
+                        }
+                        resultCountChanged = (oldPrinterCount != mFilteredPrinters.size());
+                    }
+                    if (resultCountChanged) {
+                        announceSearchResult();
+                    }
+                    notifyDataSetChanged();
+                }
+            };
+        }
+
+        @Override
+        public int getCount() {
+            synchronized (mLock) {
+                return mFilteredPrinters.size();
+            }
+        }
+
+        @Override
+        public Object getItem(int position) {
+            synchronized (mLock) {
+                return mFilteredPrinters.get(position);
+            }
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            if (convertView == null) {
+                convertView = getActivity().getLayoutInflater().inflate(
+                        R.layout.printer_dropdown_item, parent, false);
+            }
+
+            PrinterInfo printer = (PrinterInfo) getItem(position);
+            CharSequence title = printer.getName();
+            CharSequence subtitle = null;
+            Drawable icon = null;
+            try {
+                PackageInfo packageInfo = getPackageManager().getPackageInfo(
+                        printer.getId().getServiceName().getPackageName(), 0);
+                        subtitle = packageInfo.applicationInfo.loadLabel(getPackageManager());
+                        icon = packageInfo.applicationInfo.loadIcon(getPackageManager());
+            } catch (NameNotFoundException nnfe) {
+                /* ignore */
+            }
+
+            TextView titleView = (TextView) convertView.findViewById(R.id.title);
+            titleView.setText(title);
+
+            TextView subtitleView = (TextView) convertView.findViewById(R.id.subtitle);
+            if (!TextUtils.isEmpty(subtitle)) {
+                subtitleView.setText(subtitle);
+                subtitleView.setVisibility(View.VISIBLE);
+            } else {
+                subtitleView.setText(null);
+                subtitleView.setVisibility(View.GONE);
+            }
+
+            ImageView iconView = (ImageView) convertView.findViewById(R.id.icon);
+            if (icon != null) {
+                iconView.setImageDrawable(icon);
+                iconView.setVisibility(View.VISIBLE);
+            } else {
+                iconView.setVisibility(View.GONE);
+            }
+
+            return convertView;
+        }
+
+        @Override
+        public boolean isEnabled(int position) {
+            return false;
+        }
+
+        @Override
+        public Loader<List<PrinterInfo>> onCreateLoader(int id, Bundle args) {
+            if (id == LOADER_ID_PRINTERS_LOADER) {
+                return new PrintersLoader(getActivity());
+            }
+            return null;
+        }
+
+        @Override
+        public void onLoadFinished(Loader<List<PrinterInfo>> loader,
+                List<PrinterInfo> printers) {
+            synchronized (mLock) {
+                mPrinters.clear();
+                final int printerCount = printers.size();
+                for (int i = 0; i < printerCount; i++) {
+                    PrinterInfo printer = printers.get(i);
+                    if (printer.getId().getServiceName().equals(mComponentName)) {
+                        mPrinters.add(printer);
+                    }
+                }
+                mFilteredPrinters.clear();
+                mFilteredPrinters.addAll(mPrinters);
+                if (!TextUtils.isEmpty(mLastSearchString)) {
+                    getFilter().filter(mLastSearchString);
+                }
+            }
+            notifyDataSetChanged();
+        }
+
+        @Override
+        public void onLoaderReset(Loader<List<PrinterInfo>> loader) {
+            synchronized (mLock) {
+                mPrinters.clear();
+                mFilteredPrinters.clear();
+                mLastSearchString = null;
+            }
+            notifyDataSetInvalidated();
+        }
+    }
+
+    private static class PrintersLoader extends Loader<List<PrinterInfo>> {
+
+        private static final String LOG_TAG = "PrintersLoader";
+
+        private static final boolean DEBUG = false;
+
+        private final Map<PrinterId, PrinterInfo> mPrinters =
+                new LinkedHashMap<PrinterId, PrinterInfo>();
+
+        private PrinterDiscoverySession mDiscoverySession;
+
+        public PrintersLoader(Context context) {
+            super(context);
+        }
+
+        @Override
+        public void deliverResult(List<PrinterInfo> printers) {
+            if (isStarted()) {
+                super.deliverResult(printers);
+            }
+        }
+
+        @Override
+        protected void onStartLoading() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onStartLoading()");
+            }
+            // The contract is that if we already have a valid,
+            // result the we have to deliver it immediately.
+            if (!mPrinters.isEmpty()) {
+                deliverResult(new ArrayList<PrinterInfo>(mPrinters.values()));
+            }
+            // We want to start discovery at this point.
+            onForceLoad();
+        }
+
+        @Override
+        protected void onStopLoading() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onStopLoading()");
+            }
+            onCancelLoad();
+        }
+
+        @Override
+        protected void onForceLoad() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onForceLoad()");
+            }
+            loadInternal();
+        }
+
+        @Override
+        protected boolean onCancelLoad() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onCancelLoad()");
+            }
+            return cancelInternal();
+        }
+
+        @Override
+        protected void onReset() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onReset()");
+            }
+            onStopLoading();
+            mPrinters.clear();
+            if (mDiscoverySession != null) {
+                mDiscoverySession.destroy();
+                mDiscoverySession = null;
+            }
+        }
+
+        @Override
+        protected void onAbandon() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onAbandon()");
+            }
+            onStopLoading();
+        }
+
+        private boolean cancelInternal() {
+            if (mDiscoverySession != null
+                    && mDiscoverySession.isPrinterDiscoveryStarted()) {
+                mDiscoverySession.stopPrinterDiscovery();
+                return true;
+            }
+            return false;
+        }
+
+        private void loadInternal() {
+            if (mDiscoverySession == null) {
+                PrintManager printManager = (PrintManager) getContext()
+                        .getSystemService(Context.PRINT_SERVICE);
+                mDiscoverySession = printManager.createPrinterDiscoverySession();
+                mDiscoverySession.setOnPrintersChangeListener(new OnPrintersChangeListener() {
+                    @Override
+                    public void onPrintersChanged() {
+                        deliverResult(new ArrayList<PrinterInfo>(
+                                mDiscoverySession.getPrinters()));
+                    }
+                });
+            }
+            mDiscoverySession.startPrinterDisovery(null);
+        }
+    }
+}
+
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
new file mode 100644
index 0000000..391d505
--- /dev/null
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -0,0 +1,535 @@
+/*
+ * 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.print;
+
+import android.app.ActivityManager;
+import android.app.LoaderManager.LoaderCallbacks;
+import android.content.AsyncTaskLoader;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.Loader;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceScreen;
+import android.print.PrintJob;
+import android.print.PrintJobId;
+import android.print.PrintJobInfo;
+import android.print.PrintManager;
+import android.print.PrintManager.PrintJobStateChangeListener;
+import android.printservice.PrintServiceInfo;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.text.format.DateUtils;
+import android.util.Log;
+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.internal.content.PackageMonitor;
+import com.android.settings.DialogCreatable;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Fragment with the top level print settings.
+ */
+public class PrintSettingsFragment extends SettingsPreferenceFragment implements DialogCreatable {
+
+    static final char ENABLED_PRINT_SERVICES_SEPARATOR = ':';
+
+    private static final int LOADER_ID_PRINT_JOBS_LOADER = 1;
+
+    private static final String PRINT_JOBS_CATEGORY = "print_jobs_category";
+    private static final String PRINT_SERVICES_CATEGORY = "print_services_category";
+
+    // Extras passed to sub-fragments.
+    static final String EXTRA_PREFERENCE_KEY = "EXTRA_PREFERENCE_KEY";
+    static final String EXTRA_CHECKED = "EXTRA_CHECKED";
+    static final String EXTRA_TITLE = "EXTRA_TITLE";
+    static final String EXTRA_ENABLE_WARNING_TITLE = "EXTRA_ENABLE_WARNING_TITLE";
+    static final String EXTRA_ENABLE_WARNING_MESSAGE = "EXTRA_ENABLE_WARNING_MESSAGE";
+    static final String EXTRA_SETTINGS_TITLE = "EXTRA_SETTINGS_TITLE";
+    static final String EXTRA_SETTINGS_COMPONENT_NAME = "EXTRA_SETTINGS_COMPONENT_NAME";
+    static final String EXTRA_ADD_PRINTERS_TITLE = "EXTRA_ADD_PRINTERS_TITLE";
+    static final String EXTRA_ADD_PRINTERS_COMPONENT_NAME = "EXTRA_ADD_PRINTERS_COMPONENT_NAME";
+    static final String EXTRA_SERVICE_COMPONENT_NAME = "EXTRA_SERVICE_COMPONENT_NAME";
+
+    static final String EXTRA_PRINT_JOB_ID = "EXTRA_PRINT_JOB_ID";
+
+    private static final String EXTRA_PRINT_SERVICE_COMPONENT_NAME =
+            "EXTRA_PRINT_SERVICE_COMPONENT_NAME";
+
+    private final PackageMonitor mSettingsPackageMonitor = new SettingsPackageMonitor();
+
+    private final Handler mHandler = new Handler() {
+        @Override
+        public void dispatchMessage(Message msg) {
+            updateServicesPreferences();
+        }
+    };
+
+    private final SettingsContentObserver mSettingsContentObserver =
+            new SettingsContentObserver(mHandler) {
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            updateServicesPreferences();
+        }
+    };
+
+    private PreferenceCategory mActivePrintJobsCategory;
+    private PreferenceCategory mPrintServicesCategory;
+
+    private PrintJobsController mPrintJobsController;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        addPreferencesFromResource(R.xml.print_settings);
+
+        mActivePrintJobsCategory = (PreferenceCategory) findPreference(
+                PRINT_JOBS_CATEGORY);
+        mPrintServicesCategory= (PreferenceCategory) findPreference(
+                PRINT_SERVICES_CATEGORY);
+        getPreferenceScreen().removePreference(mActivePrintJobsCategory);
+
+        mPrintJobsController = new PrintJobsController();
+        getActivity().getLoaderManager().initLoader(LOADER_ID_PRINT_JOBS_LOADER,
+                null, mPrintJobsController);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
+        mSettingsContentObserver.register(getContentResolver());
+        updateServicesPreferences();
+        setHasOptionsMenu(true);
+        startSubSettingsIfNeeded();
+    }
+
+    @Override
+    public void onPause() {
+        mSettingsPackageMonitor.unregister();
+        mSettingsContentObserver.unregister(getContentResolver());
+        super.onPause();
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        String searchUri = Settings.Secure.getString(getContentResolver(),
+                Settings.Secure.PRINT_SERVICE_SEARCH_URI);
+        if (!TextUtils.isEmpty(searchUri)) {
+            MenuItem menuItem = menu.add(R.string.print_menu_item_add_service);
+            menuItem.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            menuItem.setIntent(new Intent(Intent.ACTION_VIEW,Uri.parse(searchUri)));
+        }
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        ViewGroup contentRoot = (ViewGroup) getListView().getParent();
+        View emptyView = getActivity().getLayoutInflater().inflate(
+                    R.layout.empty_print_state, contentRoot, false);
+        TextView textView = (TextView) emptyView.findViewById(R.id.message);
+        textView.setText(R.string.print_no_services_installed);
+        contentRoot.addView(emptyView);
+        getListView().setEmptyView(emptyView);
+    }
+
+    private void updateServicesPreferences() {
+        if (getPreferenceScreen().findPreference(PRINT_SERVICES_CATEGORY) == null) {
+            getPreferenceScreen().addPreference(mPrintServicesCategory);
+        } else {
+            // Since services category is auto generated we have to do a pass
+            // to generate it since services can come and go.
+            mPrintServicesCategory.removeAll();
+        }
+
+        List<ComponentName> enabledServices = SettingsUtils
+                .readEnabledPrintServices(getActivity());
+
+        List<ResolveInfo> installedServices = getActivity().getPackageManager()
+                .queryIntentServices(
+                        new Intent(android.printservice.PrintService.SERVICE_INTERFACE),
+                        PackageManager.GET_SERVICES | PackageManager.GET_META_DATA);
+
+        final int installedServiceCount = installedServices.size();
+        for (int i = 0; i < installedServiceCount; i++) {
+            ResolveInfo installedService = installedServices.get(i);
+
+            PreferenceScreen preference = getPreferenceManager().createPreferenceScreen(
+                    getActivity());
+
+            String title = installedService.loadLabel(getPackageManager()).toString();
+            preference.setTitle(title);
+
+            ComponentName componentName = new ComponentName(
+                    installedService.serviceInfo.packageName,
+                    installedService.serviceInfo.name);
+            preference.setKey(componentName.flattenToString());
+
+            preference.setOrder(i);
+            preference.setFragment(PrintServiceSettingsFragment.class.getName());
+            preference.setPersistent(false);
+
+            final boolean serviceEnabled = enabledServices.contains(componentName);
+            if (serviceEnabled) {
+                preference.setSummary(getString(R.string.print_feature_state_on));
+            } else {
+                preference.setSummary(getString(R.string.print_feature_state_off));
+            }
+
+            Bundle extras = preference.getExtras();
+            extras.putString(EXTRA_PREFERENCE_KEY, preference.getKey());
+            extras.putBoolean(EXTRA_CHECKED, serviceEnabled);
+            extras.putString(EXTRA_TITLE, title);
+
+            PrintServiceInfo printServiceInfo = PrintServiceInfo.create(
+                    installedService, getActivity());
+
+            CharSequence applicationLabel = installedService.loadLabel(getPackageManager());
+
+            extras.putString(EXTRA_ENABLE_WARNING_TITLE, getString(
+                    R.string.print_service_security_warning_title, applicationLabel));
+            extras.putString(EXTRA_ENABLE_WARNING_MESSAGE, getString(
+                    R.string.print_service_security_warning_summary, applicationLabel));
+
+            String settingsClassName = printServiceInfo.getSettingsActivityName();
+            if (!TextUtils.isEmpty(settingsClassName)) {
+                extras.putString(EXTRA_SETTINGS_TITLE,
+                        getString(R.string.print_menu_item_settings));
+                extras.putString(EXTRA_SETTINGS_COMPONENT_NAME,
+                        new ComponentName(installedService.serviceInfo.packageName,
+                                settingsClassName).flattenToString());
+            }
+
+            String addPrinterClassName = printServiceInfo.getAddPrintersActivityName();
+            if (!TextUtils.isEmpty(addPrinterClassName)) {
+                extras.putString(EXTRA_ADD_PRINTERS_TITLE,
+                        getString(R.string.print_menu_item_add_printers));
+                extras.putString(EXTRA_ADD_PRINTERS_COMPONENT_NAME,
+                        new ComponentName(installedService.serviceInfo.packageName,
+                                addPrinterClassName).flattenToString());
+            }
+
+            extras.putString(EXTRA_SERVICE_COMPONENT_NAME, componentName.flattenToString());
+
+            mPrintServicesCategory.addPreference(preference);
+        }
+
+        if (mPrintServicesCategory.getPreferenceCount() == 0) {
+            getPreferenceScreen().removePreference(mPrintServicesCategory);
+        }
+    }
+
+    private void startSubSettingsIfNeeded() {
+        if (getArguments() == null) {
+            return;
+        }
+        String componentName = getArguments().getString(EXTRA_PRINT_SERVICE_COMPONENT_NAME);
+        if (componentName != null) {
+            getArguments().remove(EXTRA_PRINT_SERVICE_COMPONENT_NAME);
+            Preference prereference = findPreference(componentName);
+            if (prereference != null) {
+                prereference.performClick(getPreferenceScreen());
+            }
+        }
+    }
+
+    private class SettingsPackageMonitor extends PackageMonitor {
+        @Override
+        public void onPackageAdded(String packageName, int uid) {
+           mHandler.obtainMessage().sendToTarget();
+        }
+
+        @Override
+        public void onPackageAppeared(String packageName, int reason) {
+            mHandler.obtainMessage().sendToTarget();
+        }
+
+        @Override
+        public void onPackageDisappeared(String packageName, int reason) {
+            mHandler.obtainMessage().sendToTarget();
+        }
+
+        @Override
+        public void onPackageRemoved(String packageName, int uid) {
+            mHandler.obtainMessage().sendToTarget();
+        }
+    }
+
+    public static class ToggleSwitch extends Switch {
+
+        private OnBeforeCheckedChangeListener mOnBeforeListener;
+
+        public static interface OnBeforeCheckedChangeListener {
+            public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked);
+        }
+
+        public ToggleSwitch(Context context) {
+            super(context);
+        }
+
+        public void setOnBeforeCheckedChangeListener(OnBeforeCheckedChangeListener listener) {
+            mOnBeforeListener = listener;
+        }
+
+        @Override
+        public void setChecked(boolean checked) {
+            if (mOnBeforeListener != null
+                    && mOnBeforeListener.onBeforeCheckedChanged(this, checked)) {
+                return;
+            }
+            super.setChecked(checked);
+        }
+
+        public void setCheckedInternal(boolean checked) {
+            super.setChecked(checked);
+        }
+    }
+
+    private static abstract class SettingsContentObserver extends ContentObserver {
+
+        public SettingsContentObserver(Handler handler) {
+            super(handler);
+        }
+
+        public void register(ContentResolver contentResolver) {
+            contentResolver.registerContentObserver(Settings.Secure.getUriFor(
+                    Settings.Secure.ENABLED_PRINT_SERVICES), false, this);
+        }
+
+        public void unregister(ContentResolver contentResolver) {
+            contentResolver.unregisterContentObserver(this);
+        }
+
+        @Override
+        public abstract void onChange(boolean selfChange, Uri uri);
+    }
+
+    private final class PrintJobsController implements LoaderCallbacks<List<PrintJobInfo>> {
+
+        @Override
+        public Loader<List<PrintJobInfo>> onCreateLoader(int id, Bundle args) {
+            if (id == LOADER_ID_PRINT_JOBS_LOADER) {
+                return new PrintJobsLoader(getActivity());
+            }
+            return null;
+        }
+
+        @Override
+        public void onLoadFinished(Loader<List<PrintJobInfo>> loader,
+                List<PrintJobInfo> printJobs) {
+            if (printJobs == null || printJobs.isEmpty()) {
+                getPreferenceScreen().removePreference(mActivePrintJobsCategory);
+            } else {
+                if (getPreferenceScreen().findPreference(PRINT_JOBS_CATEGORY) == null) {
+                    getPreferenceScreen().addPreference(mActivePrintJobsCategory);
+                }
+
+                mActivePrintJobsCategory.removeAll();
+
+                final int printJobCount = printJobs.size();
+                for (int i = 0; i < printJobCount; i++) {
+                    PrintJobInfo printJob = printJobs.get(i);
+
+                    PreferenceScreen preference = getPreferenceManager()
+                            .createPreferenceScreen(getActivity());
+
+                    preference.setPersistent(false);
+                    preference.setFragment(PrintJobSettingsFragment.class.getName());
+                    preference.setKey(printJob.getId().flattenToString());
+
+                    switch (printJob.getState()) {
+                        case PrintJobInfo.STATE_QUEUED:
+                        case PrintJobInfo.STATE_STARTED: {
+                            preference.setTitle(getString(
+                                    R.string.print_printing_state_title_template,
+                                    printJob.getLabel()));
+                        } break;
+
+                        case PrintJobInfo.STATE_FAILED: {
+                            preference.setTitle(getString(
+                                    R.string.print_failed_state_title_template,
+                                    printJob.getLabel()));
+                        } break;
+
+                        case PrintJobInfo.STATE_BLOCKED: {
+                            preference.setTitle(getString(
+                                    R.string.print_blocked_state_title_template,
+                                    printJob.getLabel()));
+                        } break;
+                    }
+
+                    preference.setSummary(getString(R.string.print_job_summary,
+                            printJob.getPrinterName(), DateUtils.formatSameDayTime(
+                                    printJob.getCreationTime(), printJob.getCreationTime(),
+                                    DateFormat.SHORT, DateFormat.SHORT)));
+
+                    switch (printJob.getState()) {
+                        case PrintJobInfo.STATE_QUEUED:
+                        case PrintJobInfo.STATE_STARTED: {
+                            preference.setIcon(com.android.internal.R.drawable.ic_print);
+                        } break;
+
+                        case PrintJobInfo.STATE_FAILED:
+                        case PrintJobInfo.STATE_BLOCKED: {
+                            preference.setIcon(com.android.internal.R.drawable.ic_print_error);
+                        } break;
+                    }
+
+                    Bundle extras = preference.getExtras();
+                    extras.putString(EXTRA_PRINT_JOB_ID, printJob.getId().flattenToString());
+
+                    mActivePrintJobsCategory.addPreference(preference);
+                }
+            }
+        }
+
+        @Override
+        public void onLoaderReset(Loader<List<PrintJobInfo>> loader) {
+            getPreferenceScreen().removePreference(mActivePrintJobsCategory);
+        }
+    }
+
+    private static final class PrintJobsLoader extends AsyncTaskLoader<List<PrintJobInfo>> {
+
+        private static final String LOG_TAG = "PrintJobsLoader";
+
+        private static final boolean DEBUG = false;
+
+        private List <PrintJobInfo> mPrintJobs = new ArrayList<PrintJobInfo>();
+
+        private final PrintManager mPrintManager;
+
+        private PrintJobStateChangeListener mPrintJobStateChangeListener;
+
+        public PrintJobsLoader(Context context) {
+            super(context);
+            mPrintManager = ((PrintManager) context.getSystemService(
+                    Context.PRINT_SERVICE)).getGlobalPrintManagerForUser(
+                            ActivityManager.getCurrentUser());
+        }
+
+        @Override
+        public void deliverResult(List<PrintJobInfo> printJobs) {
+            if (isStarted()) {
+                super.deliverResult(printJobs);
+            }
+        }
+
+        @Override
+        protected void onStartLoading() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onStartLoading()");
+            }
+            // If we already have a result, deliver it immediately.
+            if (!mPrintJobs.isEmpty()) {
+                deliverResult(new ArrayList<PrintJobInfo>(mPrintJobs));
+            }
+            // Start watching for changes.
+            if (mPrintJobStateChangeListener == null) {
+                mPrintJobStateChangeListener = new PrintJobStateChangeListener() {
+                    @Override
+                    public void onPrintJobStateChanged(PrintJobId printJobId) {
+                        onForceLoad();
+                    }
+                };
+                mPrintManager.addPrintJobStateChangeListener(
+                        mPrintJobStateChangeListener);
+            }
+            // If the data changed or we have no data - load it now.
+            if (mPrintJobs.isEmpty()) {
+                onForceLoad();
+            }
+        }
+
+        @Override
+        protected void onStopLoading() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onStopLoading()");
+            }
+            // Cancel the load in progress if possible.
+            onCancelLoad();
+        }
+
+        @Override
+        protected void onReset() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onReset()");
+            }
+            // Stop loading.
+            onStopLoading();
+            // Clear the cached result.
+            mPrintJobs.clear();
+            // Stop watching for changes.
+            if (mPrintJobStateChangeListener != null) {
+                mPrintManager.removePrintJobStateChangeListener(
+                        mPrintJobStateChangeListener);
+                mPrintJobStateChangeListener = null;
+            }
+        }
+
+        @Override
+        public List<PrintJobInfo> loadInBackground() {
+            List<PrintJobInfo> printJobInfos = null;
+            List<PrintJob> printJobs = mPrintManager.getPrintJobs();
+            final int printJobCount = printJobs.size();
+            for (int i = 0; i < printJobCount; i++) {
+                PrintJobInfo printJob = printJobs.get(i).getInfo();
+                if (shouldShowToUser(printJob)) {
+                    if (printJobInfos == null) {
+                        printJobInfos = new ArrayList<PrintJobInfo>();
+                    }
+                    printJobInfos.add(printJob);
+                }
+            }
+            return printJobInfos;
+        }
+
+        private static boolean shouldShowToUser(PrintJobInfo printJob) {
+            switch (printJob.getState()) {
+                case PrintJobInfo.STATE_QUEUED:
+                case PrintJobInfo.STATE_STARTED:
+                case PrintJobInfo.STATE_BLOCKED:
+                case PrintJobInfo.STATE_FAILED: {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}
diff --git a/src/com/android/settings/print/SettingsUtils.java b/src/com/android/settings/print/SettingsUtils.java
new file mode 100644
index 0000000..37827e6
--- /dev/null
+++ b/src/com/android/settings/print/SettingsUtils.java
@@ -0,0 +1,75 @@
+/*
+ * 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.print;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.provider.Settings;
+import android.text.TextUtils.SimpleStringSplitter;
+
+import java.util.ArrayList;import java.util.List;
+
+/**
+ * Helper methods for reading and writing to print settings.
+ */
+public class SettingsUtils {
+
+    private static final char ENABLED_PRINT_SERVICES_SEPARATOR = ':';
+
+    private SettingsUtils() {
+        /* do nothing */
+    }
+
+    public static List<ComponentName> readEnabledPrintServices(Context context) {
+        List<ComponentName> enabledServices = new ArrayList<ComponentName>();
+
+        String enabledServicesSetting = Settings.Secure.getString(context
+                .getContentResolver(), Settings.Secure.ENABLED_PRINT_SERVICES);
+        if (enabledServicesSetting == null) {
+            return enabledServices;
+        }
+
+        SimpleStringSplitter colonSplitter = new SimpleStringSplitter(
+                ENABLED_PRINT_SERVICES_SEPARATOR);
+        colonSplitter.setString(enabledServicesSetting);
+
+        while (colonSplitter.hasNext()) {
+            String componentNameString = colonSplitter.next();
+            ComponentName enabledService = ComponentName.unflattenFromString(
+                    componentNameString);
+            enabledServices.add(enabledService);
+        }
+
+        return enabledServices;
+    }
+
+    public static void writeEnabledPrintServices(Context context,
+            List<ComponentName> services) {
+        StringBuilder builder = new StringBuilder();
+        final int serviceCount = services.size();
+        for (int i = 0; i < serviceCount; i++) {
+            ComponentName service = services.get(i);
+            if (builder.length() > 0) {
+                builder.append(ENABLED_PRINT_SERVICES_SEPARATOR);
+            }
+            builder.append(service.flattenToString());
+        }
+        Settings.Secure.putString(context.getContentResolver(),
+                Settings.Secure.ENABLED_PRINT_SERVICES,
+                builder.toString());
+    }
+}
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index 603d028..0ff7f4f 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,18 @@
 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.ArrayList;
+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,
@@ -58,6 +61,9 @@
     /** Preference key for the TTS rate selection dialog. */
     private static final String KEY_DEFAULT_RATE = "tts_default_rate";
 
+    /** Preference key for the TTS status field. */
+    private static final String KEY_STATUS = "tts_status";
+
     /**
      * Preference key for the engine selection preference.
      */
@@ -73,6 +79,7 @@
     private PreferenceCategory mEnginePreferenceCategory;
     private ListPreference mDefaultRatePref;
     private Preference mPlayExample;
+    private Preference mEngineStatus;
 
     private int mDefaultRate = TextToSpeech.Engine.DEFAULT_RATE;
 
@@ -96,6 +103,20 @@
     private TextToSpeech mTts = null;
     private TtsEngines mEnginesHelper = null;
 
+    private String mSampleText = "";
+
+    /**
+     * Default locale used by selected TTS engine, null if not connected to any engine.
+     */
+    private Locale mCurrentDefaultLocale;
+
+    /**
+     * List of available locals of selected TTS engine, as returned by
+     * {@link TextToSpeech.Engine#ACTION_CHECK_TTS_DATA} activity. If empty, then activity
+     * was not yet called.
+     */
+    private List<String> mAvailableStrLocals;
+
     /**
      * The initialization listener used when we are initalizing the settings
      * screen for the first time (as opposed to when a user changes his choice
@@ -129,18 +150,55 @@
 
         mPlayExample = findPreference(KEY_PLAY_EXAMPLE);
         mPlayExample.setOnPreferenceClickListener(this);
+        mPlayExample.setEnabled(false);
 
         mEnginePreferenceCategory = (PreferenceCategory) findPreference(
                 KEY_ENGINE_PREFERENCE_SECTION);
         mDefaultRatePref = (ListPreference) findPreference(KEY_DEFAULT_RATE);
 
+        mEngineStatus = findPreference(KEY_STATUS);
+        updateEngineStatus(R.string.tts_status_checking);
+
         mTts = new TextToSpeech(getActivity().getApplicationContext(), mInitListener);
         mEnginesHelper = new TtsEngines(getActivity().getApplicationContext());
 
+        setTtsUtteranceProgressListener();
         initSettings();
     }
 
     @Override
+    public void onResume() {
+        super.onResume();
+
+        if (mTts == null || mCurrentDefaultLocale == null) {
+            return;
+        }
+        Locale ttsDefaultLocale = mTts.getDefaultLanguage();
+        if (mCurrentDefaultLocale != null && !mCurrentDefaultLocale.equals(ttsDefaultLocale)) {
+            updateWidgetState(false);
+            checkDefaultLocale();
+        }
+    }
+
+    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();
         if (mTts != null) {
@@ -149,14 +207,6 @@
         }
     }
 
-    @Override
-    public void onPause() {
-        super.onPause();
-        if ((mDefaultRatePref != null) && (mDefaultRatePref.getDialog() != null)) {
-            mDefaultRatePref.getDialog().dismiss();
-        }
-    }
-
     private void initSettings() {
         final ContentResolver resolver = getContentResolver();
 
@@ -193,6 +243,80 @@
     }
 
     /**
+     * Called when the TTS engine is initialized.
+     */
+    public void onInitEngine(int status) {
+        if (status == TextToSpeech.SUCCESS) {
+            if (DBG) Log.d(TAG, "TTS engine for settings screen initialized.");
+            checkDefaultLocale();
+        } else {
+            if (DBG) Log.d(TAG, "TTS engine for settings screen failed to initialize successfully.");
+            updateWidgetState(false);
+        }
+    }
+
+    private void checkDefaultLocale() {
+        Locale defaultLocale = mTts.getDefaultLanguage();
+        if (defaultLocale == null) {
+            Log.e(TAG, "Failed to get default language from engine " + mCurrentEngine);
+            updateWidgetState(false);
+            updateEngineStatus(R.string.tts_status_not_supported);
+            return;
+        }
+
+        mCurrentDefaultLocale = defaultLocale;
+
+        int defaultAvailable = mTts.setLanguage(defaultLocale);
+        if (evaluateDefaultLocale()) {
+            getSampleText();
+        }
+    }
+
+    private boolean evaluateDefaultLocale() {
+        // Check if we are connected to the engine, and CHECK_VOICE_DATA returned list
+        // of available languages.
+        if (mCurrentDefaultLocale == null || mAvailableStrLocals == null) {
+            return false;
+        }
+        int defaultAvailable = mTts.setLanguage(mCurrentDefaultLocale);
+
+        // Check if language is listed in CheckVoices Action result as available voice.
+        String defaultLocaleStr = mCurrentDefaultLocale.getISO3Language();
+        boolean notInAvailableLangauges = true;
+        if (!TextUtils.isEmpty(mCurrentDefaultLocale.getISO3Country())) {
+            defaultLocaleStr += "-" + mCurrentDefaultLocale.getISO3Country();
+        }
+        if (!TextUtils.isEmpty(mCurrentDefaultLocale.getVariant())) {
+            defaultLocaleStr += "-" + mCurrentDefaultLocale.getVariant();
+        }
+
+        for (String loc : mAvailableStrLocals) {
+            if (loc.equalsIgnoreCase(defaultLocaleStr)) {
+              notInAvailableLangauges = false;
+              break;
+            }
+        }
+
+        if (defaultAvailable == TextToSpeech.LANG_NOT_SUPPORTED ||
+                defaultAvailable == TextToSpeech.LANG_MISSING_DATA ||
+                notInAvailableLangauges) {
+            if (DBG) Log.d(TAG, "Default locale for this TTS engine is not supported.");
+            updateEngineStatus(R.string.tts_status_not_supported);
+            updateWidgetState(false);
+            return false;
+        } else {
+            if (isNetworkRequiredForSynthesis()) {
+                updateEngineStatus(R.string.tts_status_requires_network);
+            } else {
+                updateEngineStatus(R.string.tts_status_ok);
+            }
+            updateWidgetState(true);
+            return true;
+        }
+    }
+
+
+    /**
      * Ask the current default engine to return a string of sample text to be
      * spoken to the user.
      */
@@ -201,19 +325,15 @@
 
         if (TextUtils.isEmpty(currentEngine)) currentEngine = mTts.getDefaultEngine();
 
-        Locale currentLocale = mTts.getLanguage();
-
         // 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
         // a public API. We fall back to using a canned set of strings if this
         // 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", mCurrentDefaultLocale.getLanguage());
+        intent.putExtra("country", mCurrentDefaultLocale.getCountry());
+        intent.putExtra("variant", mCurrentDefaultLocale.getVariant());
         intent.setPackage(currentEngine);
 
         try {
@@ -225,19 +345,6 @@
     }
 
     /**
-     * Called when the TTS engine is initialized.
-     */
-    public void onInitEngine(int status) {
-        if (status == TextToSpeech.SUCCESS) {
-            updateWidgetState(true);
-            if (DBG) Log.d(TAG, "TTS engine for settings screen initialized.");
-        } else {
-            if (DBG) Log.d(TAG, "TTS engine for settings screen failed to initialize successfully.");
-            updateWidgetState(false);
-        }
-    }
-
-    /**
      * Called when voice data integrity check returns
      */
     @Override
@@ -263,7 +370,16 @@
                 }
             }
         }
-        return null;
+        return getString(R.string.tts_default_sample_string);
+    }
+
+    private boolean isNetworkRequiredForSynthesis() {
+        Set<String> features = mTts.getFeatures(mCurrentDefaultLocale);
+        if (features == null) {
+          return false;
+        }
+        return features.contains(TextToSpeech.Engine.KEY_FEATURE_NETWORK_SYNTHESIS) &&
+                !features.contains(TextToSpeech.Engine.KEY_FEATURE_EMBEDDED_SYNTHESIS);
     }
 
     private void onSampleTextReceived(int resultCode, Intent data) {
@@ -278,16 +394,29 @@
             if (DBG) Log.d(TAG, "Using default sample text :" + sample);
         }
 
-        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);
+        mSampleText = sample;
+        if (mSampleText != null) {
+            updateWidgetState(true);
         } else {
-            // TODO: Display an error here to the user.
-            Log.e(TAG, "Did not have a sample string for the requested language");
+            Log.e(TAG, "Did not have a sample string for the requested language. Using default");
         }
     }
 
+    private void speakSampleText() {
+        final boolean networkRequired = isNetworkRequiredForSynthesis();
+        if (!networkRequired || networkRequired &&
+                (mTts.isLanguageAvailable(mCurrentDefaultLocale) >= TextToSpeech.LANG_AVAILABLE)) {
+            HashMap<String, String> params = new HashMap<String, String>();
+            params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, "Sample");
+
+            mTts.speak(mSampleText, TextToSpeech.QUEUE_FLUSH, params);
+        } else {
+            Log.w(TAG, "Network required for sample synthesis for requested language");
+            displayNetworkAlert();
+        }
+    }
+
+    @Override
     public boolean onPreferenceChange(Preference preference, Object objValue) {
         if (KEY_DEFAULT_RATE.equals(preference.getKey())) {
             // Default rate
@@ -309,11 +438,12 @@
     /**
      * Called when mPlayExample is clicked
      */
+    @Override
     public boolean onPreferenceClick(Preference preference) {
         if (preference == mPlayExample) {
             // Get the sample text from the TTS engine; onActivityResult will do
             // the actual speaking
-            getSampleText();
+            speakSampleText();
             return true;
         }
 
@@ -323,23 +453,24 @@
     private void updateWidgetState(boolean enable) {
         mPlayExample.setEnabled(enable);
         mDefaultRatePref.setEnabled(enable);
+        mEngineStatus.setEnabled(enable);
     }
 
-    private void displayDataAlert(final String key) {
-        Log.i(TAG, "Displaying data alert for :" + key);
+    private void updateEngineStatus(int resourceId) {
+        Locale locale = mCurrentDefaultLocale;
+        if (locale == null) {
+            locale = Locale.getDefault();
+        }
+        mEngineStatus.setSummary(getString(resourceId, locale.getDisplayName()));
+    }
+
+    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() {
-                    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();
@@ -351,6 +482,7 @@
         // Disable the "play sample text" preference and the speech
         // rate preference while the engine is being swapped.
         updateWidgetState(false);
+        updateEngineStatus(R.string.tts_status_checking);
 
         // Keep track of the previous engine that was being used. So that
         // we can reuse the previous engine.
@@ -374,6 +506,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();
     }
 
     /*
@@ -395,6 +528,7 @@
                 // null if the previous bind to this engine failed.
                 mTts = new TextToSpeech(getActivity().getApplicationContext(), mInitListener,
                         mPreviousEngine);
+                setTtsUtteranceProgressListener();
             }
             mPreviousEngine = null;
         }
@@ -433,6 +567,17 @@
 
         Settings.Secure.putString(getContentResolver(), TTS_DEFAULT_SYNTH, engine);
 
+        mAvailableStrLocals = data.getStringArrayListExtra(
+            TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES);
+        if (mAvailableStrLocals == null) {
+            Log.e(TAG, "Voice data check complete, but no available voices found");
+            // Set mAvailableStrLocals to empty list
+            mAvailableStrLocals = new ArrayList<String>();
+        }
+        if (evaluateDefaultLocale()) {
+            getSampleText();
+        }
+
         final int engineCount = mEnginePreferenceCategory.getPreferenceCount();
         for (int i = 0; i < engineCount; ++i) {
             final Preference p = mEnginePreferenceCategory.getPreference(i);
@@ -444,13 +589,6 @@
                 }
             }
         }
-
-        updateWidgetState(true);
-    }
-
-    private boolean shouldDisplayDataAlert(String engine) {
-        final EngineInfo info = mEnginesHelper.getEngineInfo(engine);
-        return !info.system;
     }
 
     @Override
@@ -471,11 +609,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 196882f..486fdf8 100644
--- a/src/com/android/settings/tts/TtsEnginePreference.java
+++ b/src/com/android/settings/tts/TtsEnginePreference.java
@@ -16,14 +16,15 @@
 
 package com.android.settings.tts;
 
-import com.android.settings.R;
-
+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;
@@ -31,8 +32,14 @@
 import android.widget.RadioButton;
 
 
+import com.android.settings.R;
+import com.android.settings.Utils;
+
+
 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}.
@@ -135,6 +142,9 @@
         // Will be enabled only the engine has passed the voice check, and
         // is currently enabled.
         mSettingsIcon.setEnabled(isChecked && mVoiceCheckData != null);
+        if (!isChecked) {
+            mSettingsIcon.setAlpha(Utils.DISABLED_ALPHA);
+        }
         mSettingsIcon.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -168,25 +178,78 @@
         // case mSettingsIcon && mRadioButton will be null. In this case
         // getView will set the right values.
         if (mSettingsIcon != null && mRadioButton != null) {
-            mSettingsIcon.setEnabled(mRadioButton.isChecked());
+            if (mRadioButton.isChecked()) {
+                mSettingsIcon.setEnabled(true);
+            } else {
+                mSettingsIcon.setEnabled(false);
+                mSettingsIcon.setAlpha(Utils.DISABLED_ALPHA);
+            }
         }
     }
 
-    private void onRadioButtonClicked(CompoundButton buttonView, boolean isChecked) {
-        if (mPreventRadioButtonCallbacks) {
+    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 fcc2f2e..bb5ac7a 100644
--- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java
+++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
@@ -16,12 +16,13 @@
 
 package com.android.settings.tts;
 
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
 import android.content.ActivityNotFoundException;
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.os.Bundle;
+import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
@@ -31,8 +32,14 @@
 import android.speech.tts.TtsEngines;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.Pair;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Locale;
 
 
@@ -45,14 +52,20 @@
     private static final String KEY_ENGINE_SETTINGS = "tts_engine_settings";
     private static final String KEY_INSTALL_DATA = "tts_install_data";
 
+    private static final int VOICE_DATA_INTEGRITY_CHECK = 1977;
+
     private TtsEngines mEnginesHelper;
     private ListPreference mLocalePreference;
     private Preference mEngineSettingsPreference;
     private Preference mInstallVoicesPreference;
     private Intent mEngineSettingsIntent;
+    private Intent mVoiceDataDetails;
 
     private TextToSpeech mTts;
 
+    private int mSelectedLocaleIndex = -1;
+    private int mSystemLocaleIndex = -1;
+
     private final TextToSpeech.OnInitListener mTtsInitListener = new TextToSpeech.OnInitListener() {
         @Override
         public void onInit(int status) {
@@ -63,13 +76,22 @@
                     @Override
                     public void run() {
                         mLocalePreference.setEnabled(true);
-                        updateVoiceDetails();
                     }
                 });
             }
         }
     };
 
+    private final BroadcastReceiver mLanguagesChangedReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            // Installed or uninstalled some data packs
+            if (TextToSpeech.Engine.ACTION_TTS_DATA_INSTALLED.equals(intent.getAction())) {
+                checkTtsData();
+            }
+        }
+    };
+
     public TtsEngineSettingsFragment() {
         super();
     }
@@ -87,9 +109,6 @@
         mEngineSettingsPreference.setOnPreferenceClickListener(this);
         mInstallVoicesPreference = root.findPreference(KEY_INSTALL_DATA);
         mInstallVoicesPreference.setOnPreferenceClickListener(this);
-        // Remove this preference unless voices are indeed available to install.
-        root.removePreference(mInstallVoicesPreference);
-
 
         root.setTitle(getEngineLabel());
         root.setKey(getEngineName());
@@ -101,59 +120,82 @@
             mEngineSettingsPreference.setEnabled(false);
         }
         mInstallVoicesPreference.setEnabled(false);
-
         mLocalePreference.setEnabled(false);
+
+        mLocalePreference.setEntries(new CharSequence[0]);
+        mLocalePreference.setEntryValues(new CharSequence[0]);
+
+        mVoiceDataDetails = getArguments().getParcelable(TtsEnginePreference.FRAGMENT_ARGS_VOICES);
+
         mTts = new TextToSpeech(getActivity().getApplicationContext(), mTtsInitListener,
                 getEngineName());
+
+        // Check if data packs changed
+        checkTtsData();
+
+        getActivity().registerReceiver(mLanguagesChangedReceiver,
+                new IntentFilter(TextToSpeech.Engine.ACTION_TTS_DATA_INSTALLED));
     }
 
     @Override
     public void onDestroy() {
+        getActivity().unregisterReceiver(mLanguagesChangedReceiver);
         mTts.shutdown();
         super.onDestroy();
     }
 
-    private void updateVoiceDetails() {
-        final Intent voiceDataDetails = getArguments().getParcelable(
-                TtsEnginePreference.FRAGMENT_ARGS_VOICES);
-        if (DBG) Log.d(TAG, "Parsing voice data details, data: " + voiceDataDetails.toUri(0));
-        ArrayList<String> available = voiceDataDetails.getStringArrayListExtra(
-                TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES);
-        ArrayList<String> unavailable = voiceDataDetails.getStringArrayListExtra(
-                TextToSpeech.Engine.EXTRA_UNAVAILABLE_VOICES);
-
-        if (available == null){
-            Log.e(TAG, "TTS data check failed (available == null).");
-            final CharSequence[] empty = new CharSequence[0];
-            mLocalePreference.setEntries(empty);
-            mLocalePreference.setEntryValues(empty);
-            return;
+    private final void checkTtsData() {
+        Intent intent = new Intent(TextToSpeech.Engine.ACTION_CHECK_TTS_DATA);
+        intent.setPackage(getEngineName());
+        try {
+            if (DBG) Log.d(TAG, "Updating engine: Checking voice data: " + intent.toUri(0));
+            startActivityForResult(intent, VOICE_DATA_INTEGRITY_CHECK);
+        } catch (ActivityNotFoundException ex) {
+            Log.e(TAG, "Failed to check TTS data, no activity found for " + intent + ")");
         }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == VOICE_DATA_INTEGRITY_CHECK) {
+            mVoiceDataDetails = data;
+            updateVoiceDetails();
+        }
+    }
+
+    private void updateVoiceDetails() {
+        if (DBG) Log.d(TAG, "Parsing voice data details, data: " + mVoiceDataDetails.toUri(0));
+
+        final ArrayList<String> available = mVoiceDataDetails.getStringArrayListExtra(
+                TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES);
+        final ArrayList<String> unavailable = mVoiceDataDetails.getStringArrayListExtra(
+                TextToSpeech.Engine.EXTRA_UNAVAILABLE_VOICES);
 
         if (unavailable != null && unavailable.size() > 0) {
             mInstallVoicesPreference.setEnabled(true);
-            getPreferenceScreen().addPreference(mInstallVoicesPreference);
         } else {
-            getPreferenceScreen().removePreference(mInstallVoicesPreference);
+            mInstallVoicesPreference.setEnabled(false);
         }
 
-        if (available.size() > 0) {
-            updateDefaultLocalePref(available);
+        if (available == null){
+            Log.e(TAG, "TTS data check failed (available == null).");
+            mLocalePreference.setEnabled(false);
+            return;
         } else {
-            final CharSequence[] empty = new CharSequence[0];
-            mLocalePreference.setEntries(empty);
-            mLocalePreference.setEntryValues(empty);
+            updateDefaultLocalePref(available);
         }
     }
 
     private void updateDefaultLocalePref(ArrayList<String> availableLangs) {
+        if (availableLangs == null || availableLangs.size() == 0) {
+            mLocalePreference.setEnabled(false);
+            return;
+        }
         String currentLocale = mEnginesHelper.getLocalePrefForEngine(
                 getEngineName());
 
-        CharSequence[] entries = new CharSequence[availableLangs.size()];
-        CharSequence[] entryValues = new CharSequence[availableLangs.size()];
-
-        int selectedLanguageIndex = -1;
+        ArrayList<Pair<String, String>> entryPairs =
+                new ArrayList<Pair<String, String>>(availableLangs.size());
         for (int i = 0; i < availableLangs.size(); i++) {
             String[] langCountryVariant = availableLangs.get(i).split("-");
             Locale loc = null;
@@ -166,21 +208,52 @@
                                  langCountryVariant[2]);
             }
             if (loc != null){
-                entries[i] = loc.getDisplayName();
-                entryValues[i] = availableLangs.get(i);
-                if (availableLangs.get(i).equalsIgnoreCase(currentLocale)) {
-                    selectedLanguageIndex = i;
-                }
+                entryPairs.add(new Pair<String, String>(
+                        loc.getDisplayName(), availableLangs.get(i)));
             }
         }
 
+        // Sort it
+        Collections.sort(entryPairs, new Comparator<Pair<String, String>>() {
+            @Override
+            public int compare(Pair<String, String> lhs, Pair<String, String> rhs) {
+                return lhs.first.compareToIgnoreCase(rhs.first);
+            }
+        });
+
+        String defaultLocaleStr = mEnginesHelper.getDefaultLocale();
+
+        // Get two arrays out of one of pairs
+        mSelectedLocaleIndex = -1;
+        mSystemLocaleIndex = -1;
+        CharSequence[] entries = new CharSequence[availableLangs.size()];
+        CharSequence[] entryValues = new CharSequence[availableLangs.size()];
+        int i = 0;
+        for (Pair<String, String> entry : entryPairs) {
+            if (entry.second.equalsIgnoreCase(currentLocale)) {
+                mSelectedLocaleIndex = i;
+            }
+            if (entry.second.equalsIgnoreCase(defaultLocaleStr)) {
+                mSystemLocaleIndex = i;
+            }
+            entries[i] = entry.first;
+            entryValues[i++] = entry.second;
+        }
+
         mLocalePreference.setEntries(entries);
         mLocalePreference.setEntryValues(entryValues);
-        if (selectedLanguageIndex > -1) {
-            mLocalePreference.setValueIndex(selectedLanguageIndex);
+        mLocalePreference.setEnabled(true);
+        setLocalePreference(mSelectedLocaleIndex);
+    }
+
+    /** Set entry from entry table in mLocalePreference */
+    private void setLocalePreference(int index) {
+        if (index < 0) {
+            mLocalePreference.setValue("");
+            mLocalePreference.setSummary(R.string.tts_lang_not_selected);
         } else {
-            mLocalePreference.setValueIndex(0);
-            updateLanguageTo(availableLangs.get(0));
+            mLocalePreference.setValueIndex(index);
+            mLocalePreference.setSummary(mLocalePreference.getEntries()[index]);
         }
     }
 
@@ -220,12 +293,32 @@
             updateLanguageTo((String) newValue);
             return true;
         }
-
         return false;
     }
 
     private void updateLanguageTo(String locale) {
-        mEnginesHelper.updateLocalePrefForEngine(getEngineName(), locale);
+        int selectedLocaleIndex = -1;
+        for (int i=0; i < mLocalePreference.getEntryValues().length; i++) {
+            if (locale.equalsIgnoreCase(mLocalePreference.getEntryValues()[i].toString())) {
+                selectedLocaleIndex = i;
+                break;
+            }
+        }
+
+        if (selectedLocaleIndex == -1) {
+            Log.w(TAG, "updateLanguageTo called with unknown locale argument");
+            return;
+        }
+        mLocalePreference.setSummary(mLocalePreference.getEntries()[selectedLocaleIndex]);
+        mSelectedLocaleIndex = selectedLocaleIndex;
+
+        if (mSelectedLocaleIndex == mSystemLocaleIndex) {
+            // Use empty locale, it will default to the system language
+            mEnginesHelper.updateLocalePrefForEngine(getEngineName(), "");
+        } else {
+            mEnginesHelper.updateLocalePrefForEngine(getEngineName(), locale);
+        }
+
         if (getEngineName().equals(mTts.getCurrentEngine())) {
             String[] localeArray = TtsEngines.parseLocalePref(locale);
             if (localeArray != null) {
@@ -241,5 +334,4 @@
     private String getEngineLabel() {
         return getArguments().getString(TtsEnginePreference.FRAGMENT_ARGS_LABEL);
     }
-
 }
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
new file mode 100644
index 0000000..f1022b9
--- /dev/null
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -0,0 +1,1072 @@
+/*
+ * 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.AppGlobals;
+import android.appwidget.AppWidgetManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+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.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.ColorFilter;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
+import android.graphics.drawable.Drawable;
+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.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.Switch;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+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_";
+
+    protected PackageManager mPackageManager;
+    protected UserManager mUserManager;
+    protected IPackageManager mIPm;
+    protected UserHandle mUser;
+    private PackageInfo mSysPackageInfo;
+
+    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";
+
+    HashMap<String,Boolean> mSelectedPackages = new HashMap<String,Boolean>();
+    private boolean mFirstTime = true;
+    private boolean mNewUser;
+    private boolean mAppListChanged;
+    protected boolean mRestrictedProfile;
+
+    private static final int CUSTOM_REQUEST_CODE_START = 1000;
+    private int mCustomRequestCode = CUSTOM_REQUEST_CODE_START;
+
+    private HashMap<Integer, AppRestrictionsPreference> mCustomRequestMap =
+            new HashMap<Integer,AppRestrictionsPreference>();
+
+    private List<SelectableAppInfo> mVisibleApps;
+    private List<ApplicationInfo> mUserApps;
+    private AsyncTask mAppLoadingTask;
+
+    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");
+                applyUserAppsStates();
+                if (DEBUG) Log.d(TAG, "User backgrounding, done updating app list");
+            }
+        }
+    };
+
+    private BroadcastReceiver mPackageObserver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            onPackageChanged(intent);
+        }
+    };
+
+    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;
+        private boolean panelOpen;
+        private boolean immutable;
+        private List<Preference> mChildren = new ArrayList<Preference>();
+        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;
+        }
+
+        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;
+        }
+
+        boolean isPanelOpen() {
+            return panelOpen;
+        }
+
+        void setPanelOpen(boolean open) {
+            panelOpen = open;
+        }
+
+        List<Preference> getChildren() {
+            return mChildren;
+        }
+
+        @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 toggle = (Switch) widget.getChildAt(0);
+                toggle.setEnabled(!isImmutable());
+                toggle.setTag(this);
+                toggle.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+                    @Override
+                    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                        listener.onClick(toggle);
+                    }
+                });
+            }
+        }
+    }
+
+    protected void init(Bundle icicle) {
+        if (icicle != null) {
+            mUser = new UserHandle(icicle.getInt(EXTRA_USER_ID));
+        } else {
+            Bundle args = getArguments();
+            if (args != null) {
+                if (args.containsKey(EXTRA_USER_ID)) {
+                    mUser = new UserHandle(args.getInt(EXTRA_USER_ID));
+                }
+                mNewUser = args.getBoolean(EXTRA_NEW_USER, false);
+            }
+        }
+
+        if (mUser == null) {
+            mUser = android.os.Process.myUserHandle();
+        }
+
+        mPackageManager = getActivity().getPackageManager();
+        mIPm = IPackageManager.Stub.asInterface(ServiceManager.getService("package"));
+        mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        mRestrictedProfile = mUserManager.getUserInfo(mUser.getIdentifier()).isRestricted();
+        try {
+            mSysPackageInfo = mPackageManager.getPackageInfo("android",
+                PackageManager.GET_SIGNATURES);
+        } catch (NameNotFoundException nnfe) {
+            // ?
+        }
+        addPreferencesFromResource(R.xml.app_restrictions);
+        mAppList = getAppPreferenceGroup();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(EXTRA_USER_ID, mUser.getIdentifier());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        getActivity().registerReceiver(mUserBackgrounding,
+                new IntentFilter(Intent.ACTION_USER_BACKGROUND));
+        IntentFilter packageFilter = new IntentFilter();
+        packageFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
+        packageFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+        packageFilter.addDataScheme("package");
+        getActivity().registerReceiver(mPackageObserver, packageFilter);
+
+        mAppListChanged = false;
+        if (mAppLoadingTask == null || mAppLoadingTask.getStatus() == AsyncTask.Status.FINISHED) {
+            mAppLoadingTask = new AppLoadingTask().execute((Void[]) null);
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mNewUser = false;
+        getActivity().unregisterReceiver(mUserBackgrounding);
+        getActivity().unregisterReceiver(mPackageObserver);
+        if (mAppListChanged) {
+            new Thread() {
+                public void run() {
+                    applyUserAppsStates();
+                }
+            }.start();
+        }
+    }
+
+    private void onPackageChanged(Intent intent) {
+        String action = intent.getAction();
+        String packageName = intent.getData().getSchemeSpecificPart();
+        // Package added, check if the preference needs to be enabled
+        AppRestrictionsPreference pref = (AppRestrictionsPreference)
+                findPreference(getKeyForPackage(packageName));
+        if (pref == null) return;
+
+        if ((Intent.ACTION_PACKAGE_ADDED.equals(action) && pref.isChecked())
+                || (Intent.ACTION_PACKAGE_REMOVED.equals(action) && !pref.isChecked())) {
+            pref.setEnabled(true);
+        }
+    }
+
+    protected PreferenceGroup getAppPreferenceGroup() {
+        return getPreferenceScreen();
+    }
+
+    protected Drawable getCircularUserIcon() {
+        Bitmap userIcon = mUserManager.getUserIcon(mUser.getIdentifier());
+        if (userIcon == null) {
+            return null;
+        }
+        CircleFramedDrawable circularIcon =
+                CircleFramedDrawable.getInstance(this.getActivity(), userIcon);
+        return circularIcon;
+    }
+
+    protected void clearSelectedApps() {
+        mSelectedPackages.clear();
+    }
+
+    private void applyUserAppsStates() {
+        final int userId = mUser.getIdentifier();
+        if (!mUserManager.getUserInfo(userId).isRestricted() && userId != UserHandle.myUserId()) {
+            Log.e(TAG, "Cannot apply application restrictions on another user!");
+            return;
+        }
+        for (Map.Entry<String,Boolean> entry : mSelectedPackages.entrySet()) {
+            String packageName = entry.getKey();
+            boolean enabled = entry.getValue();
+            applyUserAppState(packageName, enabled);
+        }
+    }
+
+    private void applyUserAppState(String packageName, boolean enabled) {
+        final int userId = mUser.getIdentifier();
+        if (enabled) {
+            // Enable selected apps
+            try {
+                ApplicationInfo info = mIPm.getApplicationInfo(packageName,
+                        PackageManager.GET_UNINSTALLED_PACKAGES, userId);
+                if (info == null || info.enabled == false
+                        || (info.flags&ApplicationInfo.FLAG_INSTALLED) == 0) {
+                    mIPm.installExistingPackageAsUser(packageName, mUser.getIdentifier());
+                    if (DEBUG) {
+                        Log.d(TAG, "Installing " + packageName);
+                    }
+                }
+                if (info != null && (info.flags&ApplicationInfo.FLAG_BLOCKED) != 0
+                        && (info.flags&ApplicationInfo.FLAG_INSTALLED) != 0) {
+                    disableUiForPackage(packageName);
+                    mIPm.setApplicationBlockedSettingAsUser(packageName, false, userId);
+                    if (DEBUG) {
+                        Log.d(TAG, "Unblocking " + packageName);
+                    }
+                }
+            } catch (RemoteException re) {
+            }
+        } else {
+            // Blacklist all other apps, system or downloaded
+            try {
+                ApplicationInfo info = mIPm.getApplicationInfo(packageName, 0, userId);
+                if (info != null) {
+                    if (mRestrictedProfile) {
+                        mIPm.deletePackageAsUser(packageName, null, mUser.getIdentifier(),
+                                PackageManager.DELETE_SYSTEM_APP);
+                        if (DEBUG) {
+                            Log.d(TAG, "Uninstalling " + packageName);
+                        }
+                    } else {
+                        disableUiForPackage(packageName);
+                        mIPm.setApplicationBlockedSettingAsUser(packageName, true, userId);
+                        if (DEBUG) {
+                            Log.d(TAG, "Blocking " + packageName);
+                        }
+                    }
+                }
+            } catch (RemoteException re) {
+            }
+        }
+    }
+
+    private void disableUiForPackage(String packageName) {
+        AppRestrictionsPreference pref = (AppRestrictionsPreference) findPreference(
+                getKeyForPackage(packageName));
+        if (pref != null) {
+            pref.setEnabled(false);
+        }
+    }
+
+    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 | PackageManager.GET_UNINSTALLED_PACKAGES);
+        for (ResolveInfo app : launchableApps) {
+            if (app.activityInfo != null && app.activityInfo.applicationInfo != null) {
+                final String packageName = app.activityInfo.packageName;
+                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(packageName)) continue;
+                    int enabled = pm.getApplicationEnabledSetting(packageName);
+                    if (enabled == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
+                            || enabled == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
+                        // Check if the app is already enabled for the target user
+                        ApplicationInfo targetUserAppInfo = getAppInfoForUser(packageName,
+                                0, mUser);
+                        if (targetUserAppInfo == null
+                                || (targetUserAppInfo.flags&ApplicationInfo.FLAG_INSTALLED) == 0) {
+                            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 ApplicationInfo getAppInfoForUser(String packageName, int flags, UserHandle user) {
+        try {
+            ApplicationInfo targetUserAppInfo = mIPm.getApplicationInfo(packageName, flags,
+                    user.getIdentifier());
+            return targetUserAppInfo;
+        } catch (RemoteException re) {
+            return null;
+        }
+    }
+
+    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;
+        final IPackageManager ipm = mIPm;
+
+        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(
+                PackageManager.GET_UNINSTALLED_PACKAGES);
+        for (ApplicationInfo app : installedApps) {
+            // If it's not installed, skip
+            if ((app.flags & ApplicationInfo.FLAG_INSTALLED) == 0) continue;
+
+            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);
+            } else {
+                try {
+                    PackageInfo pi = pm.getPackageInfo(app.packageName, 0);
+                    // If it's a system app that requires an account and doesn't see restricted
+                    // accounts, mark for removal. It might get shown in the UI if it has an icon
+                    // but will still be marked as false and immutable.
+                    if (mRestrictedProfile
+                            && pi.requiredAccountType != null && pi.restrictedAccountType == null) {
+                        mSelectedPackages.put(app.packageName, false);
+                    }
+                } catch (NameNotFoundException re) {
+                }
+            }
+        }
+
+        // Get the list of apps already installed for the user
+        mUserApps = null;
+        try {
+            mUserApps = ipm.getInstalledApplications(
+                    PackageManager.GET_UNINSTALLED_PACKAGES, mUser.getIdentifier()).getList();
+        } catch (RemoteException re) {
+        }
+
+        if (mUserApps != null) {
+            for (ApplicationInfo app : mUserApps) {
+                if ((app.flags & ApplicationInfo.FLAG_INSTALLED) == 0) continue;
+
+                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);
+                }
+            }
+        }
+
+        // Sort the list of visible apps
+        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 boolean isPlatformSigned(PackageInfo pi) {
+        return (pi != null && pi.signatures != null &&
+                    mSysPackageInfo.signatures[0].equals(pi.signatures[0]));
+    }
+
+    private boolean isAppEnabledForUser(PackageInfo pi) {
+        if (pi == null) return false;
+        final int flags = pi.applicationInfo.flags;
+        // Return true if it is installed and not blocked
+        return ((flags&ApplicationInfo.FLAG_INSTALLED) != 0
+                && (flags&ApplicationInfo.FLAG_BLOCKED) == 0);
+    }
+
+    private void populateApps() {
+        final Context context = getActivity();
+        if (context == null) return;
+        final PackageManager pm = mPackageManager;
+        final IPackageManager ipm = mIPm;
+
+        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(getKeyForPackage(packageName));
+                p.setSettingsEnabled(hasSettings || isSettingsApp);
+                p.setPersistent(false);
+                p.setOnPreferenceChangeListener(this);
+                p.setOnPreferenceClickListener(this);
+                PackageInfo pi = null;
+                try {
+                    pi = ipm.getPackageInfo(packageName,
+                            PackageManager.GET_UNINSTALLED_PACKAGES
+                            | PackageManager.GET_SIGNATURES, mUser.getIdentifier());
+                } catch (RemoteException e) {
+                }
+                if (pi != null && (pi.requiredForAllUsers || isPlatformSigned(pi))) {
+                    p.setChecked(true);
+                    p.setImmutable(true);
+                    // If the app is required and has no restrictions, skip showing it
+                    if (!hasSettings && !isSettingsApp) continue;
+                    // Get and populate the defaults, since the user is not going to be
+                    // able to toggle this app ON (it's ON by default and immutable).
+                    // Only do this for restricted profiles, not single-user restrictions
+                    if (hasSettings) {
+                        requestRestrictionsForApp(packageName, p, false);
+                    }
+                } else if (!mNewUser && isAppEnabledForUser(pi)) {
+                    p.setChecked(true);
+                }
+                if (mRestrictedProfile
+                        && pi.requiredAccountType != null && pi.restrictedAccountType == null) {
+                    p.setChecked(false);
+                    p.setImmutable(true);
+                    p.setSummary(R.string.app_not_supported_in_limited);
+                }
+                if (mRestrictedProfile && pi.restrictedAccountType != null) {
+                    p.setSummary(R.string.app_sees_restricted_accounts);
+                }
+                if (app.masterEntry != null) {
+                    p.setImmutable(true);
+                    p.setChecked(mSelectedPackages.get(packageName));
+                }
+                mAppList.addPreference(p);
+                if (isSettingsApp) {
+                    p.setOrder(MAX_APP_RESTRICTIONS * 1);
+                } else {
+                    p.setOrder(MAX_APP_RESTRICTIONS * (i + 2));
+                }
+                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;
+            applyUserAppsStates();
+        }
+    }
+
+    private String getKeyForPackage(String packageName) {
+        return PKG_PREFIX + packageName;
+    }
+
+    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 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.getTag() instanceof AppRestrictionsPreference) {
+            AppRestrictionsPreference pref = (AppRestrictionsPreference) v.getTag();
+            if (v.getId() == R.id.app_restrictions_settings) {
+                onAppSettingsIconClicked(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, false);
+                }
+                mAppListChanged = true;
+                // If it's not a restricted profile, apply the changes immediately
+                if (!mRestrictedProfile) {
+                    applyUserAppState(packageName, pref.isChecked());
+                }
+                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:
+                            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 removeRestrictionsForApp(AppRestrictionsPreference preference) {
+        for (Preference p : preference.mChildren) {
+            mAppList.removePreference(p);
+        }
+        preference.mChildren.clear();
+    }
+
+    private void onAppSettingsIconClicked(AppRestrictionsPreference preference) {
+        if (preference.getKey().startsWith(PKG_PREFIX)) {
+            if (preference.isPanelOpen()) {
+                removeRestrictionsForApp(preference);
+            } else {
+                String packageName = preference.getKey().substring(PKG_PREFIX.length());
+                if (packageName.equals(getActivity().getPackageName())) {
+                    // Settings, fake it by using user restrictions
+                    ArrayList<RestrictionEntry> restrictions = RestrictionUtils.getRestrictions(
+                            getActivity(), mUser);
+                    onRestrictionsReceived(preference, packageName, restrictions);
+                } else {
+                    requestRestrictionsForApp(packageName, preference, true /*invoke if custom*/);
+                }
+            }
+            preference.setPanelOpen(!preference.isPanelOpen());
+        }
+    }
+
+    /**
+     * Send a broadcast to the app to query its restrictions
+     * @param packageName package name of the app with restrictions
+     * @param preference the preference item for the app toggle
+     * @param invokeIfCustom whether to directly launch any custom activity that is returned
+     *        for the app.
+     */
+    private void requestRestrictionsForApp(String packageName,
+            AppRestrictionsPreference preference, boolean invokeIfCustom) {
+        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, invokeIfCustom),
+                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;
+        boolean invokeIfCustom;
+
+        RestrictionsResultReceiver(String packageName, AppRestrictionsPreference preference,
+                boolean invokeIfCustom) {
+            super();
+            this.packageName = packageName;
+            this.preference = preference;
+            this.invokeIfCustom = invokeIfCustom;
+        }
+
+        @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);
+                if (mRestrictedProfile) {
+                    mUserManager.setApplicationRestrictions(packageName,
+                            RestrictionUtils.restrictionsToBundle(restrictions), mUser);
+                }
+            } else if (restrictionsIntent != null) {
+                preference.setRestrictions(restrictions);
+                if (invokeIfCustom && AppRestrictionsFragment.this.isResumed()) {
+                    int requestCode = generateCustomActivityRequestCode(
+                            RestrictionsResultReceiver.this.preference);
+                    AppRestrictionsFragment.this.startActivityForResult(
+                            restrictionsIntent, requestCode);
+                }
+            }
+        }
+    }
+
+    private void onRestrictionsReceived(AppRestrictionsPreference preference, String packageName,
+            ArrayList<RestrictionEntry> restrictions) {
+        // Remove any earlier restrictions
+        removeRestrictionsForApp(preference);
+        // 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.mChildren.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);
+
+        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);
+            }
+        }
+        // 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()) {
+                final String packageName = arp.getKey().substring(PKG_PREFIX.length());
+                final boolean newEnabledState = !arp.isChecked();
+                arp.setChecked(newEnabledState);
+                mSelectedPackages.put(packageName, newEnabledState);
+                updateAllEntries(arp.getKey(), newEnabledState);
+                mAppListChanged = true;
+                applyUserAppState(packageName, newEnabledState);
+            }
+            return true;
+        }
+        return false;
+    }
+
+}
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/ProfileUpdateReceiver.java b/src/com/android/settings/users/ProfileUpdateReceiver.java
new file mode 100644
index 0000000..955ee4d
--- /dev/null
+++ b/src/com/android/settings/users/ProfileUpdateReceiver.java
@@ -0,0 +1,63 @@
+/*
+ * 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.users;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+
+import com.android.settings.Utils;
+
+
+/**
+ * Watches for changes to Me Profile in Contacts and writes the photo to the User Manager.
+ */
+public class ProfileUpdateReceiver extends BroadcastReceiver {
+
+    private static final String KEY_PROFILE_NAME_COPIED_ONCE = "name_copied_once";
+
+    @Override
+    public void onReceive(final Context context, Intent intent) {
+        // Profile changed, lets get the photo and write to user manager
+        new Thread() {
+            public void run() {
+                Utils.copyMeProfilePhoto(context, null);
+                copyProfileName(context);
+            }
+        }.start();
+    }
+
+    static void copyProfileName(Context context) {
+        SharedPreferences prefs = context.getSharedPreferences("profile", Context.MODE_PRIVATE);
+        if (prefs.contains(KEY_PROFILE_NAME_COPIED_ONCE)) {
+            return;
+        }
+
+        int userId = UserHandle.myUserId();
+        UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        String profileName = Utils.getMeProfileName(context, false /* partial name */);
+        if (profileName != null && profileName.length() > 0) {
+            um.setUserName(userId, profileName);
+            // Flag that we've written the profile one time at least. No need to do it in the future.
+            prefs.edit().putBoolean(KEY_PROFILE_NAME_COPIED_ONCE, true).commit();
+        }
+    }
+}
diff --git a/src/com/android/settings/users/RestrictedProfileSettings.java b/src/com/android/settings/users/RestrictedProfileSettings.java
new file mode 100644
index 0000000..c293536
--- /dev/null
+++ b/src/com/android/settings/users/RestrictedProfileSettings.java
@@ -0,0 +1,546 @@
+/*
+ * 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.Dialog;
+import android.app.Fragment;
+import android.content.ClipData;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.provider.MediaStore;
+import android.provider.ContactsContract.DisplayPhoto;
+import android.support.v4.content.FileProvider;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.ListPopupWindow;
+import android.widget.TextView;
+
+import com.android.settings.R;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+public class RestrictedProfileSettings extends AppRestrictionsFragment {
+
+    private static final String KEY_SAVED_PHOTO = "pending_photo";
+    private static final String KEY_AWAITING_RESULT = "awaiting_result";
+    private static final int DIALOG_ID_EDIT_USER_INFO = 1;
+    public static final String FILE_PROVIDER_AUTHORITY = "com.android.settings.files";
+
+    private View mHeaderView;
+    private ImageView mUserIconView;
+    private TextView mUserNameView;
+
+    private Dialog mEditUserInfoDialog;
+    private EditUserPhotoController mEditUserPhotoController;
+    private Bitmap mSavedPhoto;
+    private boolean mWaitingForActivityResult;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        if (icicle != null) {
+            mSavedPhoto = (Bitmap) icicle.getParcelable(KEY_SAVED_PHOTO);
+            mWaitingForActivityResult = icicle.getBoolean(KEY_AWAITING_RESULT, false);
+        }
+
+        init(icicle);
+    }
+
+    @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);
+        if (mEditUserInfoDialog != null && mEditUserInfoDialog.isShowing()
+                && mEditUserPhotoController != null) {
+            outState.putParcelable(KEY_SAVED_PHOTO,
+                    mEditUserPhotoController.getNewUserPhotoBitmap());
+        }
+        if (mWaitingForActivityResult) {
+            outState.putBoolean(KEY_AWAITING_RESULT, mWaitingForActivityResult);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // Check if user still exists
+        UserInfo info = getExistingUser(mUser);
+        if (info == null) {
+            finishFragment();
+        } else {
+            ((TextView) mHeaderView.findViewById(android.R.id.title)).setText(info.name);
+            ((ImageView) mHeaderView.findViewById(android.R.id.icon)).setImageDrawable(
+                    getCircularUserIcon());
+        }
+    }
+
+    private UserInfo getExistingUser(UserHandle thisUser) {
+        final List<UserInfo> users = mUserManager.getUsers(true); // Only get non-dying
+        for (UserInfo user : users) {
+            if (user.id == thisUser.getIdentifier()) {
+                return user;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public void startActivityForResult(Intent intent, int requestCode) {
+        mWaitingForActivityResult = true;
+        super.startActivityForResult(intent, requestCode);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        mWaitingForActivityResult = false;
+
+        if (mEditUserInfoDialog != null && mEditUserInfoDialog.isShowing()
+                && mEditUserPhotoController.onActivityResult(requestCode, resultCode, data)) {
+            return;
+        }
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view == mHeaderView) {
+            showDialog(DIALOG_ID_EDIT_USER_INFO);
+        } else {
+            super.onClick(view); // in AppRestrictionsFragment
+        }
+    }
+
+    @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, mWaitingForActivityResult);
+
+            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 = 1;
+        private static final int REQUEST_CODE_TAKE_PHOTO   = 2;
+        private static final int REQUEST_CODE_CROP_PHOTO   = 3;
+
+        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, boolean waiting) {
+            mContext = view.getContext();
+            mFragment = fragment;
+            mImageView = view;
+            mCropPictureUri = createTempImageUri(mContext, CROP_PICTURE_FILE_NAME, !waiting);
+            mTakePictureUri = createTempImageUri(mContext, TAKE_PICTURE_FILE_NAME, !waiting);
+            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, Intent data) {
+            if (resultCode != Activity.RESULT_OK) {
+                return false;
+            }
+            final Uri pictureUri = data != null && data.getData() != null
+                    ? data.getData() : mTakePictureUri;
+            switch (requestCode) {
+                case REQUEST_CODE_CROP_PHOTO:
+                    onPhotoCropped(pictureUri, true);
+                    return true;
+                case REQUEST_CODE_TAKE_PHOTO:
+                case REQUEST_CODE_CHOOSE_PHOTO:
+                    cropPhoto(pictureUri);
+                    return true;
+            }
+            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);
+            appendOutputExtra(intent, mTakePictureUri);
+            mFragment.startActivityForResult(intent, REQUEST_CODE_TAKE_PHOTO);
+        }
+
+        private void choosePhoto() {
+            Intent intent = new Intent(Intent.ACTION_GET_CONTENT, null);
+            intent.setType("image/*");
+            appendOutputExtra(intent, mTakePictureUri);
+            mFragment.startActivityForResult(intent, REQUEST_CODE_CHOOSE_PHOTO);
+        }
+
+        private void cropPhoto(Uri pictureUri) {
+            // TODO: Use a public intent, when there is one.
+            Intent intent = new Intent("com.android.camera.action.CROP");
+            intent.setDataAndType(pictureUri, "image/*");
+            appendOutputExtra(intent, mCropPictureUri);
+            appendCropExtras(intent);
+            if (intent.resolveActivity(mContext.getPackageManager()) != null) {
+                mFragment.startActivityForResult(intent, REQUEST_CODE_CROP_PHOTO);
+            } else {
+                onPhotoCropped(pictureUri, false);
+            }
+        }
+
+        private void appendOutputExtra(Intent intent, Uri pictureUri) {
+            intent.putExtra(MediaStore.EXTRA_OUTPUT, pictureUri);
+            intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                    | Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            intent.setClipData(ClipData.newRawUri(MediaStore.EXTRA_OUTPUT, pictureUri));
+        }
+
+        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 void onPhotoCropped(final Uri data, final boolean cropped) {
+            new AsyncTask<Void, Void, Bitmap>() {
+                @Override
+                protected Bitmap doInBackground(Void... params) {
+                    if (cropped) {
+                        try {
+                            InputStream imageStream = mContext.getContentResolver()
+                                    .openInputStream(data);
+                            return BitmapFactory.decodeStream(imageStream);
+                        } catch (FileNotFoundException fe) {
+                            return null;
+                        }
+                    } else {
+                        // Scale and crop to a square aspect ratio
+                        Bitmap croppedImage = Bitmap.createBitmap(mPhotoSize, mPhotoSize,
+                                Config.ARGB_8888);
+                        Canvas canvas = new Canvas(croppedImage);
+                        Bitmap fullImage = null;
+                        try {
+                            InputStream imageStream = mContext.getContentResolver()
+                                    .openInputStream(data);
+                            fullImage = BitmapFactory.decodeStream(imageStream);
+                        } catch (FileNotFoundException fe) {
+                            return null;
+                        }
+                        if (fullImage != null) {
+                            final int squareSize = Math.min(fullImage.getWidth(),
+                                    fullImage.getHeight());
+                            final int left = (fullImage.getWidth() - squareSize) / 2;
+                            final int top = (fullImage.getHeight() - squareSize) / 2;
+                            Rect rectSource = new Rect(left, top,
+                                    left + squareSize, top + squareSize);
+                            Rect rectDest = new Rect(0, 0, mPhotoSize, mPhotoSize);
+                            Paint paint = new Paint();
+                            canvas.drawBitmap(fullImage, rectSource, rectDest, paint);
+                            return croppedImage;
+                        } else {
+                            // Bah! Got nothin.
+                            return null;
+                        }
+                    }
+                }
+
+                @Override
+                protected void onPostExecute(Bitmap bitmap) {
+                    if (bitmap != null) {
+                        mNewUserPhotoBitmap = bitmap;
+                        mNewUserPhotoDrawable = CircleFramedDrawable
+                                .getInstance(mImageView.getContext(), mNewUserPhotoBitmap);
+                        mImageView.setImageDrawable(mNewUserPhotoDrawable);
+                    }
+                    new File(mContext.getCacheDir(), TAKE_PICTURE_FILE_NAME).delete();
+                    new File(mContext.getCacheDir(), CROP_PICTURE_FILE_NAME).delete();
+                }
+            }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
+        }
+
+        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 Uri createTempImageUri(Context context, String fileName, boolean purge) {
+            final File folder = context.getCacheDir();
+            folder.mkdirs();
+            final File fullPath = new File(folder, fileName);
+            if (purge) {
+                fullPath.delete();
+            }
+            final Uri fileUri =
+                    FileProvider.getUriForFile(context, FILE_PROVIDER_AUTHORITY, fullPath);
+            return fileUri;
+        }
+
+        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/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/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
deleted file mode 100644
index 84cabe9..0000000
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ /dev/null
@@ -1,285 +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.users;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.IPackageManager;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.SystemProperties;
-import android.preference.CheckBoxPreference;
-import android.preference.EditTextPreference;
-import android.preference.Preference;
-import android.preference.PreferenceGroup;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-import com.android.settings.DialogCreatable;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-import java.util.HashMap;
-import java.util.List;
-
-public class UserDetailsSettings extends SettingsPreferenceFragment
-        implements Preference.OnPreferenceChangeListener, DialogCreatable {
-
-    private static final String TAG = "UserDetailsSettings";
-
-    private static final int MENU_REMOVE_USER = Menu.FIRST;
-    private static final int DIALOG_CONFIRM_REMOVE = 1;
-
-    private static final String KEY_USER_NAME = "user_name";
-    private static final String KEY_INSTALLED_APPS = "market_apps_category";
-    private static final String KEY_SYSTEM_APPS = "system_apps_category";
-    public static final String EXTRA_USER_ID = "user_id";
-
-    private static final String[] SYSTEM_APPS = {
-            "com.google.android.browser",
-            "com.google.android.gm",
-            "com.google.android.youtube"
-    };
-
-    static class AppState {
-        boolean dirty;
-        boolean enabled;
-
-        AppState(boolean enabled) {
-            this.enabled = enabled;
-        }
-    }
-
-    private HashMap<String, AppState> mAppStates = new HashMap<String, AppState>();
-    private PreferenceGroup mSystemAppGroup;
-    private PreferenceGroup mInstalledAppGroup;
-    private EditTextPreference mNamePref;
-
-    private IPackageManager mIPm;
-    private PackageManager mPm;
-    private int mUserId;
-    private boolean mNewUser;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        addPreferencesFromResource(R.xml.user_details);
-        Bundle args = getArguments();
-        mNewUser = args == null || args.getInt(EXTRA_USER_ID, -1) == -1;
-        mUserId = mNewUser ? -1 : args.getInt(EXTRA_USER_ID, -1);
-        mIPm = IPackageManager.Stub.asInterface(ServiceManager.getService("package"));
-
-        if (mUserId == -1) {
-            try {
-                mUserId = mIPm.createUser(getString(R.string.user_new_user_name), 0).id;
-            } catch (RemoteException re) {
-            }
-        }
-        mSystemAppGroup = (PreferenceGroup) findPreference(KEY_SYSTEM_APPS);
-        mInstalledAppGroup = (PreferenceGroup) findPreference(KEY_INSTALLED_APPS);
-        mNamePref = (EditTextPreference) findPreference(KEY_USER_NAME);
-        mNamePref.setOnPreferenceChangeListener(this);
-
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        mPm = getActivity().getPackageManager();
-        if (mUserId > 0) {
-            initExistingUser();
-        } else {
-            initNewUser();
-        }
-        refreshApps();
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        MenuItem addAccountItem = menu.add(0, MENU_REMOVE_USER, 0,
-                mNewUser ? R.string.user_discard_user_menu : R.string.user_remove_user_menu);
-        addAccountItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
-                | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        final int itemId = item.getItemId();
-        if (itemId == MENU_REMOVE_USER) {
-            onRemoveUserClicked();
-            return true;
-        } else {
-            return super.onOptionsItemSelected(item);
-        }
-    }
-
-    private void initExistingUser() {
-        List<UserInfo> users = mPm.getUsers();
-        UserInfo foundUser = null;
-        for (UserInfo user : users) {
-            if (user.id == mUserId) {
-                foundUser = user;
-                break;
-            }
-        }
-        if (foundUser != null) {
-            mNamePref.setSummary(foundUser.name);
-            mNamePref.setText(foundUser.name);
-        }
-    }
-
-    private void initNewUser() {
-        // TODO: Check if there's already a "New user" and localize
-        mNamePref.setText(getString(R.string.user_new_user_name));
-        mNamePref.setSummary(getString(R.string.user_new_user_name));
-    }
-
-    private void onRemoveUserClicked() {
-        if (mNewUser) {
-            removeUserNow();
-        } else {
-            showDialog(DIALOG_CONFIRM_REMOVE);
-        }
-    }
-
-    private void removeUserNow() {
-        try {
-            mIPm.removeUser(mUserId);
-        } catch (RemoteException re) {
-            // Couldn't remove user. Shouldn't happen
-            Log.e(TAG, "Couldn't remove user " + mUserId + "\n" + re);
-        }
-        finish();
-    }
-
-    private void insertAppInfo(PreferenceGroup group, HashMap<String, AppState> appStateMap,
-            PackageInfo info, boolean defaultState) {
-        if (info != null) {
-            String pkgName = info.packageName;
-            String name = info.applicationInfo.loadLabel(mPm).toString();
-            Drawable icon = info.applicationInfo.loadIcon(mPm);
-            AppState appState = appStateMap.get(info.packageName);
-            boolean enabled = appState == null ? defaultState : appState.enabled;
-            CheckBoxPreference appPref = new CheckBoxPreference(getActivity());
-            appPref.setTitle(name != null ? name : pkgName);
-            appPref.setIcon(icon);
-            appPref.setChecked(enabled);
-            appPref.setKey(pkgName);
-            appPref.setPersistent(false);
-            appPref.setOnPreferenceChangeListener(this);
-            group.addPreference(appPref);
-        }
-    }
-
-    private void refreshApps() {
-        mSystemAppGroup.removeAll();
-        mInstalledAppGroup.removeAll();
-
-        boolean firstTime = mAppStates.isEmpty();
-
-        final Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
-        mainIntent.addCategory(Intent.CATEGORY_LAUNCHER);
-        List<ResolveInfo> apps = mPm.queryIntentActivities(mainIntent, 0);
-
-        for (ResolveInfo resolveInfo : apps) {
-            PackageInfo info;
-            try {
-                info = mIPm.getPackageInfo(resolveInfo.activityInfo.packageName,
-                        0 /* flags */,
-                    mUserId < 0 ? 0 : mUserId);
-            } catch (RemoteException re) {
-                continue;
-            }
-            if (firstTime) {
-                mAppStates.put(resolveInfo.activityInfo.packageName,
-                        new AppState(info.applicationInfo.enabled));
-            }
-            if ((info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
-                if (mSystemAppGroup.findPreference(info.packageName) != null) {
-                    continue;
-                }
-                insertAppInfo(mSystemAppGroup, mAppStates, info, false);
-            } else {
-                if (mInstalledAppGroup.findPreference(info.packageName) != null) {
-                    continue;
-                }
-                insertAppInfo(mInstalledAppGroup, mAppStates, info, false);
-            }
-        }
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference instanceof CheckBoxPreference) {
-            String packageName = preference.getKey();
-            int newState = ((Boolean) newValue) ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
-                    : PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER;
-            try {
-                mIPm.setApplicationEnabledSetting(packageName, newState, 0, mUserId);
-            } catch (RemoteException re) {
-                Log.e(TAG, "Unable to change enabled state of package " + packageName
-                        + " for user " + mUserId);
-            }
-        } else if (preference == mNamePref) {
-            String name = (String) newValue;
-            if (TextUtils.isEmpty(name)) {
-                return false;
-            }
-            try {
-                mIPm.updateUserName(mUserId, (String) newValue);
-                mNamePref.setSummary((String) newValue);
-            } catch (RemoteException re) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public Dialog onCreateDialog(int dialogId) {
-        switch (dialogId) {
-            case DIALOG_CONFIRM_REMOVE:
-                return new AlertDialog.Builder(getActivity())
-                    .setTitle(R.string.user_confirm_remove_title)
-                    .setMessage(R.string.user_confirm_remove_message)
-                    .setPositiveButton(android.R.string.ok,
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int which) {
-                                removeUserNow();
-                            }
-                    })
-                    .setNegativeButton(android.R.string.cancel, null)
-                    .create();
-            default:
-                return null;
-        }
-    }
-}
diff --git a/src/com/android/settings/users/UserPreference.java b/src/com/android/settings/users/UserPreference.java
new file mode 100644
index 0000000..9f53aa5
--- /dev/null
+++ b/src/com/android/settings/users/UserPreference.java
@@ -0,0 +1,112 @@
+/*
+ * 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.users;
+
+import com.android.internal.util.CharSequences;
+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;
+import android.view.View;
+import android.view.View.OnClickListener;
+
+public class UserPreference extends Preference {
+
+    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, null, null);
+    }
+
+    UserPreference(Context context, AttributeSet attrs, int userId,
+            OnClickListener settingsListener,
+            OnClickListener deleteListener) {
+        super(context, attrs);
+        if (deleteListener != null || settingsListener != null) {
+            setWidgetLayoutResource(R.layout.preference_user_delete_widget);
+        }
+        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) {
+            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);
+    }
+
+    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;
+            mSerialNumber = ((UserManager) getContext().getSystemService(Context.USER_SERVICE))
+                    .getUserSerialNumber(mUserId);
+            if (mSerialNumber < 0) return mUserId;
+        }
+        return mSerialNumber;
+    }
+
+    public int getUserId() {
+        return mUserId;
+    }
+
+    public int compareTo(Preference another) {
+        if (another instanceof UserPreference) {
+            return getSerialNumber() > ((UserPreference) another).getSerialNumber() ? 1 : -1;
+        } else {
+            return 1;
+        }
+    }
+}
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 9380586..bbae37d 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -16,94 +16,800 @@
 
 package com.android.settings.users;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+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;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
 import android.content.pm.UserInfo;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.os.RemoteException;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceGroup;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.Contacts;
+import android.provider.Settings.Secure;
+import android.util.Log;
+import android.util.SparseArray;
 import android.view.Menu;
 import android.view.MenuInflater;
 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.OwnerInfoSettings;
 import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.SelectableEditTextPreference;
+import com.android.settings.Utils;
 
-import java.util.List;
+public class UserSettings extends RestrictedSettingsFragment
+        implements OnPreferenceClickListener, OnClickListener, DialogInterface.OnDismissListener,
+        Preference.OnPreferenceChangeListener {
 
-public class UserSettings extends SettingsPreferenceFragment
-        implements OnPreferenceClickListener {
+    private static final String TAG = "UserSettings";
+
+    /** UserId of the user being removed */
+    private static final String SAVE_REMOVING_USER = "removing_user";
+    /** UserId of the user that was just added */
+    private static final String SAVE_ADDING_USER = "adding_user";
 
     private static final String KEY_USER_LIST = "user_list";
-    private static final int MENU_ADD_USER = Menu.FIRST;
+    private static final String KEY_USER_ME = "user_me";
+    private static final String KEY_ADD_USER = "user_add";
+
+    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_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";
+
+    static final int[] USER_DRAWABLES = {
+        R.drawable.avatar_default_1,
+        R.drawable.avatar_default_2,
+        R.drawable.avatar_default_3,
+        R.drawable.avatar_default_4,
+        R.drawable.avatar_default_5,
+        R.drawable.avatar_default_6,
+        R.drawable.avatar_default_7,
+        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;
+    private boolean mProfileExists;
+
+    private final Object mUserLock = new Object();
+    private UserManager mUserManager;
+    private SparseArray<Bitmap> mUserIcons = new SparseArray<Bitmap>();
+    private boolean mIsOwner = UserHandle.myUserId() == UserHandle.USER_OWNER;
+
+    public UserSettings() {
+        super(RestrictedSettingsFragment.RESTRICTIONS_PIN_SET);
+    }
+
+    private Handler mHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+            case MESSAGE_UPDATE_LIST:
+                updateUserList();
+                break;
+            case MESSAGE_SETUP_USER:
+                onUserCreated(msg.arg1);
+                break;
+            case MESSAGE_CONFIG_USER:
+                onManageUserClicked(msg.arg1, true);
+                break;
+            }
+        }
+    };
+
+    private BroadcastReceiver mUserChangeReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent.getAction().equals(Intent.ACTION_USER_REMOVED)) {
+                mRemovingUserId = -1;
+            } else if (intent.getAction().equals(Intent.ACTION_USER_INFO_CHANGED)) {
+                int userHandle = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, -1);
+                if (userHandle != -1) {
+                    mUserIcons.remove(userHandle);
+                }
+            }
+            mHandler.sendEmptyMessage(MESSAGE_UPDATE_LIST);
+        }
+    };
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+
+        if (icicle != null) {
+            if (icicle.containsKey(SAVE_ADDING_USER)) {
+                mAddedUserId = icicle.getInt(SAVE_ADDING_USER);
+            }
+            if (icicle.containsKey(SAVE_REMOVING_USER)) {
+                mRemovingUserId = icicle.getInt(SAVE_REMOVING_USER);
+            }
+        }
+
+        mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
         addPreferencesFromResource(R.xml.user_settings);
         mUserListCategory = (PreferenceGroup) findPreference(KEY_USER_LIST);
-
+        mMePreference = new UserPreference(getActivity(), null, UserHandle.myUserId(),
+                mUserManager.isLinkedUser() ? null : this, null);
+        mMePreference.setKey(KEY_USER_ME);
+        mMePreference.setOnPreferenceClickListener(this);
+        if (mIsOwner) {
+            mMePreference.setSummary(R.string.user_owner);
+        }
+        mAddUser = findPreference(KEY_ADD_USER);
+        mAddUser.setOnPreferenceClickListener(this);
+        if (!mIsOwner || UserManager.getMaxSupportedUsers() < 2) {
+            removePreference(KEY_ADD_USER);
+        }
+        loadProfile();
         setHasOptionsMenu(true);
+        IntentFilter filter = new IntentFilter(Intent.ACTION_USER_REMOVED);
+        filter.addAction(Intent.ACTION_USER_INFO_CHANGED);
+        getActivity().registerReceiverAsUser(mUserChangeReceiver, UserHandle.ALL, filter, null,
+                mHandler);
     }
 
     @Override
     public void onResume() {
         super.onResume();
+        loadProfile();
         updateUserList();
     }
 
     @Override
+    public void onDestroy() {
+        super.onDestroy();
+        getActivity().unregisterReceiver(mUserChangeReceiver);
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putInt(SAVE_ADDING_USER, mAddedUserId);
+        outState.putInt(SAVE_REMOVING_USER, mRemovingUserId);
+    }
+
+    @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        MenuItem addAccountItem = menu.add(0, MENU_ADD_USER, 0, R.string.user_add_user_menu);
-        addAccountItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
-                | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+        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));
+            removeThisUser.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+        }
+        super.onCreateOptionsMenu(menu, inflater);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         final int itemId = item.getItemId();
-        if (itemId == MENU_ADD_USER) {
-            onAddUserClicked();
+        if (itemId == MENU_REMOVE_USER) {
+            onRemoveUserClicked(UserHandle.myUserId());
             return true;
         } else {
             return super.onOptionsItemSelected(item);
         }
     }
 
-    private void onAddUserClicked() {
-        ((PreferenceActivity) getActivity()).startPreferencePanel(
-                UserDetailsSettings.class.getName(), null, R.string.user_details_title,
-                null, this, 0);
+    private void loadProfile() {
+        mProfileExists = false;
+        new AsyncTask<Void, Void, String>() {
+            @Override
+            protected void onPostExecute(String result) {
+                finishLoadProfile(result);
+            }
+
+            @Override
+            protected String doInBackground(Void... values) {
+                UserInfo user = mUserManager.getUserInfo(UserHandle.myUserId());
+                if (user.iconPath == null || user.iconPath.equals("")) {
+                    assignProfilePhoto(user);
+                }
+                String profileName = getProfileName();
+                if (profileName == null) {
+                    profileName = user.name;
+                }
+                return profileName;
+            }
+        }.execute();
     }
 
-    private void updateUserList() {
-        List<UserInfo> users = getActivity().getPackageManager().getUsers();
+    private void finishLoadProfile(String 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) {
+            mMePreference.setIcon(encircle(b));
+            mUserIcons.put(myUserId, b);
+        }
+    }
 
-        mUserListCategory.removeAll();
-        for (UserInfo user : users) {
-            if (user.id == 0) continue;
-            Preference pref = new Preference(getActivity());
-            pref.setTitle(user.name);
-            pref.setOnPreferenceClickListener(this);
-            pref.setKey("id=" + user.id);
-            mUserListCategory.addPreference(pref);
+    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) {
+                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;
+                }
+            }
+        }
+    }
+
+    private void onRemoveUserClicked(int userId) {
+        synchronized (mUserLock) {
+            if (mRemovingUserId == -1 && !mAddingUser) {
+                mRemovingUserId = userId;
+                showDialog(DIALOG_CONFIRM_REMOVE);
+            }
+        }
+    }
+
+    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(RestrictedProfileSettings.EXTRA_USER_ID, userId);
+            extras.putBoolean(RestrictedProfileSettings.EXTRA_NEW_USER, newUser);
+            ((PreferenceActivity) getActivity()).startPreferencePanel(
+                    RestrictedProfileSettings.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;
+        if (mUserManager.getUserInfo(userId).isRestricted()) {
+            showDialog(DIALOG_SETUP_PROFILE);
+        } else {
+            showDialog(DIALOG_SETUP_USER);
         }
     }
 
     @Override
+    public void onDialogShowing() {
+        super.onDialogShowing();
+
+        setOnDismissListener(this);
+    }
+
+    @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
+                            : (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
+                            : (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) {
+                                removeUserNow();
+                            }
+                    })
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .create();
+                return dlg;
+            }
+            case DIALOG_USER_CANNOT_MANAGE:
+                return new AlertDialog.Builder(context)
+                    .setMessage(R.string.user_cannot_manage_message)
+                    .setPositiveButton(android.R.string.ok, null)
+                    .create();
+            case DIALOG_ADD_USER: {
+                final SharedPreferences preferences = getActivity().getPreferences(
+                        Context.MODE_PRIVATE);
+                final boolean longMessageDisplayed = preferences.getBoolean(
+                        KEY_ADD_USER_LONG_MESSAGE_DISPLAYED, false);
+                final int messageResId = longMessageDisplayed
+                        ? R.string.user_add_user_message_short
+                        : R.string.user_add_user_message_long;
+                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();
+                return dlg;
+            }
+            case DIALOG_SETUP_USER: {
+                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:
+                return null;
+        }
+    }
+
+    private void removeUserNow() {
+        if (mRemovingUserId == UserHandle.myUserId()) {
+            removeThisUser();
+        } else {
+            new Thread() {
+                public void run() {
+                    synchronized (mUserLock) {
+                        mUserManager.removeUser(mRemovingUserId);
+                        mHandler.sendEmptyMessage(MESSAGE_UPDATE_LIST);
+                    }
+                }
+            }.start();
+        }
+    }
+
+    private void removeThisUser() {
+        try {
+            ActivityManagerNative.getDefault().switchUser(UserHandle.USER_OWNER);
+            ((UserManager) getActivity().getSystemService(Context.USER_SERVICE))
+                    .removeUser(UserHandle.myUserId());
+        } catch (RemoteException re) {
+            Log.e(TAG, "Unable to remove self user");
+        }
+    }
+
+    private void addUserNow(final int userType) {
+        synchronized (mUserLock) {
+            mAddingUser = true;
+            //updateUserList();
+            new Thread() {
+                public void run() {
+                    UserInfo user = null;
+                    // Could take a few seconds
+                    if (userType == USER_TYPE_USER) {
+                        user = createTrustedUser();
+                    } else {
+                        user = createLimitedUser();
+                    }
+                    synchronized (mUserLock) {
+                        mAddingUser = false;
+                        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();
+        }
+    }
+
+    private void switchUserNow(int userId) {
+        try {
+            ActivityManagerNative.getDefault().switchUser(userId);
+        } catch (RemoteException re) {
+            // Nothing to do
+        }
+    }
+
+    private void updateUserList() {
+        if (getActivity() == null) return;
+        List<UserInfo> users = mUserManager.getUsers(true);
+
+        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;
+            } else {
+                pref = new UserPreference(getActivity(), null, user.id,
+                        mIsOwner && user.isRestricted() ? this : null,
+                        mIsOwner ? this : null);
+                pref.setOnPreferenceClickListener(this);
+                pref.setKey("id=" + user.id);
+                mUserListCategory.addPreference(pref);
+                if (user.id == UserHandle.USER_OWNER) {
+                    pref.setSummary(R.string.user_owner);
+                }
+                pref.setTitle(user.name);
+            }
+            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(encircle(R.drawable.avatar_default_1));
+                } else {
+                    setPhotoId(pref, user);
+                }
+            }
+        }
+        // Add a temporary entry for the user being created
+        if (mAddingUser) {
+            Preference pref = new UserPreference(getActivity(), null, UserPreference.USERID_UNKNOWN,
+                    null, null);
+            pref.setEnabled(false);
+            pref.setTitle(R.string.user_new_user_name);
+            pref.setIcon(encircle(R.drawable.avatar_default_1));
+            mUserListCategory.addPreference(pref);
+        }
+        getActivity().invalidateOptionsMenu();
+
+        // Load the icons
+        if (missingIcons.size() > 0) {
+            loadIconsAsync(missingIcons);
+        }
+        boolean moreUsers = mUserManager.getMaxSupportedUsers() > users.size();
+        mAddUser.setEnabled(moreUsers);
+    }
+
+    private void loadIconsAsync(List<Integer> missingIcons) {
+        final Resources resources = getResources();
+        new AsyncTask<List<Integer>, Void, Void>() {
+            @Override
+            protected void onPostExecute(Void result) {
+                updateUserList();
+            }
+
+            @Override
+            protected Void doInBackground(List<Integer>... values) {
+                for (int userId : values[0]) {
+                    Bitmap bitmap = mUserManager.getUserIcon(userId);
+                    mUserIcons.append(userId, bitmap);
+                }
+                return null;
+            }
+        }.execute(missingIcons);
+    }
+
+    private void assignProfilePhoto(final UserInfo user) {
+        if (!Utils.copyMeProfilePhoto(getActivity(), user)) {
+            assignDefaultPhoto(user);
+        }
+    }
+
+    private String getProfileName() {
+        String name = Utils.getMeProfileName(getActivity(), true);
+        if (name != null) {
+            mProfileExists = true;
+        }
+        return name;
+    }
+
+    private void assignDefaultPhoto(UserInfo user) {
+        Bitmap bitmap = BitmapFactory.decodeResource(getResources(),
+                USER_DRAWABLES[user.id % USER_DRAWABLES.length]);
+        mUserManager.setUserIcon(user.id, bitmap);
+    }
+
+    private void setPhotoId(Preference pref, UserInfo user) {
+        Bitmap bitmap = mUserIcons.get(user.id);
+        if (bitmap != null) {
+            pref.setIcon(encircle(bitmap));
+        }
+    }
+
+    private void setUserName(String name) {
+        mUserManager.setUserName(UserHandle.myUserId(), name);
+        mNicknamePreference.setSummary(name);
+        getActivity().invalidateOptionsMenu();
+    }
+
+    @Override
     public boolean onPreferenceClick(Preference pref) {
-        String sid = pref.getKey();
-        if (sid != null && sid.startsWith("id=")) {
-            int id = Integer.parseInt(sid.substring(3));
-            Bundle args = new Bundle();
-            args.putInt(UserDetailsSettings.EXTRA_USER_ID, id);
-            ((PreferenceActivity) getActivity()).startPreferencePanel(
-                    UserDetailsSettings.class.getName(),
-                    args, 0, pref.getTitle(), this, 0);
+        if (pref == mMePreference) {
+            Intent editProfile;
+            if (!mProfileExists) {
+                editProfile = new Intent(Intent.ACTION_INSERT, Contacts.CONTENT_URI);
+                // TODO: Make this a proper API
+                editProfile.putExtra("newLocalProfile", true);
+            } else {
+                editProfile = new Intent(Intent.ACTION_EDIT, ContactsContract.Profile.CONTENT_URI);
+            }
+            // To make sure that it returns back here when done
+            // TODO: Make this a proper API
+            editProfile.putExtra("finishActivityOnSaveCompleted", true);
+
+            // 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
+            UserInfo user = mUserManager.getUserInfo(userId);
+            if (UserHandle.myUserId() != UserHandle.USER_OWNER) {
+                showDialog(DIALOG_USER_CANNOT_MANAGE);
+            } else {
+                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;
+    }
+
+    private boolean isInitialized(UserInfo user) {
+        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();
+            switch (v.getId()) {
+            case UserPreference.DELETE_ID:
+                onRemoveUserClicked(userId);
+                break;
+            case UserPreference.SETTINGS_ID:
+                onManageUserClicked(userId, false);
+                break;
+            }
+        }
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        synchronized (mUserLock) {
+            mAddingUser = false;
+            mRemovingUserId = -1;
+            updateUserList();
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (preference == mNicknamePreference) {
+            String value = (String) newValue;
+            if (preference == mNicknamePreference && value != null
+                    && value.length() > 0) {
+                setUserName(value);
+            }
             return true;
         }
         return false;
     }
+
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_users;
+    }
 }
diff --git a/src/com/android/settings/users/UserUtils.java b/src/com/android/settings/users/UserUtils.java
new file mode 100644
index 0000000..946d871
--- /dev/null
+++ b/src/com/android/settings/users/UserUtils.java
@@ -0,0 +1,34 @@
+/*
+ * 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.users;
+
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.UserManager;
+
+public class UserUtils {
+    public static Drawable getUserIcon(Context context, UserManager um, UserInfo user, Resources res) {
+        if (user.iconPath == null) return null;
+        Bitmap icon = um.getUserIcon(user.id);
+        if (icon == null) return null;
+        return CircleFramedDrawable.getInstance(context, icon);
+    }
+}
diff --git a/src/com/android/settings/vpn2/VpnDialog.java b/src/com/android/settings/vpn2/VpnDialog.java
index ca85d99..9ef269b 100644
--- a/src/com/android/settings/vpn2/VpnDialog.java
+++ b/src/com/android/settings/vpn2/VpnDialog.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.vpn2;
 
+import com.android.internal.net.VpnProfile;
 import com.android.settings.R;
 
 import android.app.AlertDialog;
diff --git a/src/com/android/settings/vpn2/VpnProfile.java b/src/com/android/settings/vpn2/VpnProfile.java
deleted file mode 100644
index d4d0e79..0000000
--- a/src/com/android/settings/vpn2/VpnProfile.java
+++ /dev/null
@@ -1,121 +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.vpn2;
-
-import java.nio.charset.Charsets;
-
-/**
- * Parcel-like entity class for VPN profiles. To keep things simple, all
- * fields are package private. Methods are provided for serialization, so
- * storage can be implemented easily. Two rules are set for this class.
- * First, all fields must be kept non-null. Second, always make a copy
- * using clone() before modifying.
- */
-class VpnProfile implements Cloneable {
-    // Match these constants with R.array.vpn_types.
-    static final int TYPE_PPTP = 0;
-    static final int TYPE_L2TP_IPSEC_PSK = 1;
-    static final int TYPE_L2TP_IPSEC_RSA = 2;
-    static final int TYPE_IPSEC_XAUTH_PSK = 3;
-    static final int TYPE_IPSEC_XAUTH_RSA = 4;
-    static final int TYPE_IPSEC_HYBRID_RSA = 5;
-    static final int TYPE_MAX = 5;
-
-    // Entity fields.
-    final String key;           // -1
-    String name = "";           // 0
-    int type = TYPE_PPTP;       // 1
-    String server = "";         // 2
-    String username = "";       // 3
-    String password = "";       // 4
-    String dnsServers = "";     // 5
-    String searchDomains = "";  // 6
-    String routes = "";         // 7
-    boolean mppe = true;        // 8
-    String l2tpSecret = "";     // 9
-    String ipsecIdentifier = "";// 10
-    String ipsecSecret = "";    // 11
-    String ipsecUserCert = "";  // 12
-    String ipsecCaCert = "";    // 13
-    String ipsecServerCert = "";// 14
-
-    // Helper fields.
-    boolean saveLogin = false;
-
-    VpnProfile(String key) {
-        this.key = key;
-    }
-
-    static VpnProfile decode(String key, byte[] value) {
-        try {
-            if (key == null) {
-                return null;
-            }
-
-            String[] values = new String(value, Charsets.UTF_8).split("\0", -1);
-            // There can be 14 or 15 values in ICS MR1.
-            if (values.length < 14 || values.length > 15) {
-                return null;
-            }
-
-            VpnProfile profile = new VpnProfile(key);
-            profile.name = values[0];
-            profile.type = Integer.valueOf(values[1]);
-            if (profile.type < 0 || profile.type > TYPE_MAX) {
-                return null;
-            }
-            profile.server = values[2];
-            profile.username = values[3];
-            profile.password = values[4];
-            profile.dnsServers = values[5];
-            profile.searchDomains = values[6];
-            profile.routes = values[7];
-            profile.mppe = Boolean.valueOf(values[8]);
-            profile.l2tpSecret = values[9];
-            profile.ipsecIdentifier = values[10];
-            profile.ipsecSecret = values[11];
-            profile.ipsecUserCert = values[12];
-            profile.ipsecCaCert = values[13];
-            profile.ipsecServerCert = (values.length > 14) ? values[14] : "";
-
-            profile.saveLogin = !profile.username.isEmpty() || !profile.password.isEmpty();
-            return profile;
-        } catch (Exception e) {
-            // ignore
-        }
-        return null;
-    }
-
-    byte[] encode() {
-        StringBuilder builder = new StringBuilder(name);
-        builder.append('\0').append(type);
-        builder.append('\0').append(server);
-        builder.append('\0').append(saveLogin ? username : "");
-        builder.append('\0').append(saveLogin ? password : "");
-        builder.append('\0').append(dnsServers);
-        builder.append('\0').append(searchDomains);
-        builder.append('\0').append(routes);
-        builder.append('\0').append(mppe);
-        builder.append('\0').append(l2tpSecret);
-        builder.append('\0').append(ipsecIdentifier);
-        builder.append('\0').append(ipsecSecret);
-        builder.append('\0').append(ipsecUserCert);
-        builder.append('\0').append(ipsecCaCert);
-        builder.append('\0').append(ipsecServerCert);
-        return builder.toString().getBytes(Charsets.UTF_8);
-    }
-}
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index a26623b..73aae99 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -16,51 +16,66 @@
 
 package com.android.settings.vpn2;
 
-import com.android.settings.R;
-
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.res.Resources;
+import android.net.ConnectivityManager;
 import android.net.IConnectivityManager;
-import android.net.LinkProperties;
-import android.net.RouteInfo;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.ServiceManager;
+import android.os.SystemProperties;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
 import android.security.Credentials;
 import android.security.KeyStore;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.LayoutInflater;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
 import android.widget.Toast;
 
 import com.android.internal.net.LegacyVpnInfo;
 import com.android.internal.net.VpnConfig;
+import com.android.internal.net.VpnProfile;
+import com.android.internal.util.ArrayUtils;
+import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
+import com.google.android.collect.Lists;
 
-import java.net.Inet4Address;
-import java.nio.charset.Charsets;
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 public class VpnSettings extends SettingsPreferenceFragment implements
         Handler.Callback, Preference.OnPreferenceClickListener,
         DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
-
     private static final String TAG = "VpnSettings";
 
+    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
             .asInterface(ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
     private final KeyStore mKeyStore = KeyStore.getInstance();
     private boolean mUnlocking = false;
 
-    private HashMap<String, VpnPreference> mPreferences;
+    private HashMap<String, VpnPreference> mPreferences = new HashMap<String, VpnPreference>();
     private VpnDialog mDialog;
 
     private Handler mUpdater;
@@ -72,8 +87,9 @@
     @Override
     public void onCreate(Bundle savedState) {
         super.onCreate(savedState);
+
+        setHasOptionsMenu(true);
         addPreferencesFromResource(R.xml.vpn_settings2);
-        getPreferenceScreen().setOrderingAsAdded(false);
 
         if (savedState != null) {
             VpnProfile profile = VpnProfile.decode(savedState.getString("VpnKey"),
@@ -86,6 +102,45 @@
     }
 
     @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.vpn, menu);
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+
+        // Hide lockdown VPN on devices that require IMS authentication
+        if (SystemProperties.getBoolean("persist.radio.imsregrequired", false)) {
+            menu.findItem(R.id.vpn_lockdown).setVisible(false);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.vpn_create: {
+                // Generate a new key. Here we just use the current time.
+                long millis = System.currentTimeMillis();
+                while (mPreferences.containsKey(Long.toHexString(millis))) {
+                    ++millis;
+                }
+                mDialog = new VpnDialog(
+                        getActivity(), this, new VpnProfile(Long.toHexString(millis)), true);
+                mDialog.setOnDismissListener(this);
+                mDialog.show();
+                return true;
+            }
+            case R.id.vpn_lockdown: {
+                LockdownConfigFragment.show(this);
+                return true;
+            }
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
     public void onSaveInstanceState(Bundle savedState) {
         // We do not save view hierarchy, as they are just profiles.
         if (mDialog != null) {
@@ -101,8 +156,14 @@
     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.state() != KeyStore.State.UNLOCKED) {
+        if (!mKeyStore.isUnlocked()) {
             if (!mUnlocking) {
                 // Let us unlock KeyStore. See you later!
                 Credentials.getInstance().unlock(getActivity());
@@ -120,28 +181,17 @@
         // Currently we are the only user of profiles in KeyStore.
         // Assuming KeyStore and KeyGuard do the right thing, we can
         // safely cache profiles in the memory.
-        if (mPreferences == null) {
-            mPreferences = new HashMap<String, VpnPreference>();
+        if (mPreferences.size() == 0) {
             PreferenceGroup group = getPreferenceScreen();
 
-            String[] keys = mKeyStore.saw(Credentials.VPN);
-            if (keys != null && keys.length > 0) {
-                Context context = getActivity();
-
-                for (String key : keys) {
-                    VpnProfile profile = VpnProfile.decode(key,
-                            mKeyStore.get(Credentials.VPN + key));
-                    if (profile == null) {
-                        Log.w(TAG, "bad profile: key = " + key);
-                        mKeyStore.delete(Credentials.VPN + key);
-                    } else {
-                        VpnPreference preference = new VpnPreference(context, profile);
-                        mPreferences.put(key, preference);
-                        group.addPreference(preference);
-                    }
-                }
+            final Context context = getActivity();
+            final List<VpnProfile> profiles = loadVpnProfiles(mKeyStore);
+            for (VpnProfile profile : profiles) {
+                final VpnPreference pref = new VpnPreference(context, profile);
+                pref.setOnPreferenceClickListener(this);
+                mPreferences.put(profile.key, pref);
+                group.addPreference(pref);
             }
-            group.findPreference("add_network").setOnPreferenceClickListener(this);
         }
 
         // Show the dialog if there is one.
@@ -187,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);
@@ -196,6 +247,7 @@
                 preference.update(profile);
             } else {
                 preference = new VpnPreference(getActivity(), profile);
+                preference.setOnPreferenceClickListener(this);
                 mPreferences.put(profile.key, preference);
                 getPreferenceScreen().addPreference(preference);
             }
@@ -322,136 +374,12 @@
         return true;
     }
 
-    private String[] getDefaultNetwork() throws Exception {
-        LinkProperties network = mService.getActiveLinkProperties();
-        if (network == null) {
-            Toast.makeText(getActivity(), R.string.vpn_no_network, Toast.LENGTH_LONG).show();
-            throw new IllegalStateException("Network is not available");
-        }
-        String interfaze = network.getInterfaceName();
-        if (interfaze == null) {
-            Toast.makeText(getActivity(), R.string.vpn_no_network, Toast.LENGTH_LONG).show();
-            throw new IllegalStateException("Cannot get the default interface");
-        }
-        String gateway = null;
-        for (RouteInfo route : network.getRoutes()) {
-            // Currently legacy VPN only works on IPv4.
-            if (route.isDefaultRoute() && route.getGateway() instanceof Inet4Address) {
-                gateway = route.getGateway().getHostAddress();
-                break;
-            }
-        }
-        if (gateway == null) {
-            Toast.makeText(getActivity(), R.string.vpn_no_network, Toast.LENGTH_LONG).show();
-            throw new IllegalStateException("Cannot get the default gateway");
-        }
-        return new String[] {interfaze, gateway};
-    }
-
     private void connect(VpnProfile profile) throws Exception {
-        // Get the default interface and the default gateway.
-        String[] network = getDefaultNetwork();
-        String interfaze = network[0];
-        String gateway = network[1];
-
-        // Load certificates.
-        String privateKey = "";
-        String userCert = "";
-        String caCert = "";
-        String serverCert = "";
-        if (!profile.ipsecUserCert.isEmpty()) {
-            /*
-             * VPN has a special exception in keystore to allow it to use system
-             * UID certs.
-             */
-            privateKey = Credentials.USER_PRIVATE_KEY + profile.ipsecUserCert;
-            byte[] value = mKeyStore.get(Credentials.USER_CERTIFICATE + profile.ipsecUserCert);
-            userCert = (value == null) ? null : new String(value, Charsets.UTF_8);
+        try {
+            mService.startLegacyVpn(profile);
+        } catch (IllegalStateException e) {
+            Toast.makeText(getActivity(), R.string.vpn_no_network, Toast.LENGTH_LONG).show();
         }
-        if (!profile.ipsecCaCert.isEmpty()) {
-            byte[] value = mKeyStore.get(Credentials.CA_CERTIFICATE + profile.ipsecCaCert);
-            caCert = (value == null) ? null : new String(value, Charsets.UTF_8);
-        }
-        if (!profile.ipsecServerCert.isEmpty()) {
-            byte[] value = mKeyStore.get(Credentials.USER_CERTIFICATE + profile.ipsecServerCert);
-            serverCert = (value == null) ? null : new String(value, Charsets.UTF_8);
-        }
-        if (privateKey == null || userCert == null || caCert == null || serverCert == null) {
-            Toast.makeText(getActivity(), R.string.vpn_missing_cert, Toast.LENGTH_LONG).show();
-            throw new IllegalStateException("Cannot load credentials");
-        }
-
-        // Prepare arguments for racoon.
-        String[] racoon = null;
-        switch (profile.type) {
-            case VpnProfile.TYPE_L2TP_IPSEC_PSK:
-                racoon = new String[] {
-                    interfaze, profile.server, "udppsk", profile.ipsecIdentifier,
-                    profile.ipsecSecret, "1701",
-                };
-                break;
-            case VpnProfile.TYPE_L2TP_IPSEC_RSA:
-                racoon = new String[] {
-                    interfaze, profile.server, "udprsa", privateKey, userCert,
-                    caCert, serverCert, "1701",
-                };
-                break;
-            case VpnProfile.TYPE_IPSEC_XAUTH_PSK:
-                racoon = new String[] {
-                    interfaze, profile.server, "xauthpsk", profile.ipsecIdentifier,
-                    profile.ipsecSecret, profile.username, profile.password, "", gateway,
-                };
-                break;
-            case VpnProfile.TYPE_IPSEC_XAUTH_RSA:
-                racoon = new String[] {
-                    interfaze, profile.server, "xauthrsa", privateKey, userCert,
-                    caCert, serverCert, profile.username, profile.password, "", gateway,
-                };
-                break;
-            case VpnProfile.TYPE_IPSEC_HYBRID_RSA:
-                racoon = new String[] {
-                    interfaze, profile.server, "hybridrsa",
-                    caCert, serverCert, profile.username, profile.password, "", gateway,
-                };
-                break;
-        }
-
-        // Prepare arguments for mtpd.
-        String[] mtpd = null;
-        switch (profile.type) {
-            case VpnProfile.TYPE_PPTP:
-                mtpd = new String[] {
-                    interfaze, "pptp", profile.server, "1723",
-                    "name", profile.username, "password", profile.password,
-                    "linkname", "vpn", "refuse-eap", "nodefaultroute",
-                    "usepeerdns", "idle", "1800", "mtu", "1400", "mru", "1400",
-                    (profile.mppe ? "+mppe" : "nomppe"),
-                };
-                break;
-            case VpnProfile.TYPE_L2TP_IPSEC_PSK:
-            case VpnProfile.TYPE_L2TP_IPSEC_RSA:
-                mtpd = new String[] {
-                    interfaze, "l2tp", profile.server, "1701", profile.l2tpSecret,
-                    "name", profile.username, "password", profile.password,
-                    "linkname", "vpn", "refuse-eap", "nodefaultroute",
-                    "usepeerdns", "idle", "1800", "mtu", "1400", "mru", "1400",
-                };
-                break;
-        }
-
-        VpnConfig config = new VpnConfig();
-        config.user = profile.key;
-        config.interfaze = interfaze;
-        config.session = profile.name;
-        config.routes = profile.routes;
-        if (!profile.dnsServers.isEmpty()) {
-            config.dnsServers = Arrays.asList(profile.dnsServers.split(" +"));
-        }
-        if (!profile.searchDomains.isEmpty()) {
-            config.searchDomains = Arrays.asList(profile.searchDomains.split(" +"));
-        }
-
-        mService.startLegacyVpn(config, racoon, mtpd);
     }
 
     private void disconnect(String key) {
@@ -469,7 +397,7 @@
         return R.string.help_url_vpn;
     }
 
-    private class VpnPreference extends Preference {
+    private static class VpnPreference extends Preference {
         private VpnProfile mProfile;
         private int mState = -1;
 
@@ -477,7 +405,6 @@
             super(context);
             setPersistent(false);
             setOrder(0);
-            setOnPreferenceClickListener(VpnSettings.this);
 
             mProfile = profile;
             update();
@@ -525,4 +452,110 @@
             return result;
         }
     }
+
+    /**
+     * Dialog to configure always-on VPN.
+     */
+    public static class LockdownConfigFragment extends DialogFragment {
+        private List<VpnProfile> mProfiles;
+        private List<CharSequence> mTitles;
+        private int mCurrentIndex;
+
+        private static class TitleAdapter extends ArrayAdapter<CharSequence> {
+            public TitleAdapter(Context context, List<CharSequence> objects) {
+                super(context, com.android.internal.R.layout.select_dialog_singlechoice_holo,
+                        android.R.id.text1, objects);
+            }
+        }
+
+        public static void show(VpnSettings parent) {
+            if (!parent.isAdded()) return;
+
+            final LockdownConfigFragment dialog = new LockdownConfigFragment();
+            dialog.show(parent.getFragmentManager(), TAG_LOCKDOWN);
+        }
+
+        private static String getStringOrNull(KeyStore keyStore, String key) {
+            final byte[] value = keyStore.get(Credentials.LOCKDOWN_VPN);
+            return value == null ? null : new String(value);
+        }
+
+        private void initProfiles(KeyStore keyStore, Resources res) {
+            final String lockdownKey = getStringOrNull(keyStore, Credentials.LOCKDOWN_VPN);
+
+            mProfiles = loadVpnProfiles(keyStore, VpnProfile.TYPE_PPTP);
+            mTitles = Lists.newArrayList();
+            mTitles.add(res.getText(R.string.vpn_lockdown_none));
+            mCurrentIndex = 0;
+
+            for (VpnProfile profile : mProfiles) {
+                if (TextUtils.equals(profile.key, lockdownKey)) {
+                    mCurrentIndex = mTitles.size();
+                }
+                mTitles.add(profile.name);
+            }
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+            final KeyStore keyStore = KeyStore.getInstance();
+
+            initProfiles(keyStore, context.getResources());
+
+            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            final LayoutInflater dialogInflater = LayoutInflater.from(builder.getContext());
+
+            builder.setTitle(R.string.vpn_menu_lockdown);
+
+            final View view = dialogInflater.inflate(R.layout.vpn_lockdown_editor, null, false);
+            final ListView listView = (ListView) view.findViewById(android.R.id.list);
+            listView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
+            listView.setAdapter(new TitleAdapter(context, mTitles));
+            listView.setItemChecked(mCurrentIndex, true);
+            builder.setView(view);
+
+            builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    final int newIndex = listView.getCheckedItemPosition();
+                    if (mCurrentIndex == newIndex) return;
+
+                    if (newIndex == 0) {
+                        keyStore.delete(Credentials.LOCKDOWN_VPN);
+
+                    } else {
+                        final VpnProfile profile = mProfiles.get(newIndex - 1);
+                        if (!profile.isValidLockdownProfile()) {
+                            Toast.makeText(context, R.string.vpn_lockdown_config_error,
+                                    Toast.LENGTH_LONG).show();
+                            return;
+                        }
+                        keyStore.put(Credentials.LOCKDOWN_VPN, profile.key.getBytes(),
+                                KeyStore.UID_SELF, KeyStore.FLAG_ENCRYPTED);
+                    }
+
+                    // kick profiles since we changed them
+                    ConnectivityManager.from(getActivity()).updateLockdownVpn();
+                }
+            });
+
+            return builder.create();
+        }
+    }
+
+    private static List<VpnProfile> loadVpnProfiles(KeyStore keyStore, int... excludeTypes) {
+        final ArrayList<VpnProfile> result = Lists.newArrayList();
+        final String[] keys = keyStore.saw(Credentials.VPN);
+        if (keys != null) {
+            for (String key : keys) {
+                final VpnProfile profile = VpnProfile.decode(
+                        key, keyStore.get(Credentials.VPN + key));
+                if (profile != null && !ArrayUtils.contains(excludeTypes, profile.type)) {
+                    result.add(profile);
+                }
+            }
+        }
+        return result;
+    }
 }
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
new file mode 100755
index 0000000..6ec79f3
--- /dev/null
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -0,0 +1,683 @@
+/*
+ * 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.wfd;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.database.ContentObserver;
+import android.hardware.display.DisplayManager;
+import android.hardware.display.WifiDisplay;
+import android.hardware.display.WifiDisplayStatus;
+import android.net.Uri;
+import android.net.wifi.p2p.WifiP2pManager;
+import android.net.wifi.p2p.WifiP2pManager.ActionListener;
+import android.net.wifi.p2p.WifiP2pManager.Channel;
+import android.net.wifi.WpsInfo;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.text.Html;
+import android.util.Slog;
+import android.util.TypedValue;
+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.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.Switch;
+import android.widget.TextView;
+
+import com.android.settings.ProgressCategory;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+/**
+ * The Settings screen for WifiDisplay configuration and connection management.
+ */
+public final class WifiDisplaySettings extends SettingsPreferenceFragment {
+    private static final String TAG = "WifiDisplaySettings";
+    private static final boolean DEBUG = false;
+
+    private static final int MENU_ID_SCAN = Menu.FIRST;
+
+    private DisplayManager mDisplayManager;
+
+    private boolean mWifiDisplayOnSetting;
+    private WifiDisplayStatus mWifiDisplayStatus;
+
+    private PreferenceGroup mPairedDevicesCategory;
+    private ProgressCategory mAvailableDevicesCategory;
+
+    private TextView mEmptyView;
+
+    private Switch mActionBarSwitch;
+
+    /* certification */
+    private boolean mWifiDisplayCertificationOn;
+    private WifiP2pManager mWifiP2pManager;
+    private Channel mWifiP2pChannel;
+    private PreferenceGroup mCertCategory;
+    private boolean mListen;
+    private boolean mAutoGO;
+    private int mWpsConfig = WpsInfo.INVALID;
+    private int mListenChannel;
+    private int mOperatingChannel;
+
+    public WifiDisplaySettings() {
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mDisplayManager = (DisplayManager)getActivity().getSystemService(Context.DISPLAY_SERVICE);
+        mWifiP2pManager = (WifiP2pManager)getActivity().getSystemService(Context.WIFI_P2P_SERVICE);
+        mWifiP2pChannel = mWifiP2pManager.initialize(getActivity(), Looper.getMainLooper(), null);
+
+        addPreferencesFromResource(R.xml.wifi_display_settings);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        Activity activity = getActivity();
+        mActionBarSwitch = new Switch(activity);
+        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);
+
+        update();
+
+        if (mWifiDisplayStatus.getFeatureState() == WifiDisplayStatus.FEATURE_STATE_UNAVAILABLE) {
+            activity.finish();
+        }
+    }
+
+    @Override
+    public void onDestroyView() {
+        getActivity().getActionBar().setCustomView(null);
+        super.onDestroyView();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        Context context = getActivity();
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED);
+        context.registerReceiver(mReceiver, filter);
+
+        getContentResolver().registerContentObserver(Settings.Global.getUriFor(
+                Settings.Global.WIFI_DISPLAY_ON), false, mSettingsObserver);
+        getContentResolver().registerContentObserver(Settings.Global.getUriFor(
+                Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON), false, mSettingsObserver);
+        getContentResolver().registerContentObserver(Settings.Global.getUriFor(
+            Settings.Global.WIFI_DISPLAY_WPS_CONFIG), false, mSettingsObserver);
+
+        mDisplayManager.scanWifiDisplays();
+
+        update();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        Context context = getActivity();
+        context.unregisterReceiver(mReceiver);
+
+        getContentResolver().unregisterContentObserver(mSettingsObserver);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        MenuItem item = menu.add(Menu.NONE, MENU_ID_SCAN, 0,
+                mWifiDisplayStatus.getScanState() == WifiDisplayStatus.SCAN_STATE_SCANNING ?
+                        R.string.wifi_display_searching_for_devices :
+                                R.string.wifi_display_search_for_devices);
+        item.setEnabled(mWifiDisplayStatus.getFeatureState() == WifiDisplayStatus.FEATURE_STATE_ON
+                && mWifiDisplayStatus.getScanState() == WifiDisplayStatus.SCAN_STATE_NOT_SCANNING);
+        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case MENU_ID_SCAN:
+                if (mWifiDisplayStatus.getFeatureState() == WifiDisplayStatus.FEATURE_STATE_ON) {
+                    mDisplayManager.scanWifiDisplays();
+                }
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
+            Preference preference) {
+        if (preference instanceof WifiDisplayPreference) {
+            WifiDisplayPreference p = (WifiDisplayPreference)preference;
+            WifiDisplay display = p.getDisplay();
+
+            if (display.equals(mWifiDisplayStatus.getActiveDisplay())) {
+                showDisconnectDialog(display);
+            } else if (display.canConnect()){
+                mDisplayManager.connectWifiDisplay(display.getDeviceAddress());
+            }
+        }
+
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    }
+
+    private void update() {
+        mWifiDisplayOnSetting = Settings.Global.getInt(getContentResolver(),
+                Settings.Global.WIFI_DISPLAY_ON, 0) != 0;
+        mWifiDisplayCertificationOn = Settings.Global.getInt(getContentResolver(),
+                Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, 0) != 0;
+        mWpsConfig = Settings.Global.getInt(getContentResolver(),
+            Settings.Global.WIFI_DISPLAY_WPS_CONFIG, WpsInfo.INVALID);
+        mWifiDisplayStatus = mDisplayManager.getWifiDisplayStatus();
+
+        applyState();
+    }
+
+    private void applyState() {
+        final int featureState = mWifiDisplayStatus.getFeatureState();
+        mActionBarSwitch.setEnabled(featureState != WifiDisplayStatus.FEATURE_STATE_DISABLED);
+        mActionBarSwitch.setChecked(mWifiDisplayOnSetting);
+
+        final PreferenceScreen preferenceScreen = getPreferenceScreen();
+        preferenceScreen.removeAll();
+
+        if (featureState == WifiDisplayStatus.FEATURE_STATE_ON) {
+            final WifiDisplay[] displays = mWifiDisplayStatus.getDisplays();
+
+            if (mWifiDisplayCertificationOn) {
+                buildCertificationMenu(preferenceScreen);
+            }
+
+            if (mPairedDevicesCategory == null) {
+                mPairedDevicesCategory = new PreferenceCategory(getActivity());
+                mPairedDevicesCategory.setTitle(R.string.wifi_display_paired_devices);
+            } else {
+                mPairedDevicesCategory.removeAll();
+            }
+            preferenceScreen.addPreference(mPairedDevicesCategory);
+
+            if (mAvailableDevicesCategory == null) {
+                mAvailableDevicesCategory = new ProgressCategory(getActivity(), null,
+                        R.string.wifi_display_no_devices_found);
+                mAvailableDevicesCategory.setTitle(R.string.wifi_display_available_devices);
+            } else {
+                mAvailableDevicesCategory.removeAll();
+            }
+            preferenceScreen.addPreference(mAvailableDevicesCategory);
+
+            for (WifiDisplay d : displays) {
+                if (d.isRemembered()) {
+                    mPairedDevicesCategory.addPreference(createWifiDisplayPreference(d));
+                } else if (d.isAvailable()){
+                    mAvailableDevicesCategory.addPreference(createWifiDisplayPreference(d));
+                }
+            }
+            if (mPairedDevicesCategory.getPreferenceCount() == 0) {
+                preferenceScreen.removePreference(mPairedDevicesCategory);
+            }
+            if (mWifiDisplayStatus.getScanState() == WifiDisplayStatus.SCAN_STATE_SCANNING) {
+                mAvailableDevicesCategory.setProgress(true);
+            } else {
+                mAvailableDevicesCategory.setProgress(false);
+            }
+        } else {
+            mEmptyView.setText(featureState == WifiDisplayStatus.FEATURE_STATE_OFF ?
+                    R.string.wifi_display_settings_empty_list_wifi_display_off :
+                            R.string.wifi_display_settings_empty_list_wifi_display_disabled);
+        }
+
+        getActivity().invalidateOptionsMenu();
+    }
+
+    private void buildCertificationMenu(final PreferenceScreen preferenceScreen) {
+        if (mCertCategory == null) {
+            mCertCategory = new PreferenceCategory(getActivity());
+            mCertCategory.setTitle(R.string.wifi_display_certification_heading);
+        } else {
+            mCertCategory.removeAll();
+        }
+        preferenceScreen.addPreference(mCertCategory);
+
+        // display session info if there is an active p2p session
+        if (!mWifiDisplayStatus.getSessionInfo().getGroupId().isEmpty()) {
+            Preference p = new Preference(getActivity());
+            p.setTitle(R.string.wifi_display_session_info);
+            p.setSummary(mWifiDisplayStatus.getSessionInfo().toString());
+            mCertCategory.addPreference(p);
+
+            // show buttons for Pause/Resume when a WFD session is established
+            if (mWifiDisplayStatus.getSessionInfo().getSessionId() != 0) {
+                mCertCategory.addPreference(new Preference(getActivity()) {
+                    @Override
+                    public View getView(View convertView, ViewGroup parent) {
+                        final View v;
+                        if (convertView == null) {
+                            LayoutInflater li = (LayoutInflater) getActivity().
+                                    getSystemService(Service.LAYOUT_INFLATER_SERVICE);
+                            v = li.inflate(R.layout.two_buttons_panel, null);
+                        } else {
+                            v = convertView;
+                        }
+
+                        Button b = (Button)v.findViewById(R.id.left_button);
+                        b.setText(R.string.wifi_display_pause);
+                        b.setOnClickListener(new OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                mDisplayManager.pauseWifiDisplay();
+                            }
+                        });
+
+                        b = (Button)v.findViewById(R.id.right_button);
+                        b.setText(R.string.wifi_display_resume);
+                        b.setOnClickListener(new OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                mDisplayManager.resumeWifiDisplay();
+                            }
+                        });
+
+                        return v;
+                    }
+                });
+            }
+        }
+
+        // switch for Listen Mode
+        CheckBoxPreference cbp = new CheckBoxPreference(getActivity()) {
+            @Override
+            protected void onClick() {
+                mListen = !mListen;
+                setListenMode(mListen);
+                setChecked(mListen);
+            }
+        };
+        cbp.setTitle(R.string.wifi_display_listen_mode);
+        cbp.setChecked(mListen);
+        mCertCategory.addPreference(cbp);
+
+        // switch for Autonomous GO
+        cbp = new CheckBoxPreference(getActivity()) {
+            @Override
+            protected void onClick() {
+                mAutoGO = !mAutoGO;
+                if (mAutoGO) {
+                    startAutoGO();
+                } else {
+                    stopAutoGO();
+                }
+                setChecked(mAutoGO);
+            }
+        };
+        cbp.setTitle(R.string.wifi_display_autonomous_go);
+        cbp.setChecked(mAutoGO);
+        mCertCategory.addPreference(cbp);
+
+        // Drop down list for choosing WPS method (PBC/KEYPAD/DISPLAY)
+        ListPreference lp = new ListPreference(getActivity()) {
+            @Override
+            protected void onDialogClosed(boolean positiveResult) {
+                super.onDialogClosed(positiveResult);
+                if (positiveResult) {
+                    mWpsConfig = Integer.parseInt(getValue());
+                    setSummary("%1$s");
+                    getActivity().invalidateOptionsMenu();
+                    Settings.Global.putInt(getActivity().getContentResolver(),
+                            Settings.Global.WIFI_DISPLAY_WPS_CONFIG, mWpsConfig);
+                }
+            }
+        };
+        mWpsConfig = Settings.Global.getInt(getActivity().getContentResolver(),
+                Settings.Global.WIFI_DISPLAY_WPS_CONFIG, WpsInfo.INVALID);
+        String[] wpsEntries = { "Default", "PBC", "KEYPAD", "DISPLAY" };
+        String[] wpsValues = {
+            "" + WpsInfo.INVALID,
+            "" + WpsInfo.PBC,
+            "" + WpsInfo.KEYPAD,
+            "" + WpsInfo.DISPLAY };
+        lp.setTitle(R.string.wifi_display_wps_config);
+        lp.setEntries(wpsEntries);
+        lp.setEntryValues(wpsValues);
+        lp.setValue("" + mWpsConfig);
+        lp.setSummary("%1$s");
+        mCertCategory.addPreference(lp);
+
+        // Drop down list for choosing listen channel
+        lp = new ListPreference(getActivity()) {
+            @Override
+            protected void onDialogClosed(boolean positiveResult) {
+                super.onDialogClosed(positiveResult);
+                if (positiveResult) {
+                    mListenChannel = Integer.parseInt(getValue());
+                    setSummary("%1$s");
+                    getActivity().invalidateOptionsMenu();
+                    setWifiP2pChannels(mListenChannel, mOperatingChannel);
+                }
+            }
+        };
+        String[] lcEntries = { "Auto", "1", "6", "11" };
+        String[] lcValues = { "0", "1", "6", "11" };
+        lp.setTitle(R.string.wifi_display_listen_channel);
+        lp.setEntries(lcEntries);
+        lp.setEntryValues(lcValues);
+        lp.setValue("" + mListenChannel);
+        lp.setSummary("%1$s");
+        mCertCategory.addPreference(lp);
+
+        // Drop down list for choosing operating channel
+        lp = new ListPreference(getActivity()) {
+            @Override
+            protected void onDialogClosed(boolean positiveResult) {
+                super.onDialogClosed(positiveResult);
+                if (positiveResult) {
+                    mOperatingChannel = Integer.parseInt(getValue());
+                    setSummary("%1$s");
+                    getActivity().invalidateOptionsMenu();
+                    setWifiP2pChannels(mListenChannel, mOperatingChannel);
+                }
+            }
+        };
+        String[] ocEntries = { "Auto", "1", "6", "11", "36" };
+        String[] ocValues = { "0", "1", "6", "11", "36" };
+        lp.setTitle(R.string.wifi_display_operating_channel);
+        lp.setEntries(ocEntries);
+        lp.setEntryValues(ocValues);
+        lp.setValue("" + mOperatingChannel);
+        lp.setSummary("%1$s");
+        mCertCategory.addPreference(lp);
+    }
+
+    private void startAutoGO() {
+        if (DEBUG) {
+            Slog.d(TAG, "Starting Autonomous GO...");
+        }
+        mWifiP2pManager.createGroup(mWifiP2pChannel, new ActionListener() {
+            @Override
+            public void onSuccess() {
+                if (DEBUG) {
+                    Slog.d(TAG, "Successfully started AutoGO.");
+                }
+            }
+
+            @Override
+            public void onFailure(int reason) {
+                Slog.e(TAG, "Failed to start AutoGO with reason " + reason + ".");
+            }
+        });
+    }
+
+    private void stopAutoGO() {
+        if (DEBUG) {
+            Slog.d(TAG, "Stopping Autonomous GO...");
+        }
+        mWifiP2pManager.removeGroup(mWifiP2pChannel, new ActionListener() {
+            @Override
+            public void onSuccess() {
+                if (DEBUG) {
+                    Slog.d(TAG, "Successfully stopped AutoGO.");
+                }
+            }
+
+            @Override
+            public void onFailure(int reason) {
+                Slog.e(TAG, "Failed to stop AutoGO with reason " + reason + ".");
+            }
+        });
+    }
+
+    private void setListenMode(final boolean enable) {
+        if (DEBUG) {
+            Slog.d(TAG, "Setting listen mode to: " + enable);
+        }
+        mWifiP2pManager.listen(mWifiP2pChannel, enable, new ActionListener() {
+            @Override
+            public void onSuccess() {
+                if (DEBUG) {
+                    Slog.d(TAG, "Successfully " + (enable ? "entered" : "exited")
+                            +" listen mode.");
+                }
+            }
+
+            @Override
+            public void onFailure(int reason) {
+                Slog.e(TAG, "Failed to " + (enable ? "entered" : "exited")
+                        +" listen mode with reason " + reason + ".");
+            }
+        });
+    }
+
+    private void setWifiP2pChannels(final int lc, final int oc) {
+        if (DEBUG) {
+            Slog.d(TAG, "Setting wifi p2p channel: lc=" + lc + ", oc=" + oc);
+        }
+        mWifiP2pManager.setWifiP2pChannels(mWifiP2pChannel,
+                lc, oc, new ActionListener() {
+            @Override
+            public void onSuccess() {
+                if (DEBUG) {
+                    Slog.d(TAG, "Successfully set wifi p2p channels.");
+                }
+            }
+
+            @Override
+            public void onFailure(int reason) {
+                Slog.e(TAG, "Failed to set wifi p2p channels with reason " + reason + ".");
+            }
+        });
+    }
+
+    private Preference createWifiDisplayPreference(final WifiDisplay d) {
+        WifiDisplayPreference p = new WifiDisplayPreference(getActivity(), d);
+        if (d.equals(mWifiDisplayStatus.getActiveDisplay())) {
+            switch (mWifiDisplayStatus.getActiveDisplayState()) {
+                case WifiDisplayStatus.DISPLAY_STATE_CONNECTED:
+                    p.setSummary(R.string.wifi_display_status_connected);
+                    break;
+                case WifiDisplayStatus.DISPLAY_STATE_CONNECTING:
+                    p.setSummary(R.string.wifi_display_status_connecting);
+                    break;
+            }
+        } else if (d.isAvailable()) {
+            if (!d.canConnect()) {
+                p.setSummary(R.string.wifi_display_status_in_use);
+                p.setEnabled(false);
+            } else if (d.isRemembered()) {
+                p.setSummary(R.string.wifi_display_status_available);
+            }
+        }
+        if (d.isRemembered()) {
+            p.setWidgetLayoutResource(R.layout.wifi_display_preference);
+        }
+        return p;
+    }
+
+    private void showDisconnectDialog(final WifiDisplay display) {
+        DialogInterface.OnClickListener ok = new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                if (display.equals(mWifiDisplayStatus.getActiveDisplay())) {
+                    mDisplayManager.disconnectWifiDisplay();
+                }
+            }
+        };
+
+        AlertDialog dialog = new AlertDialog.Builder(getActivity())
+                .setCancelable(true)
+                .setTitle(R.string.wifi_display_disconnect_title)
+                .setMessage(Html.fromHtml(getResources().getString(
+                        R.string.wifi_display_disconnect_text, display.getFriendlyDisplayName())))
+                .setPositiveButton(android.R.string.ok, ok)
+                .setNegativeButton(android.R.string.cancel, null)
+                .create();
+        dialog.show();
+    }
+
+    private void showOptionsDialog(final WifiDisplay display) {
+        View view = getActivity().getLayoutInflater().inflate(R.layout.wifi_display_options, null);
+        final EditText nameEditText = (EditText)view.findViewById(R.id.name);
+        nameEditText.setText(display.getFriendlyDisplayName());
+
+        DialogInterface.OnClickListener done = new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                String name = nameEditText.getText().toString().trim();
+                if (name.isEmpty() || name.equals(display.getDeviceName())) {
+                    name = null;
+                }
+                mDisplayManager.renameWifiDisplay(display.getDeviceAddress(), name);
+            }
+        };
+        DialogInterface.OnClickListener forget = new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                mDisplayManager.forgetWifiDisplay(display.getDeviceAddress());
+            }
+        };
+
+        AlertDialog dialog = new AlertDialog.Builder(getActivity())
+                .setCancelable(true)
+                .setTitle(R.string.wifi_display_options_title)
+                .setView(view)
+                .setPositiveButton(R.string.wifi_display_options_done, done)
+                .setNegativeButton(R.string.wifi_display_options_forget, forget)
+                .create();
+        dialog.show();
+    }
+
+    private static boolean contains(WifiDisplay[] displays, String address) {
+        for (WifiDisplay d : displays) {
+            if (d.getDeviceAddress().equals(address)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private final CompoundButton.OnCheckedChangeListener mSwitchOnCheckedChangedListener =
+            new CompoundButton.OnCheckedChangeListener() {
+        @Override
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            mWifiDisplayOnSetting = isChecked;
+            Settings.Global.putInt(getContentResolver(),
+                    Settings.Global.WIFI_DISPLAY_ON, isChecked ? 1 : 0);
+        }
+    };
+
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action.equals(DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED)) {
+                WifiDisplayStatus status = (WifiDisplayStatus)intent.getParcelableExtra(
+                        DisplayManager.EXTRA_WIFI_DISPLAY_STATUS);
+                mWifiDisplayStatus = status;
+                applyState();
+            }
+        }
+    };
+
+    private final ContentObserver mSettingsObserver = new ContentObserver(new Handler()) {
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            update();
+        }
+    };
+
+    private final class WifiDisplayPreference extends Preference
+            implements View.OnClickListener {
+        private final WifiDisplay mDisplay;
+
+        public WifiDisplayPreference(Context context, WifiDisplay display) {
+            super(context);
+
+            mDisplay = display;
+            setTitle(display.getFriendlyDisplayName());
+        }
+
+        public WifiDisplay getDisplay() {
+            return mDisplay;
+        }
+
+        @Override
+        protected void onBindView(View view) {
+            super.onBindView(view);
+
+            ImageView deviceDetails = (ImageView) view.findViewById(R.id.deviceDetails);
+            if (deviceDetails != null) {
+                deviceDetails.setOnClickListener(this);
+
+                if (!isEnabled()) {
+                    TypedValue value = new TypedValue();
+                    getContext().getTheme().resolveAttribute(android.R.attr.disabledAlpha,
+                            value, true);
+                    deviceDetails.setImageAlpha((int)(value.getFloat() * 255));
+                }
+            }
+        }
+
+        @Override
+        public void onClick(View v) {
+            showOptionsDialog(mDisplay);
+        }
+    }
+}
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 f410d57..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;
 
 /**
@@ -38,7 +37,7 @@
 public class ChartView extends FrameLayout {
     // TODO: extend something that supports two-dimensional scrolling
 
-    private static final int SWEEP_GRAVITY = Gravity.TOP | Gravity.LEFT;
+    private static final int SWEEP_GRAVITY = Gravity.TOP | Gravity.START;
 
     ChartAxis mHoriz;
     ChartAxis mVert;
@@ -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 1d411f7..85a0494 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;
@@ -34,11 +32,14 @@
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.IPowerManager;
+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;
@@ -58,7 +59,7 @@
     private static final int BUTTON_WIFI = 0;
     private static final int BUTTON_BRIGHTNESS = 1;
     private static final int BUTTON_SYNC = 2;
-    private static final int BUTTON_GPS = 3;
+    private static final int BUTTON_LOCATION = 3;
     private static final int BUTTON_BLUETOOTH = 4;
 
     // This widget keeps track of two sets of states:
@@ -94,20 +95,14 @@
         R.drawable.appwidget_settings_ind_on_r_holo
     };
 
-    /**
-     * Minimum and maximum brightnesses.  Don't go to 0 since that makes the display unusable
-     */
-    private static final int MINIMUM_BACKLIGHT = android.os.PowerManager.BRIGHTNESS_DIM + 10;
-    private static final int MAXIMUM_BACKLIGHT = android.os.PowerManager.BRIGHTNESS_ON;
-    private static final int DEFAULT_BACKLIGHT = (int) (android.os.PowerManager.BRIGHTNESS_ON * 0.4f);
     /** Minimum brightness at which the indicator is shown at half-full and ON */
-    private static final int HALF_BRIGHTNESS_THRESHOLD = (int) (0.3 * MAXIMUM_BACKLIGHT);
+    private static final float HALF_BRIGHTNESS_THRESHOLD = 0.3f;
     /** Minimum brightness at which the indicator is shown at full */
-    private static final int FULL_BRIGHTNESS_THRESHOLD = (int) (0.8 * MAXIMUM_BACKLIGHT);
+    private static final float FULL_BRIGHTNESS_THRESHOLD = 0.8f;
 
     private static final StateTracker sWifiState = new WifiStateTracker();
     private static final StateTracker sBluetoothState = new BluetoothStateTracker();
-    private static final StateTracker sGpsState = new GpsStateTracker();
+    private static final StateTracker sLocationState = new LocationStateTracker();
     private static final StateTracker sSyncState = new SyncStateTracker();
     private static SettingsObserver sSettingsObserver;
 
@@ -166,6 +161,11 @@
         }
 
         /**
+         * Return the ID of the clickable container for the setting.
+         */
+        public abstract int getContainerId();
+
+        /**
          * Return the ID of the main large image button for the setting.
          */
         public abstract int getButtonId();
@@ -176,6 +176,11 @@
         public abstract int getIndicatorId();
 
         /**
+         * Returns the resource ID of the setting's content description.
+         */
+        public abstract int getButtonDescription();
+
+        /**
          * Returns the resource ID of the image to show as a function of
          * the on-vs-off state.
          */
@@ -191,16 +196,21 @@
          * turning off, turning on) of the setting.
          */
         public final void setImageViewResources(Context context, RemoteViews views) {
+            int containerId = getContainerId();
             int buttonId = getButtonId();
             int indicatorId = getIndicatorId();
             int pos = getPosition();
             switch (getTriState(context)) {
                 case STATE_DISABLED:
+                    views.setContentDescription(containerId,
+                        getContentDescription(context, R.string.gadget_state_off));
                     views.setImageViewResource(buttonId, getButtonImageId(false));
                     views.setImageViewResource(
                         indicatorId, IND_DRAWABLE_OFF[pos]);
                     break;
                 case STATE_ENABLED:
+                    views.setContentDescription(containerId,
+                        getContentDescription(context, R.string.gadget_state_on));
                     views.setImageViewResource(buttonId, getButtonImageId(true));
                     views.setImageViewResource(
                         indicatorId, IND_DRAWABLE_ON[pos]);
@@ -212,10 +222,14 @@
                     // user's intent.  This is much easier to see in
                     // sunlight.
                     if (isTurningOn()) {
+                        views.setContentDescription(containerId,
+                            getContentDescription(context, R.string.gadget_state_turning_on));
                         views.setImageViewResource(buttonId, getButtonImageId(true));
                         views.setImageViewResource(
                             indicatorId, IND_DRAWABLE_MID[pos]);
                     } else {
+                        views.setContentDescription(containerId,
+                            getContentDescription(context, R.string.gadget_state_turning_off));
                         views.setImageViewResource(buttonId, getButtonImageId(false));
                         views.setImageViewResource(
                             indicatorId, IND_DRAWABLE_OFF[pos]);
@@ -225,6 +239,16 @@
         }
 
         /**
+         * Returns the gadget state template populated with the gadget
+         * description and state.
+         */
+        private final String getContentDescription(Context context, int stateResId) {
+            final String gadget = context.getString(getButtonDescription());
+            final String state = context.getString(stateResId);
+            return context.getString(R.string.gadget_state_template, gadget, state);
+        }
+
+        /**
          * Update internal state from a broadcast state change.
          */
         public abstract void onActualStateChange(Context context, Intent intent);
@@ -327,8 +351,10 @@
      * Subclass of StateTracker to get/set Wifi state.
      */
     private static final class WifiStateTracker extends StateTracker {
+        public int getContainerId() { return R.id.btn_wifi; }
         public int getButtonId() { return R.id.img_wifi; }
         public int getIndicatorId() { return R.id.ind_wifi; }
+        public int getButtonDescription() { return R.string.gadget_wifi; }
         public int getButtonImageId(boolean on) {
             return on ? R.drawable.ic_appwidget_settings_wifi_on_holo
                     : R.drawable.ic_appwidget_settings_wifi_off_holo;
@@ -410,8 +436,10 @@
      * Subclass of StateTracker to get/set Bluetooth state.
      */
     private static final class BluetoothStateTracker extends StateTracker {
+        public int getContainerId() { return R.id.btn_bluetooth; }
         public int getButtonId() { return R.id.img_bluetooth; }
         public int getIndicatorId() { return R.id.ind_bluetooth; }
+        public int getButtonDescription() { return R.string.gadget_bluetooth; }
         public int getButtonImageId(boolean on) {
             return on ? R.drawable.ic_appwidget_settings_bluetooth_on_holo
                     : R.drawable.ic_appwidget_settings_bluetooth_off_holo;
@@ -478,22 +506,30 @@
     }
 
     /**
-     * Subclass of StateTracker for GPS state.
+     * Subclass of StateTracker for location state.
      */
-    private static final class GpsStateTracker extends StateTracker {
-        public int getButtonId() { return R.id.img_gps; }
-        public int getIndicatorId() { return R.id.ind_gps; }
+    private static final class LocationStateTracker extends StateTracker {
+        public int getContainerId() { return R.id.btn_location; }
+        public int getButtonId() { return R.id.img_location; }
+        public int getIndicatorId() { return R.id.ind_location; }
+        public int getButtonDescription() { return R.string.gadget_location; }
         public int getButtonImageId(boolean on) {
-            return on ? R.drawable.ic_appwidget_settings_gps_on_holo
-                    : R.drawable.ic_appwidget_settings_gps_off_holo;
+            return on ? R.drawable.ic_appwidget_settings_location_on_holo
+                    : R.drawable.ic_appwidget_settings_location_off_holo;
         }
 
         @Override
         public int getActualState(Context context) {
             ContentResolver resolver = context.getContentResolver();
-            boolean on = Settings.Secure.isLocationProviderEnabled(
-                resolver, LocationManager.GPS_PROVIDER);
-            return on ? STATE_ENABLED : STATE_DISABLED;
+            int currentLocationMode = Settings.Secure.getInt(resolver,
+                    Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
+            switch (currentLocationMode) {
+                case Settings.Secure.LOCATION_MODE_BATTERY_SAVING:
+                case Settings.Secure.LOCATION_MODE_OFF:
+                    return STATE_DISABLED;
+            }
+
+            return STATE_ENABLED;
         }
 
         @Override
@@ -509,11 +545,31 @@
             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)) {
+                        int currentMode = Settings.Secure.getInt(resolver,
+                                Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
+                        int mode = Settings.Secure.LOCATION_MODE_HIGH_ACCURACY;
+                        switch (currentMode) {
+                            case Settings.Secure.LOCATION_MODE_HIGH_ACCURACY:
+                                mode = Settings.Secure.LOCATION_MODE_BATTERY_SAVING;
+                                break;
+                            case Settings.Secure.LOCATION_MODE_BATTERY_SAVING:
+                                mode = Settings.Secure.LOCATION_MODE_HIGH_ACCURACY;
+                                break;
+                            case Settings.Secure.LOCATION_MODE_SENSORS_ONLY:
+                                mode = Settings.Secure.LOCATION_MODE_OFF;
+                                break;
+                            case Settings.Secure.LOCATION_MODE_OFF:
+                                mode = Settings.Secure.LOCATION_MODE_HIGH_ACCURACY;
+                                break;
+                        }
+                        Settings.Secure.putInt(resolver, Settings.Secure.LOCATION_MODE, mode);
+                        return desiredState;
+                    }
+
+                    return getActualState(context) == STATE_ENABLED;
                 }
 
                 @Override
@@ -531,8 +587,10 @@
      * Subclass of StateTracker for sync state.
      */
     private static final class SyncStateTracker extends StateTracker {
+        public int getContainerId() { return R.id.btn_sync; }
         public int getButtonId() { return R.id.img_sync; }
         public int getIndicatorId() { return R.id.ind_sync; }
+        public int getButtonDescription() { return R.string.gadget_sync; }
         public int getButtonImageId(boolean on) {
             return on ? R.drawable.ic_appwidget_settings_sync_on_holo
                     : R.drawable.ic_appwidget_settings_sync_off_holo;
@@ -605,23 +663,11 @@
 
     @Override
     public void onEnabled(Context context) {
-        Class clazz = com.android.settings.widget.SettingsAppWidgetProvider.class;
-        PackageManager pm = context.getPackageManager();
-        pm.setComponentEnabledSetting(
-                new ComponentName(context.getPackageName(), clazz.getName()),
-                PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
-                PackageManager.DONT_KILL_APP);
         checkObserver(context);
     }
 
     @Override
     public void onDisabled(Context context) {
-        Class clazz = com.android.settings.widget.SettingsAppWidgetProvider.class;
-        PackageManager pm = context.getPackageManager();
-        pm.setComponentEnabledSetting(
-                new ComponentName(context.getPackageName(), clazz.getName()),
-                PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-                PackageManager.DONT_KILL_APP);
         if (sSettingsObserver != null) {
             sSettingsObserver.stopObserving();
             sSettingsObserver = null;
@@ -642,8 +688,8 @@
         views.setOnClickPendingIntent(R.id.btn_sync,
                 getLaunchPendingIntent(context,
                         BUTTON_SYNC));
-        views.setOnClickPendingIntent(R.id.btn_gps,
-                getLaunchPendingIntent(context, BUTTON_GPS));
+        views.setOnClickPendingIntent(R.id.btn_location,
+                getLaunchPendingIntent(context, BUTTON_LOCATION));
         views.setOnClickPendingIntent(R.id.btn_bluetooth,
                 getLaunchPendingIntent(context,
                         BUTTON_BLUETOOTH));
@@ -674,29 +720,46 @@
     private static void updateButtons(RemoteViews views, Context context) {
         sWifiState.setImageViewResources(context, views);
         sBluetoothState.setImageViewResources(context, views);
-        sGpsState.setImageViewResources(context, views);
+        sLocationState.setImageViewResources(context, views);
         sSyncState.setImageViewResources(context, views);
 
         if (getBrightnessMode(context)) {
+            views.setContentDescription(R.id.btn_brightness,
+                    context.getString(R.string.gadget_brightness_template,
+                            context.getString(R.string.gadget_brightness_state_auto)));
             views.setImageViewResource(R.id.img_brightness,
                     R.drawable.ic_appwidget_settings_brightness_auto_holo);
             views.setImageViewResource(R.id.ind_brightness,
                     R.drawable.appwidget_settings_ind_on_r_holo);
         } else {
             final int brightness = getBrightness(context);
+            final PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
             // Set the icon
-            if (brightness > FULL_BRIGHTNESS_THRESHOLD) {
+            final int full = (int)(pm.getMaximumScreenBrightnessSetting()
+                    * FULL_BRIGHTNESS_THRESHOLD);
+            final int half = (int)(pm.getMaximumScreenBrightnessSetting()
+                    * HALF_BRIGHTNESS_THRESHOLD);
+            if (brightness > full) {
+                views.setContentDescription(R.id.btn_brightness,
+                        context.getString(R.string.gadget_brightness_template,
+                                context.getString(R.string.gadget_brightness_state_full)));
                 views.setImageViewResource(R.id.img_brightness,
                         R.drawable.ic_appwidget_settings_brightness_full_holo);
-            } else if (brightness > HALF_BRIGHTNESS_THRESHOLD) {
+            } else if (brightness > half) {
+                views.setContentDescription(R.id.btn_brightness,
+                        context.getString(R.string.gadget_brightness_template,
+                                context.getString(R.string.gadget_brightness_state_half)));
                 views.setImageViewResource(R.id.img_brightness,
                         R.drawable.ic_appwidget_settings_brightness_half_holo);
             } else {
+                views.setContentDescription(R.id.btn_brightness,
+                        context.getString(R.string.gadget_brightness_template,
+                                context.getString(R.string.gadget_brightness_state_off)));
                 views.setImageViewResource(R.id.img_brightness,
                         R.drawable.ic_appwidget_settings_brightness_off_holo);
             }
             // Set the ON state
-            if (brightness > HALF_BRIGHTNESS_THRESHOLD) {
+            if (brightness > half) {
                 views.setImageViewResource(R.id.ind_brightness,
                         R.drawable.appwidget_settings_ind_on_r_holo);
             } else {
@@ -737,10 +800,9 @@
             sWifiState.onActualStateChange(context, intent);
         } else if (BluetoothAdapter.ACTION_STATE_CHANGED.equals(action)) {
             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 (LocationManager.MODE_CHANGED_ACTION.equals(action)) {
+            sLocationState.onActualStateChange(context, intent);
+        } 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();
@@ -751,8 +813,8 @@
                 toggleBrightness(context);
             } else if (buttonId == BUTTON_SYNC) {
                 sSyncState.toggleState(context);
-            } else if (buttonId == BUTTON_GPS) {
-                sGpsState.toggleState(context);
+            } else if (buttonId == BUTTON_LOCATION) {
+                sLocationState.toggleState(context);
             } else if (buttonId == BUTTON_BLUETOOTH) {
                 sBluetoothState.toggleState(context);
             }
@@ -775,13 +837,9 @@
      */
     private static int getBrightness(Context context) {
         try {
-            IPowerManager power = IPowerManager.Stub.asInterface(
-                    ServiceManager.getService("power"));
-            if (power != null) {
-                int brightness = Settings.System.getInt(context.getContentResolver(),
-                        Settings.System.SCREEN_BRIGHTNESS);
-                return brightness;
-            }
+            int brightness = Settings.System.getInt(context.getContentResolver(),
+                    Settings.System.SCREEN_BRIGHTNESS);
+            return brightness;
         } catch (Exception e) {
         }
         return 0;
@@ -795,13 +853,9 @@
      */
     private static boolean getBrightnessMode(Context context) {
         try {
-            IPowerManager power = IPowerManager.Stub.asInterface(
-                    ServiceManager.getService("power"));
-            if (power != null) {
-                int brightnessMode = Settings.System.getInt(context.getContentResolver(),
-                        Settings.System.SCREEN_BRIGHTNESS_MODE);
-                return brightnessMode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
-            }
+            int brightnessMode = Settings.System.getInt(context.getContentResolver(),
+                    Settings.System.SCREEN_BRIGHTNESS_MODE);
+            return brightnessMode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
         } catch (Exception e) {
             Log.d(TAG, "getBrightnessMode: " + e);
         }
@@ -818,6 +872,8 @@
             IPowerManager power = IPowerManager.Stub.asInterface(
                     ServiceManager.getService("power"));
             if (power != null) {
+                PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
+
                 ContentResolver cr = context.getContentResolver();
                 int brightness = Settings.System.getInt(cr,
                         Settings.System.SCREEN_BRIGHTNESS);
@@ -832,15 +888,15 @@
                 // Rotate AUTO -> MINIMUM -> DEFAULT -> MAXIMUM
                 // Technically, not a toggle...
                 if (brightnessMode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
-                    brightness = MINIMUM_BACKLIGHT;
+                    brightness = pm.getMinimumScreenBrightnessSetting();
                     brightnessMode = Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
-                } else if (brightness < DEFAULT_BACKLIGHT) {
-                    brightness = DEFAULT_BACKLIGHT;
-                } else if (brightness < MAXIMUM_BACKLIGHT) {
-                    brightness = MAXIMUM_BACKLIGHT;
+                } else if (brightness < pm.getDefaultScreenBrightnessSetting()) {
+                    brightness = pm.getDefaultScreenBrightnessSetting();
+                } else if (brightness < pm.getMaximumScreenBrightnessSetting()) {
+                    brightness = pm.getMaximumScreenBrightnessSetting();
                 } else {
                     brightnessMode = Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
-                    brightness = MINIMUM_BACKLIGHT;
+                    brightness = pm.getMinimumScreenBrightnessSetting();
                 }
 
                 if (context.getResources().getBoolean(
@@ -854,7 +910,7 @@
                     brightnessMode = Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
                 }
                 if (brightnessMode == Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL) {
-                    power.setBacklightBrightness(brightness);
+                    power.setTemporaryScreenBrightnessSettingOverride(brightness);
                     Settings.System.putInt(cr, Settings.System.SCREEN_BRIGHTNESS, brightness);
                 }
             }
diff --git a/src/com/android/settings/wifi/AccessPoint.java b/src/com/android/settings/wifi/AccessPoint.java
index 5a7a768..c4d1f7c 100644
--- a/src/com/android/settings/wifi/AccessPoint.java
+++ b/src/com/android/settings/wifi/AccessPoint.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.wifi;
 
+import com.android.settings.R;
+
 import android.content.Context;
 import android.net.NetworkInfo.DetailedState;
 import android.net.wifi.ScanResult;
@@ -29,8 +31,6 @@
 import android.view.View;
 import android.widget.ImageView;
 
-import com.android.settings.R;
-
 class AccessPoint extends Preference {
     static final String TAG = "Settings.AccessPoint";
 
@@ -211,7 +211,8 @@
             signal.setImageDrawable(null);
         } else {
             signal.setImageLevel(getLevel());
-            signal.setImageResource(R.drawable.wifi_signal);
+            signal.setImageDrawable(getContext().getTheme().obtainStyledAttributes(
+                    new int[] {R.attr.wifi_signal}).getDrawable(0));
             signal.setImageState((security != SECURITY_NONE) ?
                     STATE_SECURED : STATE_NONE, true);
         }
@@ -224,17 +225,19 @@
         }
         AccessPoint other = (AccessPoint) preference;
         // Active one goes first.
-        if (mInfo != other.mInfo) {
-            return (mInfo != null) ? -1 : 1;
-        }
+        if (mInfo != null && other.mInfo == null) return -1;
+        if (mInfo == null && other.mInfo != null) return 1;
+
         // Reachable one goes before unreachable one.
-        if ((mRssi ^ other.mRssi) < 0) {
-            return (mRssi != Integer.MAX_VALUE) ? -1 : 1;
-        }
+        if (mRssi != Integer.MAX_VALUE && other.mRssi == Integer.MAX_VALUE) return -1;
+        if (mRssi == Integer.MAX_VALUE && other.mRssi != Integer.MAX_VALUE) return 1;
+
         // Configured one goes before unconfigured one.
-        if ((networkId ^ other.networkId) < 0) {
-            return (networkId != -1) ? -1 : 1;
-        }
+        if (networkId != WifiConfiguration.INVALID_NETWORK_ID
+                && other.networkId == WifiConfiguration.INVALID_NETWORK_ID) return -1;
+        if (networkId == WifiConfiguration.INVALID_NETWORK_ID
+                && other.networkId != WifiConfiguration.INVALID_NETWORK_ID) return 1;
+
         // Sort by signal strength.
         int difference = WifiManager.compareSignalLevel(other.mRssi, mRssi);
         if (difference != 0) {
@@ -244,6 +247,22 @@
         return ssid.compareToIgnoreCase(other.ssid);
     }
 
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof AccessPoint)) return false;
+        return (this.compareTo((AccessPoint) other) == 0);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = 0;
+        if (mInfo != null) result += 13 * mInfo.hashCode();
+        result += 19 * mRssi;
+        result += 23 * networkId;
+        result += 29 * ssid.hashCode();
+        return result;
+    }
+
     boolean update(ScanResult result) {
         if (ssid.equals(result.SSID) && security == getSecurity(result)) {
             if (WifiManager.compareSignalLevel(result.level, mRssi) > 0) {
@@ -320,11 +339,7 @@
         setTitle(ssid);
 
         Context context = getContext();
-        if (mState != null) { // This is the active connection
-            setSummary(Summary.get(context, mState));
-        } else if (mRssi == Integer.MAX_VALUE) { // Wifi out of range
-            setSummary(context.getString(R.string.wifi_not_in_range));
-        } else if (mConfig != null && mConfig.status == WifiConfiguration.Status.DISABLED) {
+        if (mConfig != null && mConfig.status == WifiConfiguration.Status.DISABLED) {
             switch (mConfig.disableReason) {
                 case WifiConfiguration.DISABLED_AUTH_FAILURE:
                     setSummary(context.getString(R.string.wifi_disabled_password_failure));
@@ -336,6 +351,10 @@
                 case WifiConfiguration.DISABLED_UNKNOWN_REASON:
                     setSummary(context.getString(R.string.wifi_disabled_generic));
             }
+        } else if (mRssi == Integer.MAX_VALUE) { // Wifi out of range
+            setSummary(context.getString(R.string.wifi_not_in_range));
+        } else if (mState != null) { // This is the active connection
+            setSummary(Summary.get(context, mState));
         } else { // In range, not disabled.
             StringBuilder summary = new StringBuilder();
             if (mConfig != null) { // Is saved network
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index bb50d2a..bbcd50d 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -16,16 +16,21 @@
 
 package com.android.settings.wifi;
 
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
+import android.net.wifi.WifiWatchdogStateMachine;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
-import android.provider.Settings.Secure;
+import android.provider.Settings.Global;
+import android.security.Credentials;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
@@ -44,9 +49,24 @@
     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;
 
+    private IntentFilter mFilter;
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action.equals(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION) ||
+                action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
+                refreshWifiInfo();
+            }
+        }
+    };
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -57,20 +77,31 @@
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+        mFilter = new IntentFilter();
+        mFilter.addAction(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION);
+        mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
     }
 
     @Override
     public void onResume() {
         super.onResume();
         initPreferences();
+        getActivity().registerReceiver(mReceiver, mFilter,
+                android.Manifest.permission.CHANGE_NETWORK_STATE, null);
         refreshWifiInfo();
     }
 
+    @Override
+    public void onPause() {
+        super.onPause();
+        getActivity().unregisterReceiver(mReceiver);
+    }
+
     private void initPreferences() {
         CheckBoxPreference notifyOpenNetworks =
             (CheckBoxPreference) findPreference(KEY_NOTIFY_OPEN_NETWORKS);
-        notifyOpenNetworks.setChecked(Secure.getInt(getContentResolver(),
-                Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1);
+        notifyOpenNetworks.setChecked(Settings.Global.getInt(getContentResolver(),
+                Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1);
         notifyOpenNetworks.setEnabled(mWifiManager.isWifiEnabled());
 
         CheckBoxPreference poorNetworkDetection =
@@ -79,11 +110,30 @@
             if (Utils.isWifiOnly(getActivity())) {
                 getPreferenceScreen().removePreference(poorNetworkDetection);
             } else {
-                poorNetworkDetection.setChecked(Secure.getInt(getContentResolver(),
-                        Secure.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, 1) == 1);
+                poorNetworkDetection.setChecked(Global.getInt(getContentResolver(),
+                        Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED,
+                        WifiWatchdogStateMachine.DEFAULT_POOR_NETWORK_AVOIDANCE_ENABLED ?
+                        1 : 0) == 1);
             }
         }
 
+        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(),
+                Global.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED, 1) == 1);
+
         ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);
 
         if (mWifiManager.isDualBandSupported()) {
@@ -91,6 +141,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");
             }
@@ -107,9 +158,9 @@
                 sleepPolicyPref.setEntries(R.array.wifi_sleep_policy_entries_wifi_only);
             }
             sleepPolicyPref.setOnPreferenceChangeListener(this);
-            int value = Settings.System.getInt(getContentResolver(),
-                    Settings.System.WIFI_SLEEP_POLICY,
-                    Settings.System.WIFI_SLEEP_POLICY_NEVER);
+            int value = Settings.Global.getInt(getContentResolver(),
+                    Settings.Global.WIFI_SLEEP_POLICY,
+                    Settings.Global.WIFI_SLEEP_POLICY_NEVER);
             String stringValue = String.valueOf(value);
             sleepPolicyPref.setValue(stringValue);
             updateSleepPolicySummary(sleepPolicyPref, stringValue);
@@ -136,17 +187,30 @@
         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();
 
         if (KEY_NOTIFY_OPEN_NETWORKS.equals(key)) {
-            Secure.putInt(getContentResolver(),
-                    Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
+            Global.putInt(getContentResolver(),
+                    Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
                     ((CheckBoxPreference) preference).isChecked() ? 1 : 0);
         } else if (KEY_POOR_NETWORK_DETECTION.equals(key)) {
-            Secure.putInt(getContentResolver(),
-                    Secure.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED,
+            Global.putInt(getContentResolver(),
+                    Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED,
+                    ((CheckBoxPreference) preference).isChecked() ? 1 : 0);
+        } else if (KEY_SUSPEND_OPTIMIZATIONS.equals(key)) {
+            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);
@@ -160,7 +224,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();
@@ -171,7 +237,7 @@
         if (KEY_SLEEP_POLICY.equals(key)) {
             try {
                 String stringValue = (String) newValue;
-                Settings.System.putInt(getContentResolver(), Settings.System.WIFI_SLEEP_POLICY,
+                Settings.Global.putInt(getContentResolver(), Settings.Global.WIFI_SLEEP_POLICY,
                         Integer.parseInt(stringValue));
                 updateSleepPolicySummary(preference, stringValue);
             } catch (NumberFormatException e) {
diff --git a/src/com/android/settings/wifi/WifiApEnabler.java b/src/com/android/settings/wifi/WifiApEnabler.java
index 86a7cb4..9a3b49d 100644
--- a/src/com/android/settings/wifi/WifiApEnabler.java
+++ b/src/com/android/settings/wifi/WifiApEnabler.java
@@ -98,8 +98,8 @@
     }
 
     private void enableWifiCheckBox() {
-        boolean isAirplaneMode = Settings.System.getInt(mContext.getContentResolver(),
-                Settings.System.AIRPLANE_MODE_ON, 0) != 0;
+        boolean isAirplaneMode = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
         if(!isAirplaneMode) {
             mCheckBox.setEnabled(true);
         } else {
@@ -117,7 +117,7 @@
         if (enable && ((wifiState == WifiManager.WIFI_STATE_ENABLING) ||
                     (wifiState == WifiManager.WIFI_STATE_ENABLED))) {
             mWifiManager.setWifiEnabled(false);
-            Settings.Secure.putInt(cr, Settings.Secure.WIFI_SAVED_STATE, 1);
+            Settings.Global.putInt(cr, Settings.Global.WIFI_SAVED_STATE, 1);
         }
 
         if (mWifiManager.setWifiApEnabled(null, enable)) {
@@ -133,13 +133,13 @@
         if (!enable) {
             int wifiSavedState = 0;
             try {
-                wifiSavedState = Settings.Secure.getInt(cr, Settings.Secure.WIFI_SAVED_STATE);
+                wifiSavedState = Settings.Global.getInt(cr, Settings.Global.WIFI_SAVED_STATE);
             } catch (Settings.SettingNotFoundException e) {
                 ;
             }
             if (wifiSavedState == 1) {
                 mWifiManager.setWifiEnabled(true);
-                Settings.Secure.putInt(cr, Settings.Secure.WIFI_SAVED_STATE, 0);
+                Settings.Global.putInt(cr, Settings.Global.WIFI_SAVED_STATE, 0);
             }
         }
     }
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 2598a0e..90aef86 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -31,7 +31,9 @@
 import android.net.wifi.WifiConfiguration.IpAssignment;
 import android.net.wifi.WifiConfiguration.KeyMgmt;
 import android.net.wifi.WifiConfiguration.ProxySettings;
-import android.net.wifi.WifiConfiguration.Status;
+import android.net.wifi.WifiEnterpriseConfig;
+import android.net.wifi.WifiEnterpriseConfig.Eap;
+import android.net.wifi.WifiEnterpriseConfig.Phase2;
 import android.net.wifi.WifiInfo;
 import android.os.Handler;
 import android.security.Credentials;
@@ -47,6 +49,8 @@
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
@@ -62,11 +66,7 @@
  * share the logic for controlling buttons, text fields, etc.
  */
 public class WifiConfigController implements TextWatcher,
-        View.OnClickListener, AdapterView.OnItemSelectedListener {
-    private static final String KEYSTORE_SPACE = WifiConfiguration.KEYSTORE_URI;
-
-    private static final String PHASE2_PREFIX = "auth=";
-
+       AdapterView.OnItemSelectedListener, OnCheckedChangeListener {
     private final WifiConfigUiBase mConfigUi;
     private final View mView;
     private final AccessPoint mAccessPoint;
@@ -79,10 +79,20 @@
     private int mAccessPointSecurity;
     private TextView mPasswordView;
 
+    private String unspecifiedCert = "unspecified";
+    private static final int unspecifiedCertIndex = 0;
+
+    /* Phase2 methods supported by PEAP are limited */
+    private final ArrayAdapter<String> PHASE2_PEAP_ADAPTER;
+    /* Full list of phase2 methods */
+    private final ArrayAdapter<String> PHASE2_FULL_ADAPTER;
+
     private Spinner mSecuritySpinner;
     private Spinner mEapMethodSpinner;
     private Spinner mEapCaCertSpinner;
     private Spinner mPhase2Spinner;
+    // Associated with mPhase2Spinner, one of PHASE2_FULL_ADAPTER or PHASE2_PEAP_ADAPTER
+    private ArrayAdapter<String> mPhase2Adapter;
     private Spinner mEapUserCertSpinner;
     private TextView mEapIdentityView;
     private TextView mEapAnonymousView;
@@ -95,12 +105,17 @@
     public static final int PROXY_NONE = 0;
     public static final int PROXY_STATIC = 1;
 
-    /* These values from from "wifi_eap_method" resource array */
+    /* These values come from "wifi_eap_method" resource array */
     public static final int WIFI_EAP_METHOD_PEAP = 0;
     public static final int WIFI_EAP_METHOD_TLS  = 1;
     public static final int WIFI_EAP_METHOD_TTLS = 2;
     public static final int WIFI_EAP_METHOD_PWD  = 3;
 
+    /* These values come from "wifi_peap_phase2_entries" resource array */
+    public static final int WIFI_PEAP_PHASE2_NONE 	    = 0;
+    public static final int WIFI_PEAP_PHASE2_MSCHAPV2 	= 1;
+    public static final int WIFI_PEAP_PHASE2_GTC        = 2;
+
     private static final String TAG = "WifiConfigController";
 
     private Spinner mIpSettingsSpinner;
@@ -124,22 +139,6 @@
 
     private final Handler mTextViewChangedHandler;
 
-    static boolean requireKeyStore(WifiConfiguration config) {
-        if (config == null) {
-            return false;
-        }
-        if (!TextUtils.isEmpty(config.key_id.value())) {
-            return true;
-        }
-        String values[] = { config.ca_cert.value(), config.client_cert.value() };
-        for (String value : values) {
-            if (value != null && value.startsWith(KEYSTORE_SPACE)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     public WifiConfigController(
             WifiConfigUiBase parent, View view, AccessPoint accessPoint, boolean edit) {
         mConfigUi = parent;
@@ -155,6 +154,17 @@
         final Context context = mConfigUi.getContext();
         final Resources resources = context.getResources();
 
+        PHASE2_PEAP_ADAPTER = new ArrayAdapter<String>(
+            context, android.R.layout.simple_spinner_item,
+            context.getResources().getStringArray(R.array.wifi_peap_phase2_entries));
+        PHASE2_PEAP_ADAPTER.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+
+        PHASE2_FULL_ADAPTER = new ArrayAdapter<String>(
+                context, android.R.layout.simple_spinner_item,
+                context.getResources().getStringArray(R.array.wifi_phase2_entries));
+        PHASE2_FULL_ADAPTER.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+
+        unspecifiedCert = context.getString(R.string.wifi_unspecified);
         mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings);
         mIpSettingsSpinner.setOnItemSelectedListener(this);
         mProxySettingsSpinner = (Spinner) mView.findViewById(R.id.proxy_settings);
@@ -183,7 +193,9 @@
             showIpConfigFields();
             showProxyFields();
             mView.findViewById(R.id.wifi_advanced_toggle).setVisibility(View.VISIBLE);
-            mView.findViewById(R.id.wifi_advanced_togglebox).setOnClickListener(this);
+            ((CheckBox)mView.findViewById(R.id.wifi_advanced_togglebox))
+                    .setOnCheckedChangeListener(this);
+
 
             mConfigUi.setSubmitButton(context.getString(R.string.wifi_save));
         } else {
@@ -237,9 +249,10 @@
                 showIpConfigFields();
                 showProxyFields();
                 mView.findViewById(R.id.wifi_advanced_toggle).setVisibility(View.VISIBLE);
-                mView.findViewById(R.id.wifi_advanced_togglebox).setOnClickListener(this);
+                ((CheckBox)mView.findViewById(R.id.wifi_advanced_togglebox))
+                    .setOnCheckedChangeListener(this);
                 if (showAdvancedFields) {
-                    ((CheckBox) mView.findViewById(R.id.wifi_advanced_togglebox)).setChecked(true);
+                    ((CheckBox)mView.findViewById(R.id.wifi_advanced_togglebox)).setChecked(true);
                     mView.findViewById(R.id.wifi_advanced_fields).setVisibility(View.VISIBLE);
                 }
             }
@@ -356,33 +369,58 @@
             case AccessPoint.SECURITY_EAP:
                 config.allowedKeyManagement.set(KeyMgmt.WPA_EAP);
                 config.allowedKeyManagement.set(KeyMgmt.IEEE8021X);
-                config.eap.setValue((String) mEapMethodSpinner.getSelectedItem());
-
-                config.phase2.setValue((mPhase2Spinner.getSelectedItemPosition() == 0) ? "" :
-                        PHASE2_PREFIX + mPhase2Spinner.getSelectedItem());
-                config.ca_cert.setValue((mEapCaCertSpinner.getSelectedItemPosition() == 0) ? "" :
-                        KEYSTORE_SPACE + Credentials.CA_CERTIFICATE +
-                        (String) mEapCaCertSpinner.getSelectedItem());
-                config.client_cert.setValue((mEapUserCertSpinner.getSelectedItemPosition() == 0) ?
-                        "" : KEYSTORE_SPACE + Credentials.USER_CERTIFICATE +
-                        (String) mEapUserCertSpinner.getSelectedItem());
-                final boolean isEmptyKeyId = (mEapUserCertSpinner.getSelectedItemPosition() == 0);
-                config.key_id.setValue(isEmptyKeyId ? "" : Credentials.USER_PRIVATE_KEY +
-                        (String) mEapUserCertSpinner.getSelectedItem());
-                config.engine.setValue(isEmptyKeyId ? WifiConfiguration.ENGINE_DISABLE :
-                        WifiConfiguration.ENGINE_ENABLE);
-                config.engine_id.setValue(isEmptyKeyId ? "" : WifiConfiguration.KEYSTORE_ENGINE_ID);
-                config.identity.setValue((mEapIdentityView.length() == 0) ? "" :
-                        mEapIdentityView.getText().toString());
-                config.anonymous_identity.setValue((mEapAnonymousView.length() == 0) ? "" :
+                config.enterpriseConfig = new WifiEnterpriseConfig();
+                int eapMethod = mEapMethodSpinner.getSelectedItemPosition();
+                int phase2Method = mPhase2Spinner.getSelectedItemPosition();
+                config.enterpriseConfig.setEapMethod(eapMethod);
+                switch (eapMethod) {
+                    case Eap.PEAP:
+                        // PEAP supports limited phase2 values
+                        // Map the index from the PHASE2_PEAP_ADAPTER to the one used
+                        // by the API which has the full list of PEAP methods.
+                        switch(phase2Method) {
+                            case WIFI_PEAP_PHASE2_NONE:
+                                config.enterpriseConfig.setPhase2Method(Phase2.NONE);
+                                break;
+                            case WIFI_PEAP_PHASE2_MSCHAPV2:
+                                config.enterpriseConfig.setPhase2Method(Phase2.MSCHAPV2);
+                                break;
+                            case WIFI_PEAP_PHASE2_GTC:
+                                config.enterpriseConfig.setPhase2Method(Phase2.GTC);
+                                break;
+                            default:
+                                Log.e(TAG, "Unknown phase2 method" + phase2Method);
+                                break;
+                        }
+                        break;
+                    default:
+                        // The default index from PHASE2_FULL_ADAPTER maps to the API
+                        config.enterpriseConfig.setPhase2Method(phase2Method);
+                        break;
+                }
+                String caCert = (String) mEapCaCertSpinner.getSelectedItem();
+                if (caCert.equals(unspecifiedCert)) caCert = "";
+                config.enterpriseConfig.setCaCertificateAlias(caCert);
+                String clientCert = (String) mEapUserCertSpinner.getSelectedItem();
+                if (clientCert.equals(unspecifiedCert)) clientCert = "";
+                config.enterpriseConfig.setClientCertificateAlias(clientCert);
+                config.enterpriseConfig.setIdentity(mEapIdentityView.getText().toString());
+                config.enterpriseConfig.setAnonymousIdentity(
                         mEapAnonymousView.getText().toString());
-                if (mPasswordView.length() != 0) {
-                    config.password.setValue(mPasswordView.getText().toString());
+
+                if (mPasswordView.isShown()) {
+                    // For security reasons, a previous password is not displayed to user.
+                    // Update only if it has been changed.
+                    if (mPasswordView.length() > 0) {
+                        config.enterpriseConfig.setPassword(mPasswordView.getText().toString());
+                    }
+                } else {
+                    // clear password
+                    config.enterpriseConfig.setPassword(mPasswordView.getText().toString());
                 }
                 break;
-
             default:
-                    return null;
+                return null;
         }
 
         config.proxySettings = mProxySettings;
@@ -522,7 +560,8 @@
         if (mPasswordView == null) {
             mPasswordView = (TextView) mView.findViewById(R.id.password);
             mPasswordView.addTextChangedListener(this);
-            ((CheckBox) mView.findViewById(R.id.show_password)).setOnClickListener(this);
+            ((CheckBox) mView.findViewById(R.id.show_password))
+                .setOnCheckedChangeListener(this);
 
             if (mAccessPoint != null && mAccessPoint.networkId != INVALID_NETWORK_ID) {
                 mPasswordView.setHint(R.string.wifi_unchanged);
@@ -547,42 +586,144 @@
             loadCertificates(mEapCaCertSpinner, Credentials.CA_CERTIFICATE);
             loadCertificates(mEapUserCertSpinner, Credentials.USER_PRIVATE_KEY);
 
+            // Modifying an existing network
             if (mAccessPoint != null && mAccessPoint.networkId != INVALID_NETWORK_ID) {
-                WifiConfiguration config = mAccessPoint.getConfig();
-                setSelection(mEapMethodSpinner, config.eap.value());
-
-                final String phase2Method = config.phase2.value();
-                if (phase2Method != null && phase2Method.startsWith(PHASE2_PREFIX)) {
-                    setSelection(mPhase2Spinner, phase2Method.substring(PHASE2_PREFIX.length()));
-                } else {
-                    setSelection(mPhase2Spinner, phase2Method);
+                WifiEnterpriseConfig enterpriseConfig = mAccessPoint.getConfig().enterpriseConfig;
+                int eapMethod = enterpriseConfig.getEapMethod();
+                int phase2Method = enterpriseConfig.getPhase2Method();
+                mEapMethodSpinner.setSelection(eapMethod);
+                showEapFieldsByMethod(eapMethod);
+                switch (eapMethod) {
+                    case Eap.PEAP:
+                        switch (phase2Method) {
+                            case Phase2.NONE:
+                                mPhase2Spinner.setSelection(WIFI_PEAP_PHASE2_NONE);
+                                break;
+                            case Phase2.MSCHAPV2:
+                                mPhase2Spinner.setSelection(WIFI_PEAP_PHASE2_MSCHAPV2);
+                                break;
+                            case Phase2.GTC:
+                                mPhase2Spinner.setSelection(WIFI_PEAP_PHASE2_GTC);
+                                break;
+                            default:
+                                Log.e(TAG, "Invalid phase 2 method " + phase2Method);
+                                break;
+                        }
+                        break;
+                    default:
+                        mPhase2Spinner.setSelection(phase2Method);
+                        break;
                 }
-
-                setCertificate(mEapCaCertSpinner, KEYSTORE_SPACE + Credentials.CA_CERTIFICATE,
-                        config.ca_cert.value());
-                setCertificate(mEapUserCertSpinner, Credentials.USER_PRIVATE_KEY,
-                        config.key_id.value());
-                mEapIdentityView.setText(config.identity.value());
-                mEapAnonymousView.setText(config.anonymous_identity.value());
+                setSelection(mEapCaCertSpinner, enterpriseConfig.getCaCertificateAlias());
+                setSelection(mEapUserCertSpinner, enterpriseConfig.getClientCertificateAlias());
+                mEapIdentityView.setText(enterpriseConfig.getIdentity());
+                mEapAnonymousView.setText(enterpriseConfig.getAnonymousIdentity());
+            } else {
+                // Choose a default for a new network and show only appropriate
+                // fields
+                mEapMethodSpinner.setSelection(Eap.PEAP);
+                showEapFieldsByMethod(Eap.PEAP);
             }
+        } else {
+            showEapFieldsByMethod(mEapMethodSpinner.getSelectedItemPosition());
         }
+    }
 
+    /**
+     * EAP-PWD valid fields include
+     *   identity
+     *   password
+     * EAP-PEAP valid fields include
+     *   phase2: MSCHAPV2, GTC
+     *   ca_cert
+     *   identity
+     *   anonymous_identity
+     *   password
+     * EAP-TLS valid fields include
+     *   user_cert
+     *   ca_cert
+     *   identity
+     * EAP-TTLS valid fields include
+     *   phase2: PAP, MSCHAP, MSCHAPV2, GTC
+     *   ca_cert
+     *   identity
+     *   anonymous_identity
+     *   password
+     */
+    private void showEapFieldsByMethod(int eapMethod) {
+        // Common defaults
         mView.findViewById(R.id.l_method).setVisibility(View.VISIBLE);
         mView.findViewById(R.id.l_identity).setVisibility(View.VISIBLE);
 
-        if (mEapMethodSpinner.getSelectedItemPosition() == WIFI_EAP_METHOD_PWD){
-            mView.findViewById(R.id.l_phase2).setVisibility(View.GONE);
-            mView.findViewById(R.id.l_ca_cert).setVisibility(View.GONE);
-            mView.findViewById(R.id.l_user_cert).setVisibility(View.GONE);
-            mView.findViewById(R.id.l_anonymous).setVisibility(View.GONE);
-        } else {
-            mView.findViewById(R.id.l_phase2).setVisibility(View.VISIBLE);
-            mView.findViewById(R.id.l_ca_cert).setVisibility(View.VISIBLE);
-            mView.findViewById(R.id.l_user_cert).setVisibility(View.VISIBLE);
-            mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
+        // Defaults for most of the EAP methods and over-riden by
+        // by certain EAP methods
+        mView.findViewById(R.id.l_ca_cert).setVisibility(View.VISIBLE);
+        mView.findViewById(R.id.password_layout).setVisibility(View.VISIBLE);
+        mView.findViewById(R.id.show_password_layout).setVisibility(View.VISIBLE);
+
+        Context context = mConfigUi.getContext();
+        switch (eapMethod) {
+            case WIFI_EAP_METHOD_PWD:
+                setPhase2Invisible();
+                setCaCertInvisible();
+                setAnonymousIdentInvisible();
+                setUserCertInvisible();
+                break;
+            case WIFI_EAP_METHOD_TLS:
+                mView.findViewById(R.id.l_user_cert).setVisibility(View.VISIBLE);
+                setPhase2Invisible();
+                setAnonymousIdentInvisible();
+                setPasswordInvisible();
+                break;
+            case WIFI_EAP_METHOD_PEAP:
+                // Reset adapter if needed
+                if (mPhase2Adapter != PHASE2_PEAP_ADAPTER) {
+                    mPhase2Adapter = PHASE2_PEAP_ADAPTER;
+                    mPhase2Spinner.setAdapter(mPhase2Adapter);
+                }
+                mView.findViewById(R.id.l_phase2).setVisibility(View.VISIBLE);
+                mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
+                setUserCertInvisible();
+                break;
+            case WIFI_EAP_METHOD_TTLS:
+                // Reset adapter if needed
+                if (mPhase2Adapter != PHASE2_FULL_ADAPTER) {
+                    mPhase2Adapter = PHASE2_FULL_ADAPTER;
+                    mPhase2Spinner.setAdapter(mPhase2Adapter);
+                }
+                mView.findViewById(R.id.l_phase2).setVisibility(View.VISIBLE);
+                mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
+                setUserCertInvisible();
+                break;
         }
     }
 
+    private void setPhase2Invisible() {
+        mView.findViewById(R.id.l_phase2).setVisibility(View.GONE);
+        mPhase2Spinner.setSelection(Phase2.NONE);
+    }
+
+    private void setCaCertInvisible() {
+        mView.findViewById(R.id.l_ca_cert).setVisibility(View.GONE);
+        mEapCaCertSpinner.setSelection(unspecifiedCertIndex);
+    }
+
+    private void setUserCertInvisible() {
+        mView.findViewById(R.id.l_user_cert).setVisibility(View.GONE);
+        mEapUserCertSpinner.setSelection(unspecifiedCertIndex);
+    }
+
+    private void setAnonymousIdentInvisible() {
+        mView.findViewById(R.id.l_anonymous).setVisibility(View.GONE);
+        mEapAnonymousView.setText("");
+    }
+
+    private void setPasswordInvisible() {
+        mPasswordView.setText("");
+        mView.findViewById(R.id.password_layout).setVisibility(View.GONE);
+        mView.findViewById(R.id.show_password_layout).setVisibility(View.GONE);
+    }
+
     private void showIpConfigFields() {
         WifiConfiguration config = null;
 
@@ -675,14 +816,13 @@
 
     private void loadCertificates(Spinner spinner, String prefix) {
         final Context context = mConfigUi.getContext();
-        final String unspecified = context.getString(R.string.wifi_unspecified);
 
-        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[] {unspecified};
+            certs = new String[] {unspecifiedCert};
         } else {
             final String[] array = new String[certs.length + 1];
-            array[0] = unspecified;
+            array[0] = unspecifiedCert;
             System.arraycopy(certs, 0, array, 1, certs.length);
             certs = array;
         }
@@ -693,12 +833,6 @@
         spinner.setAdapter(adapter);
     }
 
-    private void setCertificate(Spinner spinner, String prefix, String cert) {
-        if (cert != null && cert.startsWith(prefix)) {
-            setSelection(spinner, cert.substring(prefix.length()));
-        }
-    }
-
     private void setSelection(Spinner spinner, String value) {
         if (value != null) {
             @SuppressWarnings("unchecked")
@@ -736,18 +870,18 @@
     }
 
     @Override
-    public void onClick(View view) {
+    public void onCheckedChanged(CompoundButton view, boolean isChecked) {
         if (view.getId() == R.id.show_password) {
             int pos = mPasswordView.getSelectionEnd();
             mPasswordView.setInputType(
-                    InputType.TYPE_CLASS_TEXT | (((CheckBox) view).isChecked() ?
+                    InputType.TYPE_CLASS_TEXT | (isChecked ?
                             InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD :
                                 InputType.TYPE_TEXT_VARIATION_PASSWORD));
             if (pos >= 0) {
                 ((EditText)mPasswordView).setSelection(pos);
             }
         } else if (view.getId() == R.id.wifi_advanced_togglebox) {
-            if (((CheckBox) view).isChecked()) {
+            if (isChecked) {
                 mView.findViewById(R.id.wifi_advanced_fields).setVisibility(View.VISIBLE);
             } else {
                 mView.findViewById(R.id.wifi_advanced_fields).setVisibility(View.GONE);
@@ -774,4 +908,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/WifiConfigInfo.java b/src/com/android/settings/wifi/WifiConfigInfo.java
index 2ed4f02..9b680a8 100644
--- a/src/com/android/settings/wifi/WifiConfigInfo.java
+++ b/src/com/android/settings/wifi/WifiConfigInfo.java
@@ -31,15 +31,9 @@
  */
 public class WifiConfigInfo extends Activity {
 
-    private static final String TAG = "WifiConfigInfo";
-
     private TextView mConfigList;
     private WifiManager mWifiManager;
 
-    //============================
-    // Activity lifecycle
-    //============================
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -52,12 +46,16 @@
     @Override
     protected void onResume() {
         super.onResume();
-        final List<WifiConfiguration> wifiConfigs = mWifiManager.getConfiguredNetworks();
-        StringBuffer configList  = new StringBuffer();
-        for (int i = wifiConfigs.size() - 1; i >= 0; i--) {
-            configList.append(wifiConfigs.get(i));
+        if (mWifiManager.isWifiEnabled()) {
+            final List<WifiConfiguration> wifiConfigs = mWifiManager.getConfiguredNetworks();
+            StringBuffer configList  = new StringBuffer();
+            for (int i = wifiConfigs.size() - 1; i >= 0; i--) {
+                configList.append(wifiConfigs.get(i));
+            }
+            mConfigList.setText(configList);
+        } else {
+            mConfigList.setText(R.string.wifi_state_disabled);
         }
-        mConfigList.setText(configList);
     }
 
 }
diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java
index 82b0cc6..f1720c1 100644
--- a/src/com/android/settings/wifi/WifiDialog.java
+++ b/src/com/android/settings/wifi/WifiDialog.java
@@ -38,7 +38,7 @@
 
     public WifiDialog(Context context, DialogInterface.OnClickListener listener,
             AccessPoint accessPoint, boolean edit) {
-        super(context, R.style.Theme_WifiDialog);
+        super(context);
         mEdit = edit;
         mListener = listener;
         mAccessPoint = accessPoint;
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index 987294b..a6989f0 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;
@@ -104,10 +106,11 @@
             return;
         }
         // Show toast message if Wi-Fi is not allowed in airplane mode
-        if (isChecked && !WirelessSettings.isRadioAllowed(mContext, Settings.System.RADIO_WIFI)) {
+        if (isChecked && !WirelessSettings.isRadioAllowed(mContext, Settings.Global.RADIO_WIFI)) {
             Toast.makeText(mContext, R.string.wifi_in_airplane_mode, Toast.LENGTH_SHORT).show();
             // Reset switch to off. No infinite check/listenenr loop.
             buttonView.setChecked(false);
+            return;
         }
 
         // Disable tethering if enabling Wifi
@@ -117,11 +120,10 @@
             mWifiManager.setWifiApEnabled(null, false);
         }
 
-        if (mWifiManager.setWifiEnabled(isChecked)) {
-            // Intent has been taken into account, disable until new state is active
-            mSwitch.setEnabled(false);
-        } else {
+        mSwitch.setEnabled(false);
+        if (!mWifiManager.setWifiEnabled(isChecked)) {
             // Error
+            mSwitch.setEnabled(true);
             Toast.makeText(mContext, R.string.wifi_error, Toast.LENGTH_SHORT).show();
         }
     }
diff --git a/src/com/android/settings/wifi/WifiPickerActivity.java b/src/com/android/settings/wifi/WifiPickerActivity.java
index 12612b5..e1e7c51 100644
--- a/src/com/android/settings/wifi/WifiPickerActivity.java
+++ b/src/com/android/settings/wifi/WifiPickerActivity.java
@@ -16,6 +16,8 @@
 package com.android.settings.wifi;
 
 import com.android.settings.ButtonBarHandler;
+import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
+import com.android.settings.wifi.p2p.WifiP2pSettings;
 
 import android.app.Fragment;
 import android.content.Intent;
@@ -42,6 +44,14 @@
         return modIntent;
     }
 
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (WifiSettings.class.getName().equals(fragmentName)
+                || WifiP2pSettings.class.getName().equals(fragmentName)
+                || AdvancedWifiSettings.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
+
     /**
      * Almost dead copy of
      * {@link PreferenceActivity#startWithFragment(String, Bundle, Fragment, int)}, except
diff --git a/src/com/android/settings/wifi/WifiScanModeActivity.java b/src/com/android/settings/wifi/WifiScanModeActivity.java
new file mode 100644
index 0000000..4133eb8
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiScanModeActivity.java
@@ -0,0 +1,150 @@
+/*
+ * 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.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+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)) {
+                ApplicationInfo ai;
+                mApp = getCallingPackage();
+                try {
+                    PackageManager pm = getPackageManager();
+                    ai = pm.getApplicationInfo(mApp, 0);
+                    mApp = (String)pm.getApplicationLabel(ai);
+                } catch (PackageManager.NameNotFoundException e) { }
+            } 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 de42f2a..1caf58b 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -17,9 +17,15 @@
 package com.android.settings.wifi;
 
 import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;
+import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
+
+import com.android.settings.R;
+import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.wifi.p2p.WifiP2pSettings;
 
 import android.app.ActionBar;
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -28,6 +34,8 @@
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.location.LocationManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.NetworkInfo.DetailedState;
@@ -43,8 +51,7 @@
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
-import android.security.Credentials;
-import android.security.KeyStore;
+import android.provider.Settings;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.ContextMenu;
@@ -58,6 +65,7 @@
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.PopupMenu;
 import android.widget.PopupMenu.OnMenuItemClickListener;
@@ -66,10 +74,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.wifi.p2p.WifiP2pSettings;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -85,7 +89,7 @@
  * The second is for Setup Wizard, with a simplified interface that hides the action bar
  * and menus.
  */
-public class WifiSettings extends SettingsPreferenceFragment
+public class WifiSettings extends RestrictedSettingsFragment
         implements DialogInterface.OnClickListener  {
     private static final String TAG = "WifiSettings";
     private static final int MENU_ID_WPS_PBC = Menu.FIRST;
@@ -101,6 +105,8 @@
     private static final int WIFI_DIALOG_ID = 1;
     private static final int WPS_PBC_DIALOG_ID = 2;
     private static final int WPS_PIN_DIALOG_ID = 3;
+    private static final int WIFI_SKIPPED_DIALOG_ID = 4;
+    private static final int WIFI_AND_MOBILE_SKIPPED_DIALOG_ID = 5;
 
     // Combo scans can take 5-6s to complete - set to 10s.
     private static final int WIFI_RESCAN_INTERVAL_MS = 10 * 1000;
@@ -109,18 +115,19 @@
     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;
 
     private WifiManager mWifiManager;
-    private WifiManager.Channel mChannel;
     private WifiManager.ActionListener mConnectListener;
     private WifiManager.ActionListener mSaveListener;
     private WifiManager.ActionListener mForgetListener;
     private boolean mP2pSupported;
 
-
     private WifiEnabler mWifiEnabler;
     // An access point being editted is stored here.
     private AccessPoint mSelectedAccessPoint;
@@ -128,9 +135,7 @@
     private DetailedState mLastState;
     private WifiInfo mLastInfo;
 
-    private AtomicBoolean mConnected = new AtomicBoolean(false);
-
-    private int mKeyStoreNetworkId = INVALID_NETWORK_ID;
+    private final AtomicBoolean mConnected = new AtomicBoolean(false);
 
     private WifiDialog mDialog;
 
@@ -144,6 +149,12 @@
     // this boolean extra specifies whether to auto finish when connection is established
     private static final String EXTRA_AUTO_FINISH_ON_CONNECT = "wifi_auto_finish_on_connect";
 
+    // this boolean extra shows a custom button that we can control
+    protected static final String EXTRA_SHOW_CUSTOM_BUTTON = "wifi_show_custom_button";
+
+    // show a text regarding data charges when wifi connection is required during setup wizard
+    protected static final String EXTRA_SHOW_WIFI_REQUIRED_INFO = "wifi_show_wifi_required_info";
+
     // this boolean extra is set if we are being invoked by the Setup Wizard
     private static final String EXTRA_IS_FIRST_RUN = "firstRun";
 
@@ -164,6 +175,7 @@
     /* End of "used in Wifi Setup context" */
 
     public WifiSettings() {
+        super(DISALLOW_CONFIG_WIFI);
         mFilter = new IntentFilter();
         mFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
         mFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
@@ -229,6 +241,42 @@
                     }
                 });
             }
+
+            Intent intent = getActivity().getIntent();
+            if (intent.getBooleanExtra(EXTRA_SHOW_CUSTOM_BUTTON, false)) {
+                view.findViewById(R.id.button_bar).setVisibility(View.VISIBLE);
+                view.findViewById(R.id.back_button).setVisibility(View.INVISIBLE);
+                view.findViewById(R.id.skip_button).setVisibility(View.INVISIBLE);
+                view.findViewById(R.id.next_button).setVisibility(View.INVISIBLE);
+
+                Button customButton = (Button) view.findViewById(R.id.custom_button);
+                customButton.setVisibility(View.VISIBLE);
+                customButton.setOnClickListener(new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        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);
+                        }
+                    }
+                });
+            }
+
+            if (intent.getBooleanExtra(EXTRA_SHOW_WIFI_REQUIRED_INFO, false)) {
+                view.findViewById(R.id.wifi_required_info).setVisibility(View.VISIBLE);
+            }
+
             return view;
         } else {
             return super.onCreateView(inflater, container, savedInstanceState);
@@ -237,41 +285,53 @@
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
-        // We don't call super.onActivityCreated() here, since it assumes we already set up
-        // Preference (probably in onCreate()), while WifiSettings exceptionally set it up in
-        // this method.
+        super.onActivityCreated(savedInstanceState);
 
         mP2pSupported = getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT);
         mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
-        mChannel = mWifiManager.initialize(getActivity(), getActivity().getMainLooper(), null);
 
         mConnectListener = new WifiManager.ActionListener() {
+                                   @Override
                                    public void onSuccess() {
                                    }
+                                   @Override
                                    public void onFailure(int reason) {
-                                        Toast.makeText(getActivity(),
-                                            R.string.wifi_failed_connect_message,
-                                            Toast.LENGTH_SHORT).show();
+                                       Activity activity = getActivity();
+                                       if (activity != null) {
+                                           Toast.makeText(activity,
+                                                R.string.wifi_failed_connect_message,
+                                                Toast.LENGTH_SHORT).show();
+                                       }
                                    }
                                };
 
         mSaveListener = new WifiManager.ActionListener() {
+                                @Override
                                 public void onSuccess() {
                                 }
+                                @Override
                                 public void onFailure(int reason) {
-                                    Toast.makeText(getActivity(),
-                                        R.string.wifi_failed_save_message,
-                                        Toast.LENGTH_SHORT).show();
+                                    Activity activity = getActivity();
+                                    if (activity != null) {
+                                        Toast.makeText(activity,
+                                            R.string.wifi_failed_save_message,
+                                            Toast.LENGTH_SHORT).show();
+                                    }
                                 }
                             };
 
         mForgetListener = new WifiManager.ActionListener() {
+                                   @Override
                                    public void onSuccess() {
                                    }
+                                   @Override
                                    public void onFailure(int reason) {
-                                        Toast.makeText(getActivity(),
-                                            R.string.wifi_failed_forget_message,
-                                            Toast.LENGTH_SHORT).show();
+                                       Activity activity = getActivity();
+                                       if (activity != null) {
+                                           Toast.makeText(activity,
+                                               R.string.wifi_failed_forget_message,
+                                               Toast.LENGTH_SHORT).show();
+                                       }
                                    }
                                };
 
@@ -294,9 +354,10 @@
             }
 
             final ConnectivityManager connectivity = (ConnectivityManager)
-                    getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
+                    activity.getSystemService(Context.CONNECTIVITY_SERVICE);
             if (connectivity != null
                     && connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected()) {
+                activity.setResult(Activity.RESULT_OK);
                 activity.finish();
                 return;
             }
@@ -309,7 +370,7 @@
         if (mEnableNextOnConnection) {
             if (hasNextButton()) {
                 final ConnectivityManager connectivity = (ConnectivityManager)
-                        getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
+                        activity.getSystemService(Context.CONNECTIVITY_SERVICE);
                 if (connectivity != null) {
                     NetworkInfo info = connectivity.getNetworkInfo(
                             ConnectivityManager.TYPE_WIFI);
@@ -322,7 +383,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 |
@@ -338,13 +399,13 @@
                 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(
                             ActionBar.LayoutParams.WRAP_CONTENT,
                             ActionBar.LayoutParams.WRAP_CONTENT,
-                            Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+                            Gravity.CENTER_VERTICAL | Gravity.END));
                 }
             }
 
@@ -358,9 +419,6 @@
             registerForContextMenu(getListView());
         }
         setHasOptionsMenu(true);
-
-        // After confirming PreferenceScreen is available, we call super.
-        super.onActivityCreated(savedInstanceState);
     }
 
     @Override
@@ -371,12 +429,6 @@
         }
 
         getActivity().registerReceiver(mReceiver, mFilter);
-        if (mKeyStoreNetworkId != INVALID_NETWORK_ID &&
-                KeyStore.getInstance().state() == KeyStore.State.UNLOCKED) {
-            mWifiManager.connect(mChannel, mKeyStoreNetworkId, mConnectListener);
-        }
-        mKeyStoreNetworkId = INVALID_NETWORK_ID;
-
         updateAccessPoints();
     }
 
@@ -392,11 +444,15 @@
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        // If the user is not allowed to configure wifi, do not show the menu.
+        if (isRestrictedAndNotPinProtected()) return;
+
         final boolean wifiIsEnabled = mWifiManager.isWifiEnabled();
+        TypedArray ta = getActivity().getTheme().obtainStyledAttributes(
+                new int[] {R.attr.ic_menu_add, R.attr.ic_wps});
         if (mSetupWizardMode) {
-            // FIXME: add setIcon() when graphics are available
             menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
-                    .setIcon(R.drawable.ic_wps)
+                    .setIcon(ta.getDrawable(1))
                     .setEnabled(wifiIsEnabled)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
             menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
@@ -404,11 +460,11 @@
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         } else {
             menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
-                    .setIcon(R.drawable.ic_wps)
+                    .setIcon(ta.getDrawable(1))
                     .setEnabled(wifiIsEnabled)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
             menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
-                    .setIcon(R.drawable.ic_menu_add)
+                    .setIcon(ta.getDrawable(0))
                     .setEnabled(wifiIsEnabled)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
             menu.add(Menu.NONE, MENU_ID_SCAN, 0, R.string.wifi_menu_scan)
@@ -427,6 +483,7 @@
                     //.setIcon(android.R.drawable.ic_menu_manage)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
         }
+        ta.recycle();
         super.onCreateOptionsMenu(menu, inflater);
     }
 
@@ -447,6 +504,9 @@
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+        // If the user is not allowed to configure wifi, do not handle menu selections.
+        if (isRestrictedAndNotPinProtected()) return false;
+
         switch (item.getItemId()) {
             case MENU_ID_WPS_PBC:
                 showDialog(WPS_PBC_DIALOG_ID);
@@ -519,14 +579,12 @@
         switch (item.getItemId()) {
             case MENU_ID_CONNECT: {
                 if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
-                    if (!requireKeyStore(mSelectedAccessPoint.getConfig())) {
-                        mWifiManager.connect(mChannel, mSelectedAccessPoint.networkId,
-                                mConnectListener);
-                    }
+                    mWifiManager.connect(mSelectedAccessPoint.networkId,
+                            mConnectListener);
                 } else if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE) {
                     /** Bypass dialog for unsecured networks */
                     mSelectedAccessPoint.generateOpenNetworkConfig();
-                    mWifiManager.connect(mChannel, mSelectedAccessPoint.getConfig(),
+                    mWifiManager.connect(mSelectedAccessPoint.getConfig(),
                             mConnectListener);
                 } else {
                     showDialog(mSelectedAccessPoint, true);
@@ -534,7 +592,7 @@
                 return true;
             }
             case MENU_ID_FORGET: {
-                mWifiManager.forget(mChannel, mSelectedAccessPoint.networkId, mForgetListener);
+                mWifiManager.forget(mSelectedAccessPoint.networkId, mForgetListener);
                 return true;
             }
             case MENU_ID_MODIFY: {
@@ -553,7 +611,7 @@
             if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE &&
                     mSelectedAccessPoint.networkId == INVALID_NETWORK_ID) {
                 mSelectedAccessPoint.generateOpenNetworkConfig();
-                mWifiManager.connect(mChannel, mSelectedAccessPoint.getConfig(), mConnectListener);
+                mWifiManager.connect(mSelectedAccessPoint.getConfig(), mConnectListener);
             } else {
                 showDialog(mSelectedAccessPoint, false);
             }
@@ -586,6 +644,8 @@
                         ap = new AccessPoint(getActivity(), mAccessPointSavedState);
                         // For repeated orientation changes
                         mDlgAccessPoint = ap;
+                        // Reset the saved access point data
+                        mAccessPointSavedState = null;
                     }
                 }
                 // If it's still null, fine, it's for Add Network
@@ -596,20 +656,49 @@
                 return new WpsDialog(getActivity(), WpsInfo.PBC);
             case WPS_PIN_DIALOG_ID:
                 return new WpsDialog(getActivity(), WpsInfo.DISPLAY);
+            case WIFI_SKIPPED_DIALOG_ID:
+                return new AlertDialog.Builder(getActivity())
+                            .setMessage(R.string.wifi_skipped_message)
+                            .setCancelable(false)
+                            .setNegativeButton(R.string.wifi_skip_anyway,
+                                    new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int id) {
+                                    getActivity().setResult(RESULT_SKIP);
+                                    getActivity().finish();
+                                }
+                            })
+                            .setPositiveButton(R.string.wifi_dont_skip,
+                                    new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int id) {
+                                }
+                            })
+                            .create();
+            case WIFI_AND_MOBILE_SKIPPED_DIALOG_ID:
+                return new AlertDialog.Builder(getActivity())
+                            .setMessage(R.string.wifi_and_mobile_skipped_message)
+                            .setCancelable(false)
+                            .setNegativeButton(R.string.wifi_skip_anyway,
+                                    new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int id) {
+                                    getActivity().setResult(RESULT_SKIP);
+                                    getActivity().finish();
+                                }
+                            })
+                            .setPositiveButton(R.string.wifi_dont_skip,
+                                    new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int id) {
+                                }
+                            })
+                            .create();
+
         }
         return super.onCreateDialog(dialogId);
     }
 
-    private boolean requireKeyStore(WifiConfiguration config) {
-        if (WifiConfigController.requireKeyStore(config) &&
-                KeyStore.getInstance().state() != KeyStore.State.UNLOCKED) {
-            mKeyStoreNetworkId = config.networkId;
-            Credentials.getInstance().unlock(getActivity());
-            return true;
-        }
-        return false;
-    }
-
     /**
      * Shows the latest access points available with supplimental information like
      * the strength of network and the security for it.
@@ -618,6 +707,10 @@
         // Safeguard from some delayed event handling
         if (getActivity() == null) return;
 
+        if (isRestrictedAndNotPinProtected()) {
+            addMessagePreference(R.string.wifi_empty_list_user_restricted);
+            return;
+        }
         final int wifiState = mWifiManager.getWifiState();
 
         switch (wifiState) {
@@ -642,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();
@@ -698,7 +811,7 @@
 
     /** A restricted multimap for use in constructAccessPoints */
     private class Multimap<K,V> {
-        private HashMap<K,List<V>> store = new HashMap<K,List<V>>();
+        private final HashMap<K,List<V>> store = new HashMap<K,List<V>>();
         /** retrieve a non-null list of values with key K */
         List<V> getAll(K key) {
             List<V> values = store.get(key);
@@ -735,7 +848,12 @@
                     WifiManager.EXTRA_NEW_STATE);
             if (!mConnected.get() && SupplicantState.isHandshakeState(state)) {
                 updateConnectionState(WifiInfo.getDetailedStateOf(state));
-            }
+             } else {
+                 // During a connect, we may have the supplicant
+                 // state change affect the detailed network state.
+                 // Make sure a lost connection is updated as well.
+                 updateConnectionState(null);
+             }
         } else if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(action)) {
             NetworkInfo info = (NetworkInfo) intent.getParcelableExtra(
                     WifiManager.EXTRA_NETWORK_INFO);
@@ -744,7 +862,11 @@
             updateAccessPoints();
             updateConnectionState(info.getDetailedState());
             if (mAutoFinishOnConnection && info.isConnected()) {
-                getActivity().finish();
+                Activity activity = getActivity();
+                if (activity != null) {
+                    activity.setResult(Activity.RESULT_OK);
+                    activity.finish();
+                }
                 return;
             }
         } else if (WifiManager.RSSI_CHANGED_ACTION.equals(action)) {
@@ -781,7 +903,10 @@
     }
 
     private void updateWifiState(int state) {
-        getActivity().invalidateOptionsMenu();
+        Activity activity = getActivity();
+        if (activity != null) {
+            activity.invalidateOptionsMenu();
+        }
 
         switch (state) {
             case WifiManager.WIFI_STATE_ENABLED:
@@ -793,7 +918,7 @@
                 break;
 
             case WifiManager.WIFI_STATE_DISABLED:
-                addMessagePreference(R.string.wifi_empty_list_wifi_off);
+                setOffMessage();
                 break;
         }
 
@@ -823,12 +948,15 @@
 
         @Override
         public void handleMessage(Message message) {
-            if (mWifiManager.startScanActive()) {
+            if (mWifiManager.startScan()) {
                 mRetry = 0;
             } else if (++mRetry >= 3) {
                 mRetry = 0;
-                Toast.makeText(getActivity(), R.string.wifi_fail_to_scan,
-                        Toast.LENGTH_LONG).show();
+                Activity activity = getActivity();
+                if (activity != null) {
+                    Toast.makeText(activity, R.string.wifi_fail_to_scan,
+                            Toast.LENGTH_LONG).show();
+                }
                 return;
             }
             sendEmptyMessageDelayed(0, WIFI_RESCAN_INTERVAL_MS);
@@ -847,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());
+            }
         }
     }
 
@@ -861,20 +992,19 @@
 
         if (config == null) {
             if (mSelectedAccessPoint != null
-                    && !requireKeyStore(mSelectedAccessPoint.getConfig())
                     && mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
-                mWifiManager.connect(mChannel, mSelectedAccessPoint.networkId,
+                mWifiManager.connect(mSelectedAccessPoint.networkId,
                         mConnectListener);
             }
         } else if (config.networkId != INVALID_NETWORK_ID) {
             if (mSelectedAccessPoint != null) {
-                mWifiManager.save(mChannel, config, mSaveListener);
+                mWifiManager.save(config, mSaveListener);
             }
         } else {
-            if (configController.isEdit() || requireKeyStore(config)) {
-                mWifiManager.save(mChannel, config, mSaveListener);
+            if (configController.isEdit()) {
+                mWifiManager.save(config, mSaveListener);
             } else {
-                mWifiManager.connect(mChannel, config, mConnectListener);
+                mWifiManager.connect(config, mConnectListener);
             }
         }
 
@@ -891,7 +1021,7 @@
             return;
         }
 
-        mWifiManager.forget(mChannel, mSelectedAccessPoint.networkId, mForgetListener);
+        mWifiManager.forget(mSelectedAccessPoint.networkId, mForgetListener);
 
         if (mWifiManager.isWifiEnabled()) {
             mScanner.resume();
@@ -983,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/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index 8258b55..bc387cb 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -38,7 +38,6 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.android.internal.util.AsyncChannel;
 import com.android.settings.R;
 
 import java.util.Collection;
@@ -74,7 +73,6 @@
 
     private WifiSettings mWifiSettings;
     private WifiManager mWifiManager;
-    private WifiManager.Channel mChannel;
 
     /** Used for resizing a padding above title. Hiden when software keyboard is shown. */
     private View mTopPadding;
@@ -143,7 +141,6 @@
         setContentView(R.layout.wifi_settings_for_setup_wizard_xl);
 
         mWifiManager = (WifiManager)getSystemService(Context.WIFI_SERVICE);
-        mChannel = mWifiManager.initialize(this, getMainLooper(), null);
         // There's no button here enabling wifi network, so we need to enable it without
         // users' request.
         mWifiManager.setWifiEnabled(true);
@@ -596,7 +593,7 @@
                     Log.d(TAG, String.format("forgeting Wi-Fi network \"%s\" (id: %d)",
                             config.SSID, config.networkId));
                 }
-                mWifiManager.forget(mChannel, config.networkId, new WifiManager.ActionListener() {
+                mWifiManager.forget(config.networkId, new WifiManager.ActionListener() {
                         public void onSuccess() {
                         }
                         public void onFailure(int reason) {
@@ -761,7 +758,7 @@
      */
     /* package */ void onSaveNetwork(WifiConfiguration config) {
         // We want to both save and connect a network. connectNetwork() does both.
-        mWifiManager.connect(mChannel, config, new WifiManager.ActionListener() {
+        mWifiManager.connect(config, new WifiManager.ActionListener() {
                 public void onSuccess() {
                 }
                 public void onFailure(int reason) {
diff --git a/src/com/android/settings/wifi/WifiSetupActivity.java b/src/com/android/settings/wifi/WifiSetupActivity.java
index 8415954..1739750 100644
--- a/src/com/android/settings/wifi/WifiSetupActivity.java
+++ b/src/com/android/settings/wifi/WifiSetupActivity.java
@@ -17,7 +17,25 @@
 
 import com.android.settings.ButtonBarHandler;
 
-// dummy class for setup wizard theme
-public class WifiSetupActivity extends WifiPickerActivity implements ButtonBarHandler {
+import android.content.res.Resources;
 
-}
\ No newline at end of file
+public class WifiSetupActivity extends WifiPickerActivity implements ButtonBarHandler {
+    // Extra containing the resource name of the theme to be used
+    private static final String EXTRA_THEME = "theme";
+    private static final String THEME_HOLO = "holo";
+    private static final String THEME_HOLO_LIGHT = "holo_light";
+
+    // Style resources containing theme settings
+    private static final String RESOURCE_THEME_DARK = "SetupWizardWifiTheme";
+    private static final String RESOURCE_THEME_LIGHT = "SetupWizardWifiTheme.Light";
+
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        String themeName = getIntent().getStringExtra(EXTRA_THEME);
+        if (themeName != null && themeName.equalsIgnoreCase(THEME_HOLO_LIGHT)) {
+            resid = getResources().getIdentifier(RESOURCE_THEME_LIGHT, "style",
+                    getPackageName());
+        }
+        super.onApplyThemeResource(theme, resid, first);
+    }
+}
diff --git a/src/com/android/settings/wifi/WpsDialog.java b/src/com/android/settings/wifi/WpsDialog.java
index 40b2a35..2a93884 100644
--- a/src/com/android/settings/wifi/WpsDialog.java
+++ b/src/com/android/settings/wifi/WpsDialog.java
@@ -56,7 +56,6 @@
     private static final int WPS_TIMEOUT_S = 120;
 
     private WifiManager mWifiManager;
-    private WifiManager.Channel mChannel;
     private WifiManager.WpsListener mWpsListener;
     private int mWpsSetup;
 
@@ -155,7 +154,6 @@
         });
 
         mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
-        mChannel = mWifiManager.initialize(mContext, mContext.getMainLooper(), null);
 
         setView(mView);
         super.onCreate(savedInstanceState);
@@ -184,13 +182,13 @@
 
         WpsInfo wpsConfig = new WpsInfo();
         wpsConfig.setup = mWpsSetup;
-        mWifiManager.startWps(mChannel, wpsConfig, mWpsListener);
+        mWifiManager.startWps(wpsConfig, mWpsListener);
     }
 
     @Override
     protected void onStop() {
         if (mDialogState != DialogState.WPS_COMPLETE) {
-            mWifiManager.cancelWps(mChannel, null);
+            mWifiManager.cancelWps(null);
         }
 
         if (mReceiver != null) {
@@ -203,31 +201,36 @@
         }
     }
 
-    private void updateDialog(DialogState state, String msg) {
+    private void updateDialog(final DialogState state, final String msg) {
         if (mDialogState.ordinal() >= state.ordinal()) {
             //ignore.
             return;
         }
         mDialogState = state;
 
-        switch(state) {
-            case WPS_COMPLETE:
-                mTimeoutBar.setVisibility(View.GONE);
-                mProgressBar.setVisibility(View.VISIBLE);
-                break;
-            case CONNECTED:
-            case WPS_FAILED:
-                mButton.setText(mContext.getString(R.string.dlg_ok));
-                mTimeoutBar.setVisibility(View.GONE);
-                mProgressBar.setVisibility(View.GONE);
-                if (mReceiver != null) {
-                    mContext.unregisterReceiver(mReceiver);
-                    mReceiver = null;
+        mHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    switch(state) {
+                        case WPS_COMPLETE:
+                            mTimeoutBar.setVisibility(View.GONE);
+                            mProgressBar.setVisibility(View.VISIBLE);
+                            break;
+                        case CONNECTED:
+                        case WPS_FAILED:
+                            mButton.setText(mContext.getString(R.string.dlg_ok));
+                            mTimeoutBar.setVisibility(View.GONE);
+                            mProgressBar.setVisibility(View.GONE);
+                            if (mReceiver != null) {
+                                mContext.unregisterReceiver(mReceiver);
+                                mReceiver = null;
+                            }
+                            break;
+                    }
+                    mTextView.setText(msg);
                 }
-                break;
-        }
-        mTextView.setText(msg);
-    }
+            });
+   }
 
     private void handleEvent(Context context, Intent intent) {
         String action = intent.getAction();
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
index 1eb810e..a364021 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
@@ -20,21 +20,18 @@
 
 import android.content.Context;
 import android.net.wifi.WifiManager;
-import android.net.wifi.p2p.WifiP2pManager;
 import android.net.wifi.p2p.WifiP2pDevice;
 import android.preference.Preference;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 
-import java.util.Comparator;
-
 public class WifiP2pPeer extends Preference {
 
     private static final int[] STATE_SECURED = {R.attr.state_encrypted};
     public WifiP2pDevice device;
 
-    private int mRssi;
+    private final int mRssi;
     private ImageView mSignal;
 
     private static final int SIGNAL_LEVELS = 4;
@@ -57,7 +54,7 @@
         if (mRssi == Integer.MAX_VALUE) {
             mSignal.setImageDrawable(null);
         } else {
-            mSignal.setImageResource(R.drawable.wifi_signal);
+            mSignal.setImageResource(R.drawable.wifi_signal_dark);
             mSignal.setImageState(STATE_SECURED,  true);
         }
         refresh();
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 1bb253a..cd1d721 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -28,13 +28,13 @@
 import android.content.IntentFilter;
 import android.net.NetworkInfo;
 import android.net.wifi.p2p.WifiP2pConfig;
+import android.net.wifi.p2p.WifiP2pInfo;
 import android.net.wifi.p2p.WifiP2pDevice;
 import android.net.wifi.p2p.WifiP2pDeviceList;
 import android.net.wifi.p2p.WifiP2pGroup;
 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;
@@ -45,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;
@@ -66,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;
@@ -82,12 +83,14 @@
     private OnClickListener mDeleteGroupListener;
     private WifiP2pPeer mSelectedWifiPeer;
     private WifiP2pPersistentGroup mSelectedGroup;
+    private String mSelectedGroupName;
     private EditText mDeviceNameText;
 
     private boolean mWifiP2pEnabled;
     private boolean mWifiP2pSearching;
     private int mConnectedDevices;
     private WifiP2pGroup mConnectedGroup;
+    private boolean mLastGroupFormed = false;
 
     private PreferenceGroup mPeersGroup;
     private PreferenceGroup mPersistentGroup;
@@ -100,6 +103,7 @@
 
     private static final String SAVE_DIALOG_PEER = "PEER_STATE";
     private static final String SAVE_DEVICE_NAME = "DEV_NAME";
+    private static final String SAVE_SELECTED_GROUP = "GROUP_NAME";
 
     private WifiP2pDevice mThisDevice;
     private WifiP2pDeviceList mPeers = new WifiP2pDeviceList();
@@ -116,22 +120,26 @@
                     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(
                         WifiP2pManager.EXTRA_NETWORK_INFO);
+                WifiP2pInfo wifip2pinfo = (WifiP2pInfo) intent.getParcelableExtra(
+                        WifiP2pManager.EXTRA_WIFI_P2P_INFO);
                 if (mWifiP2pManager != null) {
                     mWifiP2pManager.requestGroupInfo(mChannel, WifiP2pSettings.this);
                 }
                 if (networkInfo.isConnected()) {
                     if (DBG) Log.d(TAG, "Connected");
-                } else {
+                } else if (mLastGroupFormed != true) {
                     //start a search when we are disconnected
+                    //but not on group removed broadcast event
                     startSearch();
                 }
+                mLastGroupFormed = wifip2pinfo.groupFormed;
             } else if (WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION.equals(action)) {
                 mThisDevice = (WifiP2pDevice) intent.getParcelableExtra(
                         WifiP2pManager.EXTRA_WIFI_P2P_DEVICE);
@@ -154,6 +162,10 @@
         }
     };
 
+    public WifiP2pSettings() {
+        if (DBG) Log.d(TAG, "Creating WifiP2pSettings ...");
+    }
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         addPreferencesFromResource(R.xml.wifi_p2p_settings);
@@ -185,6 +197,9 @@
         if (savedInstanceState != null && savedInstanceState.containsKey(SAVE_DEVICE_NAME)) {
             mSavedDeviceName = savedInstanceState.getString(SAVE_DEVICE_NAME);
         }
+        if (savedInstanceState != null && savedInstanceState.containsKey(SAVE_SELECTED_GROUP)) {
+            mSelectedGroupName = savedInstanceState.getString(SAVE_SELECTED_GROUP);
+        }
 
         mRenameListener = new OnClickListener() {
             @Override
@@ -253,17 +268,28 @@
             public void onClick(DialogInterface dialog, int which) {
                 if (which == DialogInterface.BUTTON_POSITIVE) {
                     if (mWifiP2pManager != null) {
-                        mWifiP2pManager.deletePersistentGroup(mChannel,
-                                mSelectedGroup.getNetworkId(),
-                                new WifiP2pManager.ActionListener() {
-                            public void onSuccess() {
-                                if (DBG) Log.d(TAG, " delete group success");
-                            }
-                            public void onFailure(int reason) {
-                                if (DBG) Log.d(TAG, " delete group fail " + reason);
-                            }
-                        });
+                        if (mSelectedGroup != null) {
+                            if (DBG) Log.d(TAG, " deleting group " + mSelectedGroup.getGroupName());
+                            mWifiP2pManager.deletePersistentGroup(mChannel,
+                                    mSelectedGroup.getNetworkId(),
+                                    new WifiP2pManager.ActionListener() {
+                                public void onSuccess() {
+                                    if (DBG) Log.d(TAG, " delete group success");
+                                }
+                                public void onFailure(int reason) {
+                                    if (DBG) Log.d(TAG, " delete group fail " + reason);
+                                }
+                            });
+                            mSelectedGroup = null;
+                        } else {
+                            if (DBG) Log.w(TAG, " No selected group to delete!" );
+                        }
                     }
+                } else if (which == DialogInterface.BUTTON_NEGATIVE) {
+                    if (DBG) {
+                        Log.d(TAG, " forgetting selected group " + mSelectedGroup.getGroupName());
+                    }
+                    mSelectedGroup = null;
                 }
             }
         };
@@ -425,6 +451,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());
@@ -444,11 +471,10 @@
             int stringId = R.string.wifi_p2p_delete_group_message;
 
             AlertDialog dialog = new AlertDialog.Builder(getActivity())
-                .setTitle(R.string.wifi_p2p_delete_group_title)
-                .setMessage(getActivity().getString(stringId, mSelectedGroup.getGroupName()))
+                .setMessage(getActivity().getString(stringId))
                 .setPositiveButton(getActivity().getString(R.string.dlg_ok), mDeleteGroupListener)
-                .setNegativeButton(getActivity().getString(R.string.dlg_cancel), null)
-                .create();
+                .setNegativeButton(getActivity().getString(R.string.dlg_cancel),
+                        mDeleteGroupListener).create();
             return dialog;
         }
         return null;
@@ -462,15 +488,18 @@
         if (mDeviceNameText != null) {
             outState.putString(SAVE_DEVICE_NAME, mDeviceNameText.getText().toString());
         }
+        if (mSelectedGroup != null) {
+            outState.putString(SAVE_SELECTED_GROUP, mSelectedGroup.getGroupName());
+        }
     }
 
-    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++;
         }
@@ -482,7 +511,20 @@
 
         for (WifiP2pGroup group: groups.getGroupList()) {
             if (DBG) Log.d(TAG, " group " + group);
-            mPersistentGroup.addPreference(new WifiP2pPersistentGroup(getActivity(), group));
+            WifiP2pPersistentGroup wppg = new WifiP2pPersistentGroup(getActivity(), group);
+            mPersistentGroup.addPreference(wppg);
+            if (wppg.getGroupName().equals(mSelectedGroupName)) {
+                if (DBG) Log.d(TAG, "Selecting group " + wppg.getGroupName());
+                mSelectedGroup = wppg;
+                mSelectedGroupName = null;
+            }
+        }
+        if (mSelectedGroupName != null) {
+            // Looks like there's a dialog pending getting user confirmation to delete the
+            // selected group. When user hits OK on that dialog, we won't do anything; but we
+            // shouldn't be in this situation in first place, because these groups are persistent
+            // groups and they shouldn't just get deleted!
+            Log.w(TAG, " Selected group " + mSelectedGroupName + " disappered on next query ");
         }
     }
 
@@ -506,9 +548,6 @@
 
             mPersistentGroup.setEnabled(true);
             preferenceScreen.addPreference(mPersistentGroup);
-
-            /* Request latest set of peers */
-            mWifiP2pManager.requestPeers(mChannel, WifiP2pSettings.this);
         }
     }
 
diff --git a/tests/res/layout/bluetooth_request_permission_test.xml b/tests/res/layout/bluetooth_request_permission_test.xml
index 0a5aec0..b62db19 100644
--- a/tests/res/layout/bluetooth_request_permission_test.xml
+++ b/tests/res/layout/bluetooth_request_permission_test.xml
@@ -32,19 +32,19 @@
         style="@android:style/ButtonBar">
 
         <Button android:id="@+id/enable"
-            android:layout_width="0dip"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/enable" />
 
         <Button android:id="@+id/discoverable"
-            android:layout_width="0dip"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/discoverable" />
 
         <Button android:id="@+id/scan"
-            android:layout_width="0dip"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/start_scan" />
diff --git a/tests/res/values-ca/strings.xml b/tests/res/values-ca/strings.xml
index d988ebb..8ddac7d 100644
--- a/tests/res/values-ca/strings.xml
+++ b/tests/res/values-ca/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="3169265480789026010">"Detectable"</string>
+    <string name="discoverable" msgid="3169265480789026010">"Visible"</string>
     <string name="start_scan" msgid="6035699220942169744">"Inicia la cerca"</string>
     <string name="stop_scan" msgid="527546916633745779">"Atura la cerca"</string>
     <string name="operator_hello" msgid="292208161864910159">"Hola, Operador!"</string>
diff --git a/tests/res/values-fa/strings.xml b/tests/res/values-fa/strings.xml
index 1422446..d3a16b0 100644
--- a/tests/res/values-fa/strings.xml
+++ b/tests/res/values-fa/strings.xml
@@ -21,8 +21,8 @@
     <string name="stop_scan" msgid="527546916633745779">"توقف اسکن"</string>
     <string name="operator_hello" msgid="292208161864910159">"سلام اپراتور!"</string>
     <string name="operator_settings_title" msgid="1410094511974808567">"اپراتور"</string>
-    <string name="operator_settings_summary" msgid="5916597343019392258">"گیره اپراتور که جهت شروع فعالیت مورد نظر استفاده می شود"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"گیره اپراتور که جهت شروع فعالیت مورد نظر استفاده می‌شود"</string>
     <string name="manufacturer_hello" msgid="7525744633645544137">"سلام سازنده!"</string>
     <string name="manufacturer_settings_title" msgid="2503105049808838612">"سازنده"</string>
-    <string name="manufacturer_settings_summary" msgid="766746044826063472">"گیره سازنده که می توان از آن برای شروع فعالیت دلخواه استفاده کرد"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"گیره سازنده که می‌توان از آن برای شروع فعالیت دلخواه استفاده کرد"</string>
 </resources>
diff --git a/tests/src/com/android/settings/tests/BluetoothRequestPermissionTest.java b/tests/src/com/android/settings/tests/BluetoothRequestPermissionTest.java
index 8064e3a..a2cdafe 100644
--- a/tests/src/com/android/settings/tests/BluetoothRequestPermissionTest.java
+++ b/tests/src/com/android/settings/tests/BluetoothRequestPermissionTest.java
@@ -36,6 +36,9 @@
     BluetoothAdapter mAdapter;
     private ArrayAdapter<String> mMsgAdapter;
 
+    // Discoverable button alternates between 20 second timeout and no timeout.
+    private boolean mDiscoveryWithTimeout = true;
+
     private class BtOnClickListener implements OnClickListener {
         final boolean mEnableOnly; // enable or enable + discoverable
 
@@ -103,7 +106,10 @@
         } else {
             addMsg("Starting activity to enable bt + discovery");
             i.setAction(BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE);
-            i.putExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION, 20);
+            // Discoverability duration toggles between 20 seconds and no timeout.
+            int timeout = (mDiscoveryWithTimeout ? 20 : 0);
+            i.putExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION, timeout);
+            mDiscoveryWithTimeout = !mDiscoveryWithTimeout;
         }
         startActivityForResult(i, 1);
     }