diff --git a/Android.mk b/Android.mk
index 9c9a23a..fe8ed2d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,7 +2,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_JAVA_LIBRARIES := bouncycastle telephony-common
-LOCAL_STATIC_JAVA_LIBRARIES := guava android-support-v4
+LOCAL_STATIC_JAVA_LIBRARIES := guava android-support-v4 jsr305
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cf1f888..f2e51a1 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" />
@@ -55,13 +56,19 @@
     <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" />
 
     <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:hardwareAccelerated="true"
+            android:supportsRtl="true">
 
         <!-- Settings -->
 
@@ -93,6 +100,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 +121,10 @@
         <!-- Top-level settings -->
 
         <activity android:name="Settings$WifiSettingsActivity"
+                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 +140,11 @@
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name=".wifi.WifiSettings"
+                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 +152,8 @@
         </activity-alias>
 
         <activity android:name=".wifi.WifiPickerActivity"
-                android:parentActivityName="Settings"
-                android:clearTaskOnLaunch="true">
+                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" />
@@ -173,9 +181,9 @@
                   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 +203,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 +214,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"/>
@@ -243,8 +253,7 @@
 
         <activity android:name="ApnSettings" android:label="@string/apn_settings"
                   android:configChanges="orientation|keyboardHidden|screenSize"
-                  android:launchMode="singleTask"
-                  android:parentActivityName="Settings$WirelessSettingsActivity">
+                  android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.APN_SETTINGS" />
@@ -255,8 +264,8 @@
 
         <activity android:name="Settings$BluetoothSettingsActivity"
                 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" />
@@ -285,8 +294,7 @@
         <activity android:name=".bluetooth.DevicePickerActivity"
                 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 +303,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 +338,7 @@
         </activity-alias>
 
         <activity android:name="Settings$WifiP2pSettingsActivity"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$WifiSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -350,8 +358,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 +379,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 +405,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 +421,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 +462,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" />
@@ -489,7 +499,7 @@
 
         <activity android:name="Settings$UserDictionarySettingsActivity"
                 android:label="@string/user_dict_settings_titlebar"
-                android:clearTaskOnLaunch="true"
+                android:taskAffinity="com.android.settings"
                 android:uiOptions="none"
                 android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
             <intent-filter>
@@ -525,7 +535,6 @@
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="UserDictionarySettings"
                 android:label="@string/user_dict_settings_titlebar"
-                android:clearTaskOnLaunch="true"
                 android:exported="true"
                 android:targetActivity="Settings$UserDictionarySettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -540,8 +549,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 +568,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 +578,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 +597,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 +605,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,8 +643,8 @@
 
         <activity android:name="Settings$ManageApplicationsActivity"
                 android:label="@string/applications_settings"
-                android:clearTaskOnLaunch="true"
-                android:parentActivityName="Settings"
+                android:taskAffinity=""
+                android:excludeFromRecents="true"
                 android:uiOptions="none">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -686,7 +664,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 +675,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 +683,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"
@@ -720,7 +695,6 @@
              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 +709,7 @@
         <activity android:name=".applications.InstalledAppDetailsTop"
                   android:label="@string/application_info_label"
                   android:exported="true"
+                  android:taskAffinity=""
                   android:parentActivityName="Settings$ManageApplicationsActivity">
         </activity>
 
@@ -753,6 +728,7 @@
         <!-- 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 +745,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" />
@@ -786,8 +763,8 @@
         <activity android:name="Settings$LocationSettingsActivity"
                 android:label="@string/location_settings_title"
                 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.LOCATION_SOURCE_SETTINGS" />
@@ -805,7 +782,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" />
@@ -824,7 +801,6 @@
         <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 +812,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 +846,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 +866,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 +891,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 +902,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" />
@@ -945,6 +919,7 @@
 
         <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" />
@@ -986,8 +961,7 @@
         <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" />
@@ -998,6 +972,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" />
@@ -1058,7 +1033,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" />
@@ -1074,7 +1049,6 @@
 
         <!-- 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 +1063,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 +1083,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">
@@ -1216,7 +1189,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 +1200,18 @@
                 android:value="com.android.settings.nfc.AndroidBeam" />
         </activity>
 
-
+        <activity android:name="Settings$WifiDisplaySettingsActivity"
+                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 +1231,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 +1242,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 +1315,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" />
@@ -1340,7 +1339,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,6 +1366,7 @@
 
         <activity android:name="Settings$AccountSyncSettingsActivity"
             android:label="@string/account_sync_settings_title"
+            android:taskAffinity=""
             android:parentActivityName="Settings"
             android:uiOptions="none">
             <intent-filter>
@@ -1393,6 +1394,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" />
@@ -1449,7 +1451,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" />
@@ -1463,7 +1466,7 @@
 
         <receiver android:name=".widget.SettingsAppWidgetProvider"
                 android:label="@string/gadget_title"
-                android:exported="false"
+                android:exported="true"
                 android:enabled="@bool/has_powercontrol_widget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -1478,5 +1481,18 @@
             <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>
+
     </application>
 </manifest>
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..0da4a1d
--- /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_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_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-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..9a5001b
--- /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_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_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-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..3160e85
--- /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_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_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/appwidget_item_bg.xml b/res/drawable/appwidget_item_bg.xml
new file mode 100644
index 0000000..b9de6d4
--- /dev/null
+++ b/res/drawable/appwidget_item_bg.xml
@@ -0,0 +1,23 @@
+<?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.
+-->
+
+<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/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_tutorial.xml b/res/layout-land/choose_lock_pattern_tutorial.xml
index ac693cc..362853b 100644
--- a/res/layout-land/choose_lock_pattern_tutorial.xml
+++ b/res/layout-land/choose_lock_pattern_tutorial.xml
@@ -40,7 +40,7 @@
             android:layout_width="0dip"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:layout_marginLeft="25dip">
+            android:layout_marginStart="25dip">
 
             <LinearLayout
                 android:layout_width="match_parent"
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/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..506570d 100644
--- a/res/layout-sw600dp-land/choose_lock_pattern.xml
+++ b/res/layout-sw600dp-land/choose_lock_pattern.xml
@@ -49,15 +49,15 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/headerText"
             android:layout_marginTop="16dip"
-            android:layout_toRightOf="@id/lockPattern"
-            android:layout_marginLeft="100dip"
+            android:layout_toEndOf="@id/lockPattern"
+            android:layout_marginStart="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_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:orientation="horizontal">
 
@@ -79,7 +79,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:layout_marginTop="20dip"
-            android:layout_marginLeft="20dip"
+            android:layout_marginStart="20dip"
             android:layout_above="@id/buttonContainer"
             android:gravity="center_vertical|center_horizontal">
 
diff --git a/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml b/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml
index 1320ba0..00ef039 100644
--- a/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml
+++ b/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml
@@ -46,7 +46,7 @@
         <!-- navigation buttons -->
         <LinearLayout android:id="@+id/buttonContainer"
             style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:orientation="horizontal">
 
@@ -68,7 +68,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:layout_marginTop="20dip"
-            android:layout_marginLeft="20dip"
+            android:layout_marginStart="20dip"
             android:gravity="center_vertical|center_horizontal"
             android:layout_above="@id/buttonContainer">
 
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..627ff02 100644
--- a/res/layout-sw600dp-land/confirm_lock_pattern.xml
+++ b/res/layout-sw600dp-land/confirm_lock_pattern.xml
@@ -45,7 +45,7 @@
         <!-- confirm / restart buttons -->
         <LinearLayout android:id="@+id/buttonContainer"
             style="@style/SecurityPreferenceButtonContainer"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:orientation="horizontal"
             android:visibility="invisible">
@@ -76,7 +76,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:layout_marginTop="20dip"
-            android:layout_marginLeft="20dip"
+            android:layout_marginStart="20dip"
             android:layout_above="@id/footerText"
             android:gravity="center_vertical|center_horizontal">
 
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..b0efa8c 100644
--- a/res/layout-sw600dp/choose_lock_pattern.xml
+++ b/res/layout-sw600dp/choose_lock_pattern.xml
@@ -62,7 +62,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
index 2a61666..e0221bf 100644
--- a/res/layout-sw600dp/choose_lock_pattern_tutorial.xml
+++ b/res/layout-sw600dp/choose_lock_pattern_tutorial.xml
@@ -54,7 +54,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/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/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..f591f38 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"
+        android:paddingStart="@*android:dimen/preference_fragment_padding_side"
+        android:paddingEnd="@*android:dimen/preference_fragment_padding_side"
         style="?android:attr/tabWidgetStyle" />
 
 </HorizontalScrollView>
diff --git a/res/layout/account_sync_screen.xml b/res/layout/account_sync_screen.xml
index 117b58a..aa080cf 100644
--- a/res/layout/account_sync_screen.xml
+++ b/res/layout/account_sync_screen.xml
@@ -84,8 +84,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..76c9c3d 100644
--- a/res/layout/apn_preference_layout.xml
+++ b/res/layout/apn_preference_layout.xml
@@ -25,8 +25,8 @@
         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_marginStart="16sp"
+        android:layout_marginEnd="6sp"
         android:layout_marginTop="6sp"
         android:layout_marginBottom="6sp"
         android:layout_weight="1"
@@ -46,7 +46,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" />
 
@@ -57,8 +57,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="4dip"
+        android:layout_marginEnd="4dip"
         android:layout_gravity="center_vertical"
         android:clickable="true" />
 
diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml
index eee6165..b5e6db7 100644
--- a/res/layout/app_percentage_item.xml
+++ b/res/layout/app_percentage_item.xml
@@ -18,8 +18,8 @@
     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">
@@ -29,7 +29,7 @@
         android:layout_width="48dip"
         android:layout_height="48dip"
         android:layout_rowSpan="3"
-        android:layout_marginRight="8dip"
+        android:layout_marginEnd="8dip"
         android:scaleType="centerInside"
         android:contentDescription="@null" />
 
@@ -39,11 +39,12 @@
         android:layout_gravity="fill_horizontal"
         android:singleLine="true"
         android:ellipsize="marquee"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textDirection="locale" />
 
     <TextView
         android:id="@android:id/text1"
-        android:layout_marginLeft="8dip"
+        android:layout_marginStart="8dip"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
     <ProgressBar
diff --git a/res/layout/bluetooth_connection_access.xml b/res/layout/bluetooth_connection_access.xml
index 1e74162..7f42177 100644
--- a/res/layout/bluetooth_connection_access.xml
+++ b/res/layout/bluetooth_connection_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
index fb65453..b3ddbb9 100644
--- a/res/layout/bluetooth_discoverable.xml
+++ b/res/layout/bluetooth_discoverable.xml
@@ -26,8 +26,8 @@
         android:id="@+id/message"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="20dip"
-        android:paddingRight="20dip"
+        android:paddingStart="20dip"
+        android:paddingEnd="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
index 24f0df2..01218d6 100644
--- a/res/layout/bluetooth_pb_access.xml
+++ b/res/layout/bluetooth_pb_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" />
 
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/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
index 742cef8..8514550 100644
--- a/res/layout/choose_lock_pattern_tutorial.xml
+++ b/res/layout/choose_lock_pattern_tutorial.xml
@@ -56,7 +56,7 @@
                  android:layout_width="200dip"
                  android:layout_height="200dip"
                  android:layout_marginTop="10dip"
-                 android:layout_gravity="left"/>
+                 android:layout_gravity="start"/>
 
         </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/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..a2f81c6
--- /dev/null
+++ b/res/layout/dream_info_row.xml
@@ -0,0 +1,100 @@
+<!--
+     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: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:textDirection="locale"
+            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/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/installed_app_details.xml b/res/layout/installed_app_details.xml
index d69f98a..7829596 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -24,7 +24,7 @@
         android:id="@+id/all_details"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingRight="6dip"
+        android:paddingEnd="6dip"
         android:paddingBottom="5dip"
         android:orientation="vertical">
 
@@ -34,8 +34,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:orientation="vertical"
-            android:paddingRight="6dip"
-            android:paddingLeft="6dip"
+            android:paddingEnd="6dip"
+            android:paddingStart="6dip"
             android:paddingTop="5dip"
             android:paddingBottom="5dip" >
 
@@ -49,12 +49,17 @@
                 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_marginStart="12dip"
+                android:layout_gravity="start"
                 android:text="@string/app_notifications_switch_label" />
 
         </LinearLayout>
@@ -67,7 +72,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="6dip"
+            android:paddingStart="6dip"
             android:orientation="vertical">
             <LinearLayout
                 android:layout_width="match_parent"
@@ -83,7 +88,7 @@
                     android:layout_width="wrap_content"
                     android:maxLines="1"
                     android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
+                    android:paddingStart="6dip"/>
 
                 <ImageView
                     android:id="@+id/info_size_dots"
@@ -92,15 +97,15 @@
                     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:paddingEnd="6dip"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
@@ -121,7 +126,7 @@
                     android:layout_width="wrap_content"
                     android:maxLines="1"
                     android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
+                    android:paddingStart="6dip"/>
                 <ImageView
                     android:id="@+id/info_size_dots"
                     android:src="@drawable/dotted_line_480px"
@@ -129,8 +134,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,7 +143,7 @@
                     android:id="@+id/application_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
+                    android:paddingEnd="6dip"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
@@ -159,7 +164,7 @@
                     android:layout_width="wrap_content"
                     android:maxLines="1"
                     android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
+                    android:paddingStart="6dip"/>
                 <ImageView
                     android:id="@+id/info_size_dots"
                     android:src="@drawable/dotted_line_480px"
@@ -167,8 +172,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,7 +181,7 @@
                     android:id="@+id/external_code_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
+                    android:paddingEnd="6dip"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
@@ -198,7 +203,7 @@
                     android:layout_width="wrap_content"
                     android:maxLines="1"
                     android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
+                    android:paddingStart="6dip"/>
                 <ImageView
                     android:id="@+id/info_size_dots"
                     android:src="@drawable/dotted_line_480px"
@@ -206,8 +211,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,7 +220,7 @@
                     android:id="@+id/data_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
+                    android:paddingEnd="6dip"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
@@ -236,7 +241,7 @@
                     android:layout_width="wrap_content"
                     android:maxLines="1"
                     android:paddingTop="6dip"
-                    android:paddingLeft="6dip"/>
+                    android:paddingStart="6dip"/>
                 <ImageView
                     android:id="@+id/info_size_dots"
                     android:src="@drawable/dotted_line_480px"
@@ -244,8 +249,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,7 +258,7 @@
                     android:id="@+id/external_data_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
+                    android:paddingEnd="6dip"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:maxLines="1" />
@@ -293,15 +298,15 @@
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
                     android:gravity="center_vertical"
-                    android:paddingLeft="6dip"/>
+                    android:paddingStart="6dip"/>
                 <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,14 +314,14 @@
                     android:id="@+id/cache_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:paddingTop="6dip"
-                    android:paddingRight="6dip"
+                    android:paddingEnd="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"
+                android:layout_alignParentEnd="true"
                 android:layout_below="@id/cache_size"
                 android:layout_centerHorizontal="true"
                 android:layout_width="200dip"
@@ -336,14 +341,14 @@
             android:layout_gravity="center_vertical">
             <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" />
+                android:paddingEnd="6dip"
+                android:paddingStart="6dip" />
             <Button android:id="@+id/clear_activities_button"
-                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
                 android:layout_below="@id/auto_launch"
                 android:layout_centerHorizontal="true"
                 android:layout_width="200dip"
@@ -362,24 +367,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:paddingEnd="6dip"
+                android:paddingStart="6dip"
                 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,11 +398,35 @@
                 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:paddingStart="6dip"
+                android:paddingBottom="6dip"
+                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:paddingStart="6dip"
                 android:paddingBottom="6dip"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
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/manage_applications_apps.xml b/res/layout/manage_applications_apps.xml
index 51ab412..394382e 100644
--- a/res/layout/manage_applications_apps.xml
+++ b/res/layout/manage_applications_apps.xml
@@ -47,11 +47,11 @@
                 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:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
+                android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side">
             <TextView android:id="@+id/usedStorageText"
                 android:layout_width="0px"
                 android:layout_height="wrap_content"
@@ -72,11 +72,11 @@
                 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"
-                android:gravity="right"
+                android:gravity="end"
                 android:textAppearance="?android:attr/textAppearanceSmallInverse"
                 android:textColor="#000"
                 android:singleLine="true" />
@@ -87,8 +87,8 @@
             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:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
+            android:layout_marginEnd="@*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..9e415a9 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,9 @@
                 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:paddingLeft="@dimen/pager_tabs_padding"
+                android:paddingRight="@dimen/pager_tabs_padding">
         </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..3c7944e 100755
--- a/res/layout/manage_applications_item.xml
+++ b/res/layout/manage_applications_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:paddingTop="5dip"
     android:paddingBottom="5dip"
     android:gravity="center_vertical" >
@@ -31,7 +31,7 @@
     <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_marginEnd="11dip"
         android:layout_gravity="center_vertical"
         android:scaleType="fitCenter"
         android:contentDescription="@null"/>
@@ -56,14 +56,14 @@
             android:baselineAlignedChildIndex="0" >
             <TextView android:id="@+id/app_size"
                 android:layout_marginTop="-4dip"
-                android:layout_gravity="center_vertical|left"
+                android:layout_gravity="center_vertical|start"
                 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_gravity="center_vertical|end"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
@@ -76,7 +76,7 @@
     <CheckBox android:id="@+id/app_on_sdcard"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
+        android:layout_marginStart="5dip"
         android:layout_gravity="center_vertical"
         android:visibility="gone"
         android:clickable="false"
diff --git a/res/layout/manage_applications_running.xml b/res/layout/manage_applications_running.xml
index 634de1c..0bc69fb 100644
--- a/res/layout/manage_applications_running.xml
+++ b/res/layout/manage_applications_running.xml
@@ -27,8 +27,8 @@
             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:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
+            android:layout_marginEnd="@*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/ownerinfo.xml b/res/layout/ownerinfo.xml
index 1001a21..d33f156 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" >
 
@@ -55,7 +55,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..fb8c705 100644
--- a/res/layout/power_usage_detail_item_text.xml
+++ b/res/layout/power_usage_detail_item_text.xml
@@ -26,19 +26,19 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textStyle="bold"
         android:singleLine="true"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_marginBottom="4dip"
         android:layout_marginTop="4dip"
-        android:layout_marginLeft="4dip" />
+        android:layout_marginStart="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..001ffec 100644
--- a/res/layout/power_usage_details.xml
+++ b/res/layout/power_usage_details.xml
@@ -47,7 +47,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 +80,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_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/layout/preference_dialog_brightness.xml b/res/layout/preference_dialog_brightness.xml
index 82c6f28..b3d62cb 100644
--- a/res/layout/preference_dialog_brightness.xml
+++ b/res/layout/preference_dialog_brightness.xml
@@ -40,8 +40,8 @@
                 android:text="@string/automatic_brightness"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:layout_marginTop="6dip"
-                android:layout_marginLeft="20dip"
-                android:layout_marginRight="20dip" />
+                android:layout_marginStart="20dip"
+                android:layout_marginEnd="20dip" />
 
         <SeekBar android:id="@*android:id/seekbar"
                 android:layout_width="match_parent"
diff --git a/res/layout/preference_dialog_ringervolume.xml b/res/layout/preference_dialog_ringervolume.xml
index a92f0ef..1643cab 100644
--- a/res/layout/preference_dialog_ringervolume.xml
+++ b/res/layout/preference_dialog_ringervolume.xml
@@ -44,8 +44,8 @@
                 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"
             />
 
@@ -53,7 +53,7 @@
         <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="8dip"
+                android:paddingStart="8dip"
                 android:orientation="horizontal"
                 android:gravity="center_vertical">
 
@@ -70,7 +70,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>
 
         <!-- Used for the ringer/notification volume -->
@@ -86,15 +86,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 +111,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 +129,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,7 +154,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>
@@ -164,8 +164,8 @@
                 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_alarm_description"
             />
 
@@ -173,7 +173,7 @@
         <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="8dip"
+                android:paddingStart="8dip"
                 android:orientation="horizontal"
                 android:gravity="center_vertical">
 
@@ -188,7 +188,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>
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_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_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
index e6188dc..5efc028 100644
--- a/res/layout/preference_powergauge.xml
+++ b/res/layout/preference_powergauge.xml
@@ -19,21 +19,21 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingLeft="16dip"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingStart="16dip"
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <ImageView
         android:id="@+id/appIcon"
         android:layout_width="48dip"
         android:layout_height="wrap_content"
-        android:layout_marginRight="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_marginRight="8dip"
+        android:layout_marginEnd="8dip"
         android:layout_marginTop="2dip"
         android:layout_marginBottom="6dip"
         android:layout_weight="1">
@@ -43,9 +43,9 @@
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:layout_marginTop="2dip"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:layout_alignParentTop="true"
-            android:layout_toLeftOf="@+id/percent"
+            android:layout_toStartOf="@+id/percent"
             android:ellipsize="marquee"
             android:textAppearance="?android:attr/textAppearanceMedium"/>
 
@@ -53,7 +53,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignBottom="@android:id/title"
             android:layout_gravity="bottom"
             android:textAppearance="?android:attr/textAppearanceSmall"
@@ -72,7 +72,7 @@
         <TextView android:id="@+android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignLeft="@id/appGauge"
+            android:layout_alignStart="@id/appGauge"
             android:layout_below="@id/appGauge"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:maxLines="2" />
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/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..68355ba
--- /dev/null
+++ b/res/layout/preference_user_delete_widget.xml
@@ -0,0 +1,39 @@
+<?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: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="15dip"
+        android:paddingEnd="?android:attr/scrollbarSize"
+        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_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/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..8888a98 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" />
@@ -233,7 +240,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 +248,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..5827557
--- /dev/null
+++ b/res/layout/regulatory_info.xml
@@ -0,0 +1,26 @@
+<?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="wrap_content"
+    android:layout_height="wrap_content">
+    <ImageView
+        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..7cc2d8d 100644
--- a/res/layout/running_processes_item.xml
+++ b/res/layout/running_processes_item.xml
@@ -29,14 +29,14 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:orientation="horizontal"
-        android:paddingRight="6dip"
-        android:paddingLeft="6dip"
+        android:paddingEnd="6dip"
+        android:paddingStart="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_marginEnd="11dip"
             android:layout_gravity="center_vertical"
             android:scaleType="fitCenter"
             android:contentDescription="@null" />
@@ -54,14 +54,14 @@
                     android:layout_width="0px"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:paddingRight="4dip"
+                    android:paddingEnd="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_gravity="center_vertical|end"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="0"
@@ -74,16 +74,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                 <TextView android:id="@+id/description"
-                    android:layout_gravity="center_vertical|left"
+                    android:layout_gravity="center_vertical|start"
                     android:layout_width="0px"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:paddingRight="4dip"
+                    android:paddingEnd="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_gravity="center_vertical|end"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="0"
diff --git a/res/layout/running_processes_view.xml b/res/layout/running_processes_view.xml
index e23de16..b5fb810 100644
--- a/res/layout/running_processes_view.xml
+++ b/res/layout/running_processes_view.xml
@@ -26,8 +26,8 @@
         <ListView android:id="@android:id/list"
                 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:paddingStart="@*android:dimen/preference_fragment_padding_side"
+                android:paddingEnd="@*android:dimen/preference_fragment_padding_side"
                 android:drawSelectorOnTop="false"
                 android:scrollbarStyle="outsideOverlay"
                 android:fastScrollEnabled="true" />
@@ -47,17 +47,17 @@
             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:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
+            android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side">
         <TextView android:id="@+id/foregroundText"
             android:layout_width="0px"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:focusable="true"
-            android:gravity="left|bottom"
+            android:gravity="start|bottom"
             android:textAppearance="?android:attr/textAppearanceSmallInverse"
             android:textColor="#000"
             android:singleLine="true" />
@@ -74,12 +74,12 @@
             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"
             android:focusable="true"
-            android:gravity="right|bottom"
+            android:gravity="end|bottom"
             android:textAppearance="?android:attr/textAppearanceSmallInverse"
             android:textColor="#000"
             android:singleLine="true" />
diff --git a/res/layout/running_service_details_process.xml b/res/layout/running_service_details_process.xml
index d12b486..caf5664 100644
--- a/res/layout/running_service_details_process.xml
+++ b/res/layout/running_service_details_process.xml
@@ -31,7 +31,7 @@
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        android:paddingLeft="14dip"
+        android:paddingStart="14dip"
         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..56cd971 100644
--- a/res/layout/running_service_details_service.xml
+++ b/res/layout/running_service_details_service.xml
@@ -38,7 +38,7 @@
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        android:paddingLeft="14dip"
+        android:paddingStart="14dip"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <include
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..7e917d8 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -30,7 +30,7 @@
         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"
@@ -49,12 +49,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:background="?android:attr/actionBarItemBackground"
-                android:contentDescription="@string/wifi_menu_wps_pbc" />
+                android:contentDescription="@string/wifi_menu_more_options" />
 
         </LinearLayout>
 
@@ -62,7 +62,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 +74,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 +97,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,7 +117,7 @@
             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"
@@ -121,8 +131,8 @@
                 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 +154,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 +185,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/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..1a5975a 100755
--- a/res/layout/two_buttons_panel.xml
+++ b/res/layout/two_buttons_panel.xml
@@ -24,8 +24,8 @@
         android:layout_height="wrap_content"
         android:gravity="bottom"
         android:paddingTop="4dip"
-        android:paddingLeft="2dip"
-        android:paddingRight="2dip"
+        android:paddingStart="2dip"
+        android:paddingEnd="2dip"
         android:orientation="horizontal">
         <Button
             android:id="@+id/left_button"
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..d8b8694 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,7 +42,7 @@
             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:inputType="textNoSuggestions"
@@ -62,7 +62,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 +71,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..f29c669 100644
--- a/res/layout/user_dictionary_add_word_fullscreen.xml
+++ b/res/layout/user_dictionary_add_word_fullscreen.xml
@@ -30,7 +30,7 @@
             android:layout_height="wrap_content"
             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:inputType="textNoSuggestions"
@@ -40,20 +40,20 @@
   <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:layout_marginStart="8dip"
+              android:layout_marginEnd="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:layout_gravity="start|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_marginStart="8dip"
               android:layout_marginBottom="8dip"
               android:layout_marginTop="8dip"
               android:inputType="textNoSuggestions"
@@ -62,10 +62,10 @@
               style="?android:attr/textAppearanceSmall"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:layout_gravity="left|center_vertical"
+              android:layout_gravity="start|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_marginStart="8dip"
               android:layout_marginBottom="8dip"
               android:layout_marginTop="8dip"
               android:layout_width="wrap_content"
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/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/wifi_config_ui_for_setup_wizard.xml b/res/layout/wifi_config_ui_for_setup_wizard.xml
index 1b10f90..fef10b3 100644
--- a/res/layout/wifi_config_ui_for_setup_wizard.xml
+++ b/res/layout/wifi_config_ui_for_setup_wizard.xml
@@ -68,19 +68,19 @@
                 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"
@@ -105,7 +105,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 +162,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..ff003c4 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -34,7 +34,8 @@
                       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"
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_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/menu/vpn.xml b/res/menu/vpn.xml
new file mode 100644
index 0000000..dd8f64c
--- /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="@drawable/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-xxhdpi/ic_launcher_settings.png b/res/mipmap-xxhdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..489ed6a
--- /dev/null
+++ b/res/mipmap-xxhdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 397ee9e..e46ce09 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standaardlimiet"</item>
     <item msgid="4071574792028999443">"Geen agtergrondprosesse"</item>
@@ -277,4 +290,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..290de20 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Nee"</string>
     <string name="create" msgid="3578857613172647409">"Skep"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Onbekend"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Jy het nou <xliff:g id="STEP_COUNT">%1$d</xliff:g> stappe oor voor jy \'n ontwikkelaar is."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Hierdie 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\n"Hierdie 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 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Kon nie die instelling verander nie"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi-optimalisering"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimaliseer batterygebruik wanneer Wi-Fi aan is"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Voeg netwerk by"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Skandeer"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Ander netwerk..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Nog"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Outomatiese opstelling (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Om opstelling te voltooi, moet jou tablet toegang hê tot Wi-Fi. Na opstelling kan jy wissel tussen mobiele data en Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Voer die pin <xliff:g id="NUMBER">%1$s</xliff:g> op jou Wi-Fi-roeteerder in. Die opstelling kan tot twee minute neem om te voltooi."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Tablet-opstelling kan beduidende netwerkaktiwiteit vereis."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"LET WEL: Jy kan moontlik ekstra diensverskaffer-datakoste aangaan."\n\n"Foon-opstelling kan beduidende netwerkaktiwiteit vereis."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"LET WEL: Die tablet sal nie kan verifieer dat jou sagteware op datum is nie."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"LET WEL: Die foon sal nie kan verifieer dat jou sagteware op datum is nie."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Die tablet kon nie aan hierdie Wi-Fi-netwerk koppel nie."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Die foon kon nie aan hierdie Wi-Fi-netwerk koppel nie."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Gevorderde Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi-frekwensieband"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Spesifiseer die frekwensieomvang van die bewerking"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Vergeet hierdie groep?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Wi-Fi-warmkol"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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>
@@ -716,6 +764,7 @@
     <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="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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Die program is nie op jou foon geïnstalleer nie."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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>
@@ -1077,6 +1140,8 @@
     <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_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="storageuse_settings_title" msgid="5657014373502630403">"Geheuegebruik"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Stel opsies vir programontwikkeling"</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="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="allow_mock_location" msgid="2787962564578664888">"Laat skynliggings toe"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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" "\n"Terwyl 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\n"Let 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\n"Stap 1: Druk en hou die kragknoppie totdat jy \'n geluid hoor of \'n vibrasie voel."\n\n"Stap 2: Raak en hou met twee vingers totdat jy oudiobevestiging hoor."\n\n"As 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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Verbeter webtoeganklikheid"</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_feature_state_on" msgid="2864292320042673806">"Aan"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Af"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Toegelaat"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nie toegelaat nie"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Laat toe"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <string name="gadget_title" msgid="5519037532720577836">"Kragbeheer"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Opdateer Wi-Fi-instelling"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Werk Bluetooth-instelling by"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"aan"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"af"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"skakel aan"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"skakel af"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Wys GPU-oortrekking"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Van die beste na die slegste: blou, groen, ligrooi, rooi"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Deaktiveer HW-oorleggers"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Gebruik altyd GPU vir skermsamestelling"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Aktiveer spore"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Jou mobiele dataverbinding sal gedeaktiveer word wanneer die gespesifiseerde limiet bereik word."\n\n"Aangesien datagebruik deur jou foon gemeet word en jou diensverskaffer gebruik dalk anders bereken, oorweeg dit maar om \'n konserwatiewe limiet te gebruik."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Beperk agtergronddata?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"As jy agtergrondmobieldata beperk, sal sommige programme en dienste nie werk nie, tensy jy gekoppel is aan \'n Wi-Fi-netwerk."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"As jy agtergrond mobiele data beperk, sal sommige programme en dienste nie werk tensy jy aan \'n Wi-Fi-netwerk gekoppel is nie."\n\n"Hierdie instelling beïnvloed alle gebruikers op hierdie tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"As jy agtergrond mobiele data beperk, sal sommige programme en dienste nie werk tensy jy aan \'n Wi-Fi-netwerk gekoppel is nie."\n\n"Hierdie instelling beïnvloed alle gebruikers op hierdie foon."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Jy"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Ander gebruikers"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Voeg gebruiker by"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Aktief"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Nieaktief"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nie opgestel nie"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Eienaar"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Kennaam"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Voeg nuwe gebruiker by"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Jy kan hierdie toestel met ander mense deel deur bykomende gebruikers te skep. Elke gebruiker het sy eie ruimte, wat hulle met hul eie programme, muurpapier, ensovoorts, kan pasmaak. Gebruikers kan ook tabletinstellings verstel, soos Wi-Fi, wat almal affekteer."\n\n"Nadat jy \'n nuwe gebruiker geskep het, moet daardie persoon deur \'n opstelproses gaan."\n\n"Enige gebruiker kan opgedateerde programtoestemmings namens al die ander gebruikers aanvaar."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Nadat jy \'n nuwe gebruiker geskep het, moet daardie persoon deur \'n opstelproses gaan."\n\n"Enige gebruiker kan opgedateerde programtoestemmings namens al die ander gebruikers aanvaar."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Moet die gebruiker nou opgestel word?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Maak seker dat die persoon beskikbaar is om die tablet te vat en hulle area op te stel"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 00b0101..d4d49f2 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"መደበኛ ወሰኖች"</item>
     <item msgid="4071574792028999443">"ምንም የዳራ ሂደቶች የሉም"</item>
@@ -277,4 +290,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..fa36419 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"አይ"</string>
     <string name="create" msgid="3578857613172647409">"ፍጠር"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ያልታወቀ"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"አሁን ገንቢ ለመሆን <xliff:g id="STEP_COUNT">%1$d</xliff:g> ደረጃዎች ይቀርዎታል።"</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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 +305,8 @@
     <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="location_settings_title" msgid="4483843407328665068">"የአካባቢ መዳረሻ"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"ደህንነት"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"የእኔን ስፍራ፣ማያ ክፈት፣SIM ካርድ ሽንጉር፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"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_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>
@@ -509,9 +540,12 @@
     <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"ጥሩ የበይነመረብ ግንኙነት ካለው በስተቀር የገመድ አልባ አውታረ መረብን አትጠቀም"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"በምትተኛበት ወቅት WiFi እንደበራ ይሁን"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"ቅንብሮቹን ለመለወጥ ችግር ነበር።"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"የWi-Fi ማመቻቸት"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Wi-Fi ሲበራ የባትሪ አጠቃቀም ይቀነስ"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"አውታረ መረብ አክል"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"የ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_scan" msgid="1470911530412095868">"ቃኝ"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"ሌላ አውታረ መረብ…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"ተጨማሪ"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"በራስ ሰር ማወቀር (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"መዋቀሩን ለማጠናቀቅ ጡባዊዎ የWi-Fi መዳረሻ ያስፈልገዋል። ከተዋቀረ በኋላ በተንቀሳቃሽ ስልክ ውሂብ እና Wi-Fi መካከል መቀያየር ይችላሉ።"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"የላቁ አማራጮችን አሳይ"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"በ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_pin" msgid="8067502591043979939">"በገመድ አልባ ማዞሪያህ ላይ ፒን <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_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>
@@ -571,6 +606,14 @@
     <string name="wifi_save" msgid="3331121567988522826">"አስቀምጥ"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"አውታረ መረብ ማስቀመጥ አልተሳካም"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"ይቅር"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"ለማንኛውም ዝለለ"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"አትዝለል"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ማስጠንቀቂያ፦ ተጨማሪ የድምጸ ሞደም ተያያዥ ውሂብ ክፍያዎች ሊከሰትብዎ ይችላል።"\n\n"ጡባዊን ማዋቀር ጉልህ የሆነ የአውታረ መረብ እንቅስቃሴ ሊያስፈልገው ይችላል።"</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ማስጠንቀቂያ፦ ተጨማሪ የድምጸ ሞደም ተያያዥ ውሂብ ክፍያዎች ሊከሰትብዎ ይችላል።"\n\n"ስልክን ማዋቀር ጉልህ የሆነ የአውታረ መረብ እንቅስቃሴ ሊያስፈልገው ይችላል።"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ማስጠንቀቂያ፦ ጡባዊው ሶፍትዌርዎ የተዘመነ መሆኑን ሊያረጋግጥ አይችልም።"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ማስጠንቀቂያ፦ ስልኩ ሶፍትዌርዎ የተዘመነ መሆኑን ሊያረጋግጥ አይችልም።"</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"ጡባዊው ከዚህ የWi-Fi አውታረ መረብ ጋር መገናኘት አልቻለም።"</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"ስልኩ ከዚህ የWi-Fi አውታረ መረብ ጋር መገናኘት አልቻለም።"</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"የላቀ Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"ተደጋጋሚ Wi-Fi  ድግ"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"የክወና ድግግሞሽ ጊዜ ርዝመት ግለፅ"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"ግንኙነቱን ካቋረጥክ፣ ከ<xliff:g id="PEER_NAME">%1$s</xliff:g> እና <xliff:g id="PEER_COUNT">%2$s</xliff:g> ሌላ መሳሪያዎች ጋር ያለህ ግንኙነት ይቋረጣል።"</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ግብዣ ይሰረዝ?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"ከ<xliff:g id="PEER_NAME">%1$s</xliff:g> ጋር የመገናኘት ግብዣውን መሰረዝ ትፈልጋለህ?"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ይህ ቡድን ይረሳ?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">" ተጓጓዥ 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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"መተግበሪያ በስልክዎ ላይ አልተጫነም።"</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>
@@ -981,6 +1037,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,12 +1059,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>
@@ -1030,6 +1090,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"የUSB  ማከማቻ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"በSD ካርድ ላይ"</string>
     <string name="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 +1115,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 +1140,10 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"የማከማቻ ጥቅም"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"በመተግበሪያዎች ጥቅም ላይ የዋለ ማከማቻ እይ"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"አሂድ አገልግሎቶች"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"ለመተግበሪያ ግንባታ አማራጮች አዘጋጅ"</string>
     <string name="enable_adb" msgid="7982306934419797485">"የUSB አራሚ"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"USB ሲያያዝ የአርም ሁኔታ"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"የኃይል ምናሌ ሳንካ ሪፖርቶች"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"የሳንካ ሪፖርት ለመውሰድ የኃይል ምናሌ ውስጥ አማራጩን ያካትቱ"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"ነቅተህ ቆይ"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"ማያኃይል በመሙላት ላይበፍፁም አይተኛም"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
@@ -1207,6 +1276,8 @@
     <string name="adb_warning_message" msgid="7316799925425402244">"የ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>
@@ -1219,7 +1290,7 @@
     <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,14 +1305,23 @@
     <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_toggle_script_injection_preference_title" msgid="7950932054266694403">"የድር ተደራሽነት አሻሽል"</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_feature_state_on" msgid="2864292320042673806">"በርቷል"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"ጠፍቷል"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"ተፈቅዷል"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"አይፈቀድም"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"ፍቀድ"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <string name="gadget_title" msgid="5519037532720577836">"የኃይል መቆጣጠሪያ"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"የWi-Fi ቅንብር ማዘመን"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"የብሉቱዝቅንብር ማዘመን"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"በርቷል"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"ጠፍቷል"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"በማብራት ላይ"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"በማጥፋት ላይ"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1514,7 +1606,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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"የጂፒዩ አብዝቶ መሳልን አሳይ"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"ከምርጡ ወደ መጥፎው፦ ሰማያዊ፣ አረንጓዴ፣ ቀላ ያለ ቀይ፣ ቀይ"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"የHW ተደራቢዎችን አሰናክል"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"ለማያ ገጽ ማቀናበሪያ ሁልጊዜ GPU ተጠቀም"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"ፍንጮችን አንቃ"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1605,7 +1705,7 @@
     <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_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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"የተንቀሳቃሽ ስልክ ውሂብ ማገናኛ የተጠቀሰው ገደብ ላይ ሲደረስ ይሰናከላል።"\n\n"የውሂብ አጠቃቀም በስልክህ መሰረት የሚሰፈር እንደመሆኑ መጠን፣ እና ድምጸ ተያያዥ ሞደምህ ለአጠቃቀም በተለየ ሁኔታ ሊሰፍር ስለሚችል፣ ቆጠብ ያለ ገደብ መጠቀሙን ግምት ውስጥ አስገባ።"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"በስተጀርባ ውሂብ አግድ?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"የተንቀሳቃሽ ውሂብ ዳራን ከገደብከው ወደ Wi-Fi አውታረመረብ ካልተገናኘህ በቀር አንዳንድ መተግበሪያዎች እና አገልግሎቶች አይሰሩም::"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"የጀርባ ተንቀሳቃሽ ስልክ ውሂብ ከገደቡ አንዳንድ መተግበሪያዎች እና አገልግሎቶች ከWi-Fi አውታረ መረብ ጋር እስካልተገናኙ ድረስ አይሰሩም።"\n\n"ይህ ቅንብር እዚህ ጡባዊ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"የጀርባ ተንቀሳቃሽ ስልክ ውሂብ ከገደቡ አንዳንድ መተግበሪያዎች እና አገልግሎቶች ከWi-Fi አውታረ መረብ ጋር እስካልተገናኙ ድረስ አይሰሩም።"\n\n"ይህ ቅንብር እዚህ ስልክ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"እርስዎ"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"ሌሎች ተጠቃሚዎች"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ተጠቃሚ አክል"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"ገቢር"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"ቦዝኗል"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"አልተዋቀረም"</string>
+    <string name="user_owner" msgid="3879126011135546571">"ባለቤት"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"ቅጽል ስም"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"አዲሰ ተጠቃሚ አክል"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"ተጨማሪ ተጠቃሚዎችን በመፍጠር ይህን መሣሪያ ለሌሎች ሰዎች ማጋራት ይችላሉ። እያንዳንዱ ተጠቃሚ በራሱ መተግበሪያዎች፣ የግድግዳ ወረቀት፣ የመሳሰሉት ሊያበጅ የሚችለውን የራሱ ቦታ አለው። ተጠቃሚዎች እንዲሁም ሁሉም ሰው ላይ ተፅዕኖ የሚኖራቸው እንደ Wi-Fi ያሉ የጡባዊ ቅንብሮችን ማስተካከል ይችላሉ።"\n\n"አዲስ ተጠቃሚ ከፈጠሩ ያ ሰው በማዋቀር ሂደት ውስጥ ማለፍ አለበት።"\n\n"ማንኛውም ተጠቃሚ ሌሎች ተጠቃሚዎችን ወክሎ የተዘመኑ የመተግበሪያ ፍቃዶችን ሊቀበል ይችላል።"</string>
+    <string name="user_add_user_message_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_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index b8fa065..6fd3fe9 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"الحد القياسي"</item>
     <item msgid="4071574792028999443">"ليست هناك عمليات بالخلفية"</item>
@@ -277,4 +290,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..e2aa268 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"لا"</string>
     <string name="create" msgid="3578857613172647409">"إنشاء"</string>
     <string name="device_info_default" msgid="7847265875578739287">"غير معروف"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"لا يفصلك الآن عن الوصول إلى مرحلة مطوري البرامج سوى <xliff:g id="STEP_COUNT">%1$d</xliff:g> من الخطوات."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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 +305,8 @@
     <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="location_settings_title" msgid="4483843407328665068">"الدخول إلى الموقع"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"الأمان"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"تعيين موقعي، إلغاء تأمين الشاشة، تأمين بطاقة SIM، تأمين تخزين الاعتماد"</string>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"تم تعطيل وحدة العرض اللاسلكية نظرًا لإيقاف تشغيل شبكة 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_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>
@@ -491,11 +522,11 @@
     <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_title" msgid="874495178395350104">"لاسلكي"</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" msgid="1277428034634973011">"لاسلكي"</string>
     <string name="wifi_settings_category" msgid="2810363951104753710">"إعدادات Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="4351120897298124250">"لاسلكي"</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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"حدثت مشكلة أثناء تغيير الإعدادات"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"تحسين Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"تقليل استخدام البطارية إلى الحد الأدنى عند تشغيل Wi-Fi"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"إضافة شبكة"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"شبكات 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_scan" msgid="1470911530412095868">"فحص"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"شبكة أخرى..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"المزيد"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"الإعداد التلقائي (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"لإكمال الإعداد، يحتاج جهازك اللوحي إلى إمكانية الدخول إلى Wi-Fi. وبعد الإعداد، ستتمكن من التبديل بين بيانات الجوال وWi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"عرض الخيارات المتقدمة"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"إعداد 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_pin" msgid="8067502591043979939">"أدخل رقم التعريف الشخصي <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_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>
@@ -571,6 +606,14 @@
     <string name="wifi_save" msgid="3331121567988522826">"حفظ"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"أخفق حفظ الشبكة"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"إلغاء"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"تخطي على أية حال"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"عدم التخطي"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"تحذير: ربما يُحصّل مشغل شبكة الجوال رسومًا إضافية منك."\n\n"قد يحتاج إعداد الجهاز اللوحي إلى نشاط كبير بالشبكة."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"تحذير: ربما يحصّل مشغل شبكة الجوال رسومًا إضافية منك."\n\n"قد يحتاج إعداد الهاتف إلى نشاط كبير بالشبكة."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"تحذير: لن يتمكن الجهاز اللوحي من التحقق من أن البرنامج محدث."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"تحذير: لن يتمكن الهاتف من التحقق من أن البرنامج محدث."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"لم يتمكن الجهاز اللوحي من الاتصال بشبكة Wi-Fi هذه."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"لم يتمكن الهاتف من الاتصال بشبكة Wi-Fi هذه."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"إعدادات Wi-Fi المتقدمة"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"نطاق تردد Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"حدد نطاق التردد للعملية"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"في حالة قطع الاتصال، سيتم إنهاء اتصالك بـ <xliff:g id="PEER_NAME">%1$s</xliff:g> و<xliff:g id="PEER_COUNT">%2$s</xliff:g> من الأجهزة الأخرى."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"هل تريد إلغاء الدعوة؟"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"هل تريد إلغاء الدعوة للاتصال بـ <xliff:g id="PEER_NAME">%1$s</xliff:g>؟"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"حذف هذه المجموعة؟"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"نقطة اتصال 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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,14 +797,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"لم يتم تثبيت التطبيق على هاتفك."</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>
@@ -981,9 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"وحدة تخزين USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"في بطاقة SD"</string>
     <string name="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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"استخدام وحدة التخزين"</string>
@@ -1089,11 +1154,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"تعيين خيارات تطوير التطبيق"</string>
     <string name="enable_adb" msgid="7982306934419797485">"تصحيح أخطاء USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"وضع تصحيح الأخطاء عند توصيل USB"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"تقارير الخطأ في قائمة الطاقة"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"تضمين خيار في قائمة الطاقة لإنشاء تقرير الأخطاء"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"البقاء في الوضع النشط"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"لا يتم مطلقًا دخول الشاشة في وضع السكون أثناء الشحن"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"السماح بمواقع وهمية"</string>
@@ -1207,6 +1276,8 @@
     <string name="adb_warning_message" msgid="7316799925425402244">"تم تصميم تصحيح أخطاء 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>
@@ -1234,14 +1305,23 @@
     <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_toggle_script_injection_preference_title" msgid="7950932054266694403">"تحسين إمكانية الوصول إلى الويب"</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_feature_state_on" msgid="2864292320042673806">"تشغيل"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"إيقاف"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"مسموح به"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"غير مسموح به"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"السماح"</string>
@@ -1268,7 +1348,7 @@
     <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="3093545080361658269">"لاسلكي"</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) -->
@@ -1283,7 +1363,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="2382791137776486974">"لاسلكي"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"بلوتوث"</string>
     <string name="power_cell" msgid="6596471490976003056">"استعداد الخلية"</string>
     <string name="power_phone" msgid="5392641106474567277">"المكالمات الصوتية"</string>
@@ -1303,7 +1383,7 @@
     <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>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <string name="gadget_title" msgid="5519037532720577836">"التحكم في الطاقة"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"تحديث إعداد Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"تحديث إعداد البلوتوث"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"تشغيل"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"إيقاف"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"جارٍ التشغيل…"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"جارٍ إيقاف التشغيل"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"لاسلكي"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1482,7 +1574,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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"عرض استخدام GPU الزائد"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"من الأفضل إلى الأسوأ: أزرق، أخضر، أحمر فاتح، أحمر"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"تعطيل تراكبات الأجهزة"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"استخدام وحدة معالجة الرسومات دائمًا لتركيب الشاشة"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"تمكين الآثار"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1592,7 +1692,7 @@
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"تعيين حد بيانات لـ 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"تعيين حد لبيانات 2G-3G"</string>
     <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"تعيين حد بيانات لـ Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"لاسلكي"</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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"سيتم تعطيل اتصال بيانات الجوال عند الوصول إلى الحد المحدد."\n\n"نظرًا لأنه يتم حساب استخدام البيانات بواسطة الهاتف، وقد يحسب مشغل شبكة الجوال الاستخدام بشكل مختلف، يمكنك استخدام حد معتدل."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"هل تريد تقييد بيانات الخلفية؟"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"في حال تقييد بيانات الجوال للخلفية، لن تعمل بعض التطبيقات والخدمات ما لم تكن متصلاً بشبكة Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"في حالة تقييد بيانات الجوال للخلفية، لن تعمل بعض التطبيقات والخدمات ما لم تكن متصلاً بشبكة Wi-Fi."\n\n"يؤثر هذا الإعداد على جميع مستخدمي هذا الجهاز اللوحي."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"في حالة تقييد بيانات الجوال للخلفية، لن تعمل بعض التطبيقات والخدمات ما لم تكن متصلاً بشبكة Wi-Fi."\n\n"يؤثر هذا الإعداد على جميع مستخدمي هذا الهاتف."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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">"تتطلب الشبكة الظاهرية الخاصة (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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"أنت"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"مستخدمون آخرون"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"إضافة مستخدم"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"نشط"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"غير نشط"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"لم يتم الإعداد."</string>
+    <string name="user_owner" msgid="3879126011135546571">"المالك"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"اللقب"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"إضافة مستخدم جديد"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"يمكنك مشاركة هذا الجهاز مع أشخاص آخرين بإنشاء مستخدمين إضافيين. ويكون لكل مستخدم مساحته التي يمكنه تخصيصها بتطبيقاته وخلفياته وما إلى ذلك. ويمكن للمستخدمين أيضًا ضبط إعدادات الجهاز اللوحي مثل Wi-Fi  والتي تؤثر على إعدادات الجميع."\n\n"بعد إنشاء مستخدم جديد، يلزم هذا الشخص المرور بعملية الإعداد."\n\n"ويمكن لأي مستخدم قبول أذونات التطبيقات المحدثة نيابة عن جميع المستخدمين الآخرين."</string>
+    <string name="user_add_user_message_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_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index eb58bcd..b8a0de1 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартны ліміт"</item>
     <item msgid="4071574792028999443">"Няма фонавых працэсаў"</item>
@@ -277,4 +290,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..1a3bcd7 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Не"</string>
     <string name="create" msgid="3578857613172647409">"Стварыць"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Невядома"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Зараз вы ў некалькіх (<xliff:g id="STEP_COUNT">%1$d</xliff:g>) кроках ад таго, каб стаць распрацоўшчыкам."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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 +305,8 @@
     <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="location_settings_title" msgid="4483843407328665068">"Доступ да месцазнаходжання"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Бяспека"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Задаць Маё месцазнаходжанне, разблакаванне экрана, блакаванне SIM-карты, блакаванне сховішча ўліковых дадзеных"</string>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"Бесправадны дысплей адключаны, паколькі выключаны 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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Была праблема змены налад"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Аптымiзацыя Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Зменшыць выкарыстанне батарэi, калi ўключаны Wi-Fi"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Дадаць сетку"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Сеткі 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_scan" msgid="1470911530412095868">"Сканаваць"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Іншая сетка..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Дадатковая інфармацыя"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Аўтаматычная ўсталёўка (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Для завяршэння ўсталёўкі планшэта неабходны доступ да Wi-Fi. Пасля ўсталёўкі вы можаце пераключацца паміж мабільнай перадачай дадзеных і Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Паказаць дадатковыя параметры"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Абароненая ўсталёўка 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_pin" msgid="8067502591043979939">"Увядзіце 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_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>
@@ -571,6 +606,14 @@
     <string name="wifi_save" msgid="3331121567988522826">"Захаваць"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Не атрымалася захаваць сетку"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Адмяніць"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"Усё роўна прапусціць"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"Не прапускаць"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"УВАГА: ваш аператар можа патрабаваць дадатковую аплату за перадачу дадзеных."\n\n" Наладка планшэта можа запатрабаваць значнай сеткавай актыўнасці."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"УВАГА: ваш аператар можа патрабаваць дадатковую аплату за перадачу дадзеных."\n\n" Наладка тэлефона можа запатрабаваць значнай сеткавай актыўнасці."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"УВАГА: планшэт не зможа правяраць, цi абноўлена ваша праграмнае забеспячэнне."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"УВАГА: тэлефон не зможа правяраць, цi абноўлена ваша праграмнае забеспячэнне."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Планшэт не змог падключыцца да гэтай сеткі Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Тэлефон не змог падключыцца да гэтай сеткі Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Пашыраны Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Дыяпазон частот Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Удакладніць рабочы дыяпазон частот"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Iгнараваць гэту групу?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Партатыўная кропка доступу 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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Прыкладанне не ўсталявана на вашым тэлефоне."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-назапашвальнік"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На SD-карце"</string>
     <string name="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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Выкарыстанне сховішча"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Налада параметраў для распрацоўкі прыкладанняў"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Адладка USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Рэжым адладкі, калі USB падключаны"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"Справаздачы пра меню с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>
     <string name="allow_mock_location" msgid="2787962564578664888">"Дазволіць несапраўдныя месцы"</string>
@@ -1207,6 +1276,8 @@
     <string name="adb_warning_message" msgid="7316799925425402244">"Адладка USB прызначана толькі для мэтаў распрацоўкі. Яна можа выкарыстоўвацца, каб капіяваць дадзеныя паміж кампутарам і прыладай, усталёўваць прыкладанні на прыладзе без папярэдняга апавяшчэння і чытаць дадзеныя дзённ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>
@@ -1234,14 +1305,23 @@
     <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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Павышэнне даступнасці вэб-сайтаў"</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_feature_state_on" msgid="2864292320042673806">"На"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Адключана"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Дапускаецца"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Забаронена"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Дазволіць"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <string name="gadget_title" msgid="5519037532720577836">"Кіраванне сілкаваннем"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Абнаўленне налад Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Абнаўленне налад Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"укл."</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"выкл."</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"уключэнне"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"выключэнне"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Паказаць перарасход GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Ад лепшага да горшага: сіні, зялёны, светла-чырвоны, чырвоны"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Адкл. апаратн. накладання"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Заўсёды выкарыстоўваць GPU для экраннай кампаноўкі"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Уключыць сляды"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Ваша падключэнне для перадачы дадзеных "\n" будзе завершана пасля дасягнення пэўнага лiмiту."\n"{2/}Паколькi выкарыстанне дадзеных вызначаецца вашым тэлефонам i ваш аператар можа спаганяць плату iншым чынам, старайцеся прытрымлiвацца лiмiту."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Абмежаваць зыходныя дадзеныя?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Калі абмежаваць фонавую перадачу мабiльных дадзеных, некаторыя прыкладанні і службы не будуць працаваць пры падключэннi да сеткі Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Калі абмежаваць фонавую перадачу мабільных дадзеных, некаторыя прыкладанні і паслугі не будуць працаваць, калі вы падключаны да сеткi Wi-Fi сеткі."\n\n"Гэты параметр распаўсюджваецца на ўсіх карыстальнікаў гэтага планшэта."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Калі абмежаваць фонавую перадачу мабільных дадзеных, некаторыя прыкладанні і паслугі не будуць працаваць, калі вы падключаны да сеткi Wi-Fi сеткі."\n\n"Гэты параметр распаўсюджваецца на ўсіх карыстальнікаў гэтага тэлефона."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Вы"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Iншыя карыстальнікi"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Дадаць карыстальніка"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Актыўны"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Неактыўна"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не наладжана"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Уладальнік"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Псеўданім"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Дад. новага карыстальніка"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Вы можаце адкрыць доступ да гэтай прылады іншым людзям шляхам стварэння дадатковых карыстальнікаў. Кожны карыстальнік мае свой уласны раздзел, на якім ён можа наладзіць уласныя прыкладанні, шпалеры і гэтак далей. Карыстальнікі таксама могуць наладжваць параметры планшэта, напрыклад Wi-Fi, якія ўплываюць на ўсіх."\n\n"Пасля стварэння новага карыстальніка, ён павінен прайсці праз працэс усталёўкі."\n\n"Любы карыстальнік можа прымаць абноўленыя дазволы на прыкладанне ад імён усіх іншых карыстальнікаў."</string>
+    <string name="user_add_user_message_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_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 4c8cc1c..f203510 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартно ограничение"</item>
     <item msgid="4071574792028999443">"Няма процеси на заден план"</item>
@@ -277,4 +290,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..27e1921 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Не"</string>
     <string name="create" msgid="3578857613172647409">"Създаване"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Неизвестно"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Вече сте на <xliff:g id="STEP_COUNT">%1$d</xliff:g> стъпки от това, да бъдете програмист."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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 +305,8 @@
     <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="location_settings_title" msgid="4483843407328665068">"Достъп до местоположение"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Сигурност"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Задаване на Моето местоположение, отключване на екран, заключване на SIM картата и на хранилището за идентификационни данни"</string>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"Безжичният дисплей е деактивиран, защото 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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Възникна проблем при промяна на настройката"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi да се оптимизира"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Намаляване на използването на батерията, когато Wi-Fi е включен"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Добавяне на мрежа"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Сканиране"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Друга мрежа…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Още"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Авт. настройка (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"За да завърши настройката, таблетът ви се нуждае от достъп до Wi-Fi. След това можете да превключвате между мобилни данни и Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Показване на разширените опции"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Защитена настройка на 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_pin" msgid="8067502591043979939">"Въведете ПИН кода <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_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>
@@ -571,6 +606,14 @@
     <string name="wifi_save" msgid="3331121567988522826">"Запазване"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Запазването на мрежата не бе успешно"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Отказ"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"Пропускане въпреки това"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"Без пропускане"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"Предупреждение: Това може да доведе до допълнителни таксувания за данни от оператора."\n\n"Настройката на таблета може да изисква значителна активност на мрежата."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"Предупреждение: Това може да доведе до допълнителни таксувания за данни от оператора."\n\n"Настройката на телефона може да изисква значителна активност на мрежата."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ПРЕДУПРЕЖДЕНИЕ: Таблетът няма да може да потвърди, че софтуерът ви е актуален."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ПРЕДУПРЕЖДЕНИЕ: Телефонът няма да може да потвърди, че софтуерът ви е актуален."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Таблетът не можа да се свърже с тази Wi-Fi мрежа."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Телефонът не можа да се свърже с тази Wi-Fi мрежа."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Разширени настройки за Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Честотен спектър за Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Посочете обхвата от честота на работа"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Ако прекъснете връзката, ще се прекрати и установената със:  <xliff:g id="PEER_NAME">%1$s</xliff:g> и още  <xliff:g id="PEER_COUNT">%2$s</xliff:g> устройства."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Да се анулира ли поканата?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Искате ли да анулирате поканата за свързване с/ъс <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Да се забрави ли тази група?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Преносима точка за достъп през 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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Приложението не е инсталирано на телефона ви."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB хранилище"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На SD карта"</string>
     <string name="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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Употреба на хранилището"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Задаване на опции за програмиране на приложения"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Отстраняване на грешки през USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Режим за отстраняване на грешки, когато е свързано USB"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"Сигнали за програмни грешки в менюто за захранване"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Включване на опцията за получаване на сигнал за програмна грешка в менюто за захранване"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Да остане активен"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Екранът никога няма е в спящ режим при зареждане"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Разрешаване на измислени местоположения"</string>
@@ -1207,6 +1276,8 @@
     <string name="adb_warning_message" msgid="7316799925425402244">"Отстраняването на грешки през 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>
@@ -1234,14 +1305,23 @@
     <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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Достъпност в мрежата: Подобряване"</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_feature_state_on" msgid="2864292320042673806">"Вкл."</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Изкл."</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Разрешено"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Не е разрешено"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Разрешаване"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <string name="gadget_title" msgid="5519037532720577836">"Контрол на захранването"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Актуализиране на настройките за Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Актуализиране на настройките за Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"включено"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"изключено"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"включва се"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"изключва сe"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Преизчертаване от GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"От най-добро към най-лошо: синьо, зелено, светло червено, червено"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Хардуерни наслагвания: Деактив."</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Винаги да се използва GPU за изграждане на екрана"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Трасирания: Активиране"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Мобилната ви връзка за данни ще бъде деактивирана при достигане на посочения лимит."\n\n"Тъй като използването им се измерва от телефона ви, а операторът ви може да го отчита по различен начин, помислете дали да не използвате умерен лимит."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Да се ограничат ли данните на заден план?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ако ограничите мобилните данни на заден план, някои приложения и услуги няма да работят, освен ако не сте свързани с Wi-Fi мрежа."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Ако ограничите мобилните данни на заден план, някои приложения и услуги няма да работят, освен ако не сте свързани с Wi-Fi мрежа."\n\n"Настройката засяга всички потребители на този таблет."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Ако ограничите мобилните данни на заден план, някои приложения и услуги няма да работят, освен ако не сте свързани с Wi-Fi мрежа."\n\n"Настройката засяга всички потребители на този телефон."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Вие"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Други потребители"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Потребител: Добавяне"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Активен"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Неактивен"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не е настроен"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Собственик"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Псевдоним"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Добавяне на нов потребител"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Можете да споделите това устройство с други хора, като създадете допълнителни потребители. Всеки от тях има собствено работно пространство, което може да персонализира със свои собствени приложения, тапет и др. Те могат да коригират и настройки на таблета, като например Wi-Fi, които засягат всички."\n\n"След като създадете нов потребител, той трябва да премине през процеса за настройка."\n\n"Всеки потребител може да приема разрешения на актуализирани приложения от името на всички останали."</string>
+    <string name="user_add_user_message_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_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index f8366f8..f7536ba 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,13 @@
     <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="2538100882620724753">"Molt ràpida"</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">
@@ -213,7 +213,7 @@
   </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="hdcp_checking_titles">
@@ -228,34 +228,47 @@
   </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 de glGetError"</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 +290,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..04e5d81 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -20,7 +20,10 @@
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="create" msgid="3578857613172647409">"Crea"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconegut"</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"Sense fil i xarxes"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Ara ja només et queden <xliff:g id="STEP_COUNT">%1$d</xliff:g> passos per convertir-te en desenvolupador."</string>
+    <string name="show_dev_on" msgid="1110711554982716293">"Ara ja ets un desenvolupador!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"No cal, ja ets un desenvolupador."</string>
+    <string name="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 +87,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>
@@ -103,7 +108,7 @@
     <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>
@@ -190,6 +195,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,14 +265,16 @@
     <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="wireless_networks_settings_title" msgid="3643009077742794212">"Connexions sense fil i xarxes"</string>
     <string name="radio_controls_summary" msgid="2998818677094465517">"Gestiona la Wi-fi, el Bluetooth, el mode d\'avió, les xarxes mòbils i les VPN"</string>
     <string name="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\n"Aquesta 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\n"Aquesta 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>
@@ -279,11 +287,11 @@
     <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 el fus horari"</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="date_picker_title" msgid="1338210036394128512">"Data"</string>
@@ -297,6 +305,8 @@
     <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="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>
@@ -305,8 +315,8 @@
     <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_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>
@@ -337,7 +347,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 +359,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 +372,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,7 +413,7 @@
     <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="device_admin_title" msgid="3562216873644263804">"Administració de dispositius"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Administradors de dispositiu"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Mostra o desactiva els administradors del dispositiu"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
@@ -469,26 +479,47 @@
     <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="7363832031876872257">"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_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\n"Col·loca els dispositius a prop (generalment, l\'un d\'esquena a l\'altre) i, a continuació, toca la pantalla del teu dispositiu. L\'aplicació determina el contingut que es pot transferir."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Detectabilitat del servei de xarxa"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permet que les aplicacions d\'altres dispositius descobreixin les aplicacions d\'aquest"</string>
     <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-fi"</string>
@@ -505,14 +536,17 @@
     <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="2466956369738047669">"No utilitzis una xarxa Wi-Fi tret que tingui una connexió a Internet acceptable"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Usa Wi-Fi en repòs"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"S\'ha produït un problema en canviar la configuració"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimització de la Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimitza l\'ús de la bateria amb Wi-Fi activada"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Afegeix una xarxa"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_more_options" msgid="2448097861752719396">"Més opcions"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"PIN de WPS"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi directe"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Cerca"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avançat"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Una altra xarxa…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Més"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automàtica (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Per completar la configuració, la tauleta necessita accés a la Wi-Fi. En acabat, podràs canviar entre les dades mòbils i la Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Introdueix el PIN <xliff:g id="NUMBER">%1$s</xliff:g> a l\'encaminador Wi-Fi. La configuració pot trigar fins a dos minuts a completar-se."</string>
     <string name="wifi_wps_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_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>
@@ -566,11 +601,19 @@
     <string name="wifi_security_none" msgid="7985461072596594400">"Cap"</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_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\n"La configuració de la tauleta pot necessitar una gran quantitat d\'activitat de xarxa."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ADVERTIMENT: És possible que l\'operador de telefonia mòbil apliqui càrrecs addicionals."\n\n"La configuració del telèfon pot necessitar una gran quantitat d\'activitat de xarxa."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ADVERTIMENT: La tauleta no podrà verificar que el programari estigui actualitzat."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ADVERTIMENT: El telèfon no podrà verificar que el programari estigui actualitzat."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"La tauleta no ha pogut connectar amb aquesta xarxa Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"El telèfon no ha pogut connectar amb aquesta xarxa Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi avançada"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda de freqüència Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Especifica l\'interval de freqüència de funcionament"</string>
@@ -594,7 +637,8 @@
     <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,22 +646,25 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Vols oblidar aquest grup?"</string>
+    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Zona Wi-Fi portàtil"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"S\'està activant la zona Wi-Fi…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"S\'està desactivant la zona Wi-Fi…"</string>
+    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Zona Wi-Fi portàtil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activa"</string>
+    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error de zona Wi-Fi portàtil"</string>
     <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configura la zona Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"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_tether_configure_subtext" msgid="1927454307836232128">"Zona Wi-Fi portàtil de <xliff:g id="NETWORK_SSID">%1$s</xliff:g> amb seguretat <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_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_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>
@@ -625,11 +672,11 @@
     <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_ring_description" msgid="5936851631698298989">"To i notificacions"</string>
@@ -639,28 +686,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 +718,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>
@@ -714,8 +762,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>
@@ -748,14 +797,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 +821,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 +838,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>
@@ -834,10 +888,10 @@
     <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="tablet" msgid="8317211882509025841">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" de la tauleta, és a dir:"\n\n<li>"El teu compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" del teu telèfon, que inclou:"\n\n<li>"El teu compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
     <string name="master_clear_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>
@@ -871,35 +925,35 @@
     <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="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_network_based" msgid="7472814266821714527">"Ubicació de xarxa mòbil i Wi-Fi"</string>
+    <string name="location_neighborhood_level" msgid="5626515380188353712">"Permet que les aplicacions utilitzin el servei d\'ubicació de Google per calcular la teva ubicació més ràpidament. Es recopilaran dades d\'ubicació anònimes i s\'enviaran a Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Ubicació determinada per Wi-Fi"</string>
     <string name="location_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>
@@ -917,6 +971,7 @@
     <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>
@@ -958,14 +1013,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="activity_not_found" msgid="5551664692991605325">"L\'aplicació no està instal·lada al telèfon."</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>
@@ -980,7 +1036,9 @@
     <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 al telèfon o de la pèrdua de dades que puguin resultar de l\'ús de les aplicacions"</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Verifica les aplicacions"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"No donis permís per instal·lar aplicacions que puguin ser perjudicials o bé avisa abans de fer-ho"</string>
     <string name="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>
@@ -1001,6 +1059,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 +1077,20 @@
     <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_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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Ús d\'emmagatzematge"</string>
@@ -1094,6 +1159,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 +1181,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 entrada de text"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Idioma i entrada 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,7 +1194,7 @@
     <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" msgid="3001113966880559611">"Mostra les contrasenyes"</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="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>
@@ -1149,7 +1216,7 @@
     <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Diccionaris personals"</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>
@@ -1160,7 +1227,7 @@
     <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>
@@ -1197,17 +1264,21 @@
     <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="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="bugreport_in_power" msgid="4548816486587403971">"Informe d\'error al menú"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inclou l\'opció de fer un informe d\'error al menú d\'encesa"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Mantén-te activat"</string>
-    <string name="keep_screen_on_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="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla no entra mai en mode de repòs si el dispositiu està carregant-se"</string>
+    <string name="allow_mock_location" msgid="2787962564578664888">"Permet les ubicacions simulades"</string>
+    <string name="allow_mock_location_summary" msgid="317615105156345626">"Permet les ubicacions simulades"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Voleu permetre la depuració USB?"</string>
-    <string name="adb_warning_message" msgid="7316799925425402244">"La 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\'equip i el dispositiu, per instal·lar aplicacions al dispositiu sense rebre notificacions i per llegir dades de registre."</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="verify_apps_over_usb_title" msgid="4177086489869041953">"Verificació d\'aplicació per USB"</string>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Comprova les aplicacions que s\'hagin instal·lat mitjançant ADB/ADT per veure si tenen un comportament perillós."</string>
+    <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protegeix emmagatzematge USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Les aplicacions han de sol·licitar permís per llegir l\'emmagatz. USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vols protegir l\'emmagatz. USB?"</string>
     <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Si l\'emmagatzematge USB està protegit, les aplicacions han de sol·licitar permís per llegir les dades de l\'emmagatzematge extern."\n\n"És possible que algunes aplicacions no funcionin fins que els desenvolupadors no les actualitzin."</string>
@@ -1234,14 +1305,23 @@
     <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\n"Quan 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\n"Nota: 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\n"Pas 1: mantén premut el botó d\'engegada fins que sentis un so o notis una vibració."\n\n"Pas 2: mantén premut amb dos dits fins que sentis una confirmació d\'àudio."\n\n"Si 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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Millora l\'accessibilitat web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configuració"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Activat"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Desactivat"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activada"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desactivada"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Permeses"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"No es permet"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Permet"</string>
@@ -1254,7 +1334,7 @@
     <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_script_injection_security_warning_summary" msgid="7706858873495386310">"Vols que les aplicacions instal·lin scripts de Google per millorar l\'accessibilitat del seu contingut?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No s\'ha proporcionat cap descripció."</string>
     <string name="settings_button" msgid="3006713718908152930">"Configuració"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
@@ -1263,7 +1343,7 @@
     <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>
@@ -1280,18 +1360,18 @@
     <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_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_phone" product="tablet" msgid="262638572890253393">"Tauleta"</string>
@@ -1300,7 +1380,7 @@
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Dades rebudes"</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>
@@ -1324,11 +1404,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>
@@ -1351,7 +1432,7 @@
     <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_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>
@@ -1380,15 +1461,29 @@
     <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_bluetooth" msgid="7538903239807020826">"S\'està actualitzant la configuració de Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"activat"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"desactivat"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"s\'està activant..."</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"s\'està desactivant…"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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" msgid="3239382277144980418">"Esborra els certificats"</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="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="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>
@@ -1406,28 +1501,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">"Còpia de seguretat de les dades"</string>
+    <string name="backup_data_summary" msgid="9157861529438245957">"Fes una còpia de seguretat als servidors de Google de dades d\'aplicacions, contrasenyes Wi-Fi i altres opcions de configuració"</string>
     <string name="backup_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 de seguretat d\'ordinador"</string>
+    <string name="local_backup_password_summary_none" msgid="393503434408227110">"Actualment les còpies de seguretat d\'ordinador completes no estan protegides"</string>
+    <string name="local_backup_password_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="7218566008912418809">"Vols deixar de fer còpies de seguretat de les contrasenyes de Wi-Fi, de les adreces d\'interès, d\'altres opcions i dades d\'aplicacions i, a més, esborrar totes les còpies dels servidors de Google?"</string>
+    <string name="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,7 +1532,7 @@
     <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>
@@ -1455,7 +1547,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,7 +1559,7 @@
     <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="595556546597351489">"No pots configurar una connexió Wi-Fi EAP durant la configuració. Després, pots dur a terme aquesta acció a Configuració &gt; Connexions sense fil i xarxes."</string>
     <string name="wifi_setup_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="accessibility_sync_enabled" msgid="558480439730263116">"Sincronització activada"</string>
@@ -1489,7 +1581,7 @@
     <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,19 +1589,19 @@
     <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>" "\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="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 />
@@ -1521,57 +1613,65 @@
     <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_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_summary" msgid="142834318897332338">"Centellejar 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="show_touches_summary" msgid="6684407913145150041">"Mostra la ubicació dels tocs a la pantalla"</string>
+    <string name="show_screen_updates" msgid="5470814345876056420">"Mostra canvis de superfície"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Actualitza superfícies de finestres en actualitzar-se"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Mostra actualitzacions de GPU"</string>
+    <string name="show_hw_screen_updates_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="show_hw_overdraw" msgid="1136884304711318251">"Mostra superació de GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"De millor a pitjor: blau, verd, vermell clar, vermell"</string>
+    <string name="disable_overlays" msgid="2074488440505934665">"Desactiva superposicions HW"</string>
+    <string name="disable_overlays_summary" msgid="3578941133710758592">"Usa sempre GPU per combinar pantalles"</string>
+    <string name="enable_traces_title" msgid="7448835465859512430">"Activa seguiments"</string>
+    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Selecciona seguiments activats"</string>
+    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Actualment no hi ha seguiments activats"</string>
     <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> traces activades actualment"</string>
     <string name="enable_traces_summary_all" msgid="3950139649125158247">"Totes les traces activades actualment"</string>
-    <string name="debug_layout" msgid="5981361776594526155">"Mostra límits de format"</string>
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Activa traces 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="show_cpu_usage_summary" msgid="2113341923988958266">"Superposa l\'ús de la CPU a la pantalla"</string>
+    <string name="force_hw_ui" msgid="6426383462520888732">"Força acceleració GPU"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Força l\'ús de GPU per a dibuixos en 2D"</string>
+    <string name="force_msaa" msgid="7920323238677284387">"Força MSAA de 4x"</string>
+    <string name="force_msaa_summary" msgid="9123553203895817537">"Activa MSAA de 4x a les aplicacions OpenGL ES 2.0"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Representació GPU perfil"</string>
+    <string name="track_frame_time_summary" msgid="447577515813970287">"Mesura temps representació a adb shell dumpsys gfxinfo"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Escala d\'animació finestra"</string>
+    <string name="transition_animation_scale_title" msgid="387527540523595875">"Escala d\'animació transició"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Escala durada d\'animació"</string>
+    <string name="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">"Mostra 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="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>
@@ -1585,7 +1685,7 @@
     <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>
@@ -1606,12 +1706,12 @@
     <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_title" msgid="1613108390242737923">"Vols restringir les dades de referència?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Aquesta funció pot provocar que una aplicació que depengui de les dades de fons deixi de funcionar quan hi hagi només xarxes mòbils disponibles."\n\n"Pots trobar més controls d\'ús de dades adequats a la configuració disponible a l\'aplicació."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Només pots restringir les dades de referència si has establert un límit de dades mòbils."</string>
-    <string name="data_usage_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_auto_sync_on_dialog_title" msgid="2438617846762244389">"Activar sincronització automàtica?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Els canvis que facis als teus comptes al web es reflectiran automàticament a la tauleta."\n\n"Alguns comptes com ara els comptes de Google també reflectiran al web els canvis que facis a la tauleta."\n\n"Per triar els tipus d\'informació que vols que se sincronitzi en cada compte, vés a Configuració &gt; Comptes."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Els canvis que facis als teus comptes al web es reflectiran automàticament al telèfon."\n\n"Alguns comptes, com ara els comptes de Google, també reflectiran al web els canvis que hagis fet al telèfon."\n\n"Per triar els tipus d\'informació que vols que se sincronitzi en cada compte, vés a Configuració &gt; Comptes."</string>
     <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>
@@ -1622,17 +1722,20 @@
     <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_restrict_background_title" msgid="2201315502223035062">"Vols restringir les dades de referència?"</string>
+    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Si restringeixes les dades mòbils de referència, algunes aplicacions i serveis no funcionaran sense connexió a una xarxa Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Si restringeixes les dades mòbils de referència, algunes aplicacions i serveis no funcionaran sense connexió a una xarxa Wi-Fi."\n\n"Aquesta configuració afecta tots els usuaris de la tauleta."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Si restringeixes les dades mòbils en segon pla, determinats serveis i aplicacions no funcionaran tret que estiguis connectat a una xarxa Wi-Fi."\n\n"Aquesta configuració afecta tots els usuaris del telèfon."</string>
     <string name="data_usage_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="2446827764036316131">"Selecciona les xarxes Wi-Fi que siguin zones de connexió mòbil. Es pot impedir que les aplicacions utilitzin aquestes xarxes quan s\'executin en segon pla. A més, les aplicacions poden mostrar un avís abans d\'utilitzar aquestes xarxes per baixar fitxers grans."</string>
     <string name="data_usage_metered_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>
@@ -1648,7 +1751,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 +1770,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>
@@ -1685,24 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Tu"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Altres usuaris"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Afegeix un usuari"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Actiu"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Inactiu"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"No s\'ha configurat"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Propietari"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Àlies"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Afegir un usuari nou"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Pots crear més usuaris per compartir aquest dispositiu amb altres persones. Cada usuari té el seu propi espai, que podrà personalitzar amb les seves pròpies aplicacions i els seus propis fons de pantalla. Els usuaris també podran ajustar les opcions de configuració de la tauleta, com ara la Wi-Fi, que afecten tots els usuaris."\n\n"Després de crear un usuari nou, aquest ha de dur a terme un procés de configuració."\n\n"Qualsevol usuari pot acceptar els permisos d\'aplicacions actualitzats en nom dels altres usuaris."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Després de crear un usuari nou, aquesta persona haurà de dur a terme un procés de configuració."\n\n"Qualsevol usuari pot acceptar permisos actualitzats en nom de la resta d\'usuaris."</string>
+    <string name="user_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_button_setup_now" msgid="3391388430158437629">"Configura ara"</string>
+    <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ara no"</string>
+    <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Només el propietari de la tauleta pot gestionar els usuaris."</string>
+    <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Només el propietari del telèfon pot gestionar els usuaris."</string>
+    <string name="user_remove_user_menu" msgid="6897150520686691355">"Supr. <xliff:g id="USER_NAME">%1$s</xliff:g> del disposit."</string>
+    <string name="user_new_user_name" msgid="369856859816028856">"Usuari 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_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_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="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="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>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index e01d331..67111d3 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardní limit"</item>
     <item msgid="4071574792028999443">"Procesy na pozadí deaktivovány"</item>
@@ -277,4 +290,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..28353d7 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Ne"</string>
     <string name="create" msgid="3578857613172647409">"Vytvořit"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Neznámé"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Nyní jste <xliff:g id="STEP_COUNT">%1$d</xliff:g> klepnutí od toho, abyste se stali vývojářem."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Toto 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\n"Toto 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 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"Bezdrátový displej je zakázaný, protože síť Wi-Fi je vypnutá."</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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Při změně nastavení se vyskytl problém"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimalizace Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimalizuje využití baterie při zapnuté síti Wi-Fi"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Přidat síť"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Sítě WiFi"</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_scan" msgid="1470911530412095868">"Vyhledávání"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Jiná síť…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Další"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automat. nastavení (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"K dokončení nastavení tablet potřebuje přístup k síti Wi-Fi. Po nastavení můžete přepínat mezi mobilním datovým připojením a sítí Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Zadejte ve svém směrovači sítě Wi-Fi kód PIN <xliff:g id="NUMBER">%1$s</xliff:g>. Proces nastavení může trvat až dvě minuty."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Nastavení tabletu může vyžadovat přenos nemalého množství dat."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"UPOZORNĚNÍ: Může dojít k tomu, že vám operátor bude účtovat vyšší poplatky než obvykle."\n\n"Nastavení telefonu může vyžadovat přenos nemalého množství dat."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"UPOZORNĚNÍ: Tablet nebude moci ověřit, zda je váš software aktuální."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"UPOZORNĚNÍ: Telefon nebude moci ověřit, zda je váš software aktuální."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tabletu se nepodařilo připojit k této síti Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefonu se nepodařilo připojit k této síti Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Rozšířené nastavení Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Frekvenční pásmo Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Uveďte provozní frekvenční rozsah"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Odstranit tuto skupinu?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Přenosný hotspot Wi-Fi"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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 stane, když je telefon v doku nebo v režimu spánku, zapněte funkci Spořič obrazovky."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kdy spustit spořič obrazovky"</string>
+    <string name="screensaver_settings_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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Aplikace není v telefonu nainstalována."</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>
@@ -981,6 +1037,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 +1059,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="uninstall_all_users_text" msgid="851857393177950340">"Odinstalovat pro všechny uživatele"</string>
+    <string name="install_text" msgid="884360662922471113">"Instalovat"</string>
     <string name="disable_text" msgid="6544054052049395202">"Vypnout"</string>
     <string name="enable_text" msgid="9217362512327828987">"Povolit"</string>
-    <string name="clear_user_data_text" msgid="5597622864770098388">"Mazání dat"</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>
@@ -1030,22 +1090,23 @@
     <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 +1115,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>
@@ -1077,6 +1140,8 @@
     <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_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="storageuse_settings_title" msgid="5657014373502630403">"Využití úložiště"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Umožňuje nastavit možnosti pro vývoj aplikací"</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="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="allow_mock_location" msgid="2787962564578664888">"Povolit simulované polohy"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Př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\n"Pozná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\n"Krok 1: Stiskněte tlačítko napájení a držte jej, dokud neuslyšíte zvuk nebo neucítíte vibraci."\n\n"Krok 2: Dotkněte se obrazovky dvěma prsty a držte ji, dokud neuslyšíte potvrzovací zvuk."\n\n"Má-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čítko Napájení ukončuje hovor"</string>
+    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Vyslovovat hesla"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Prodleva dotyku a podržení"</string>
+    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Usnadnění přístupu k webu"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Nastavení"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Zapnuto"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Vypnuto"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Zapnuto"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Vypnuto"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Povoleno"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nepovoleno"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Povolit"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Probíhá aktualizace nastavení Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"zapnuto"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"vypnuto"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"zapínání"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"vypínání"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1487,7 +1579,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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Zobrazovat překreslení GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Od nejlepšího k nejhoršímu: modrá, zelená, světle červená, červená"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Zakázat HW vrstvy"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Vždy použít GPU ke skládání obrazovky."</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Povolit sledování"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Po dosažení stanoveného limitu bude datové připojení k síti zakázáno."\n\n"Protože se přenesená data měří pomocí telefonu a operátor je může účtovat odlišně, je vhodné nastavit nízký limit."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Omezení datových přenosů na pozadí?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Omezíte-li využití mobilních dat na pozadí, některé aplikace a služby nebudou fungovat, dokud se nepřipojíte k síti Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Pokud omezíte používání mobilních datových přenosů na pozadí, budou některé aplikace a služby fungovat, pouze když budete připojeni k síti Wi-Fi."\n\n"Toto nastavení ovlivní všechny uživatele tohoto tabletu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Pokud omezíte používání mobilních datových přenosů na pozadí, budou některé aplikace a služby fungovat, pouze když budete připojeni k síti Wi-Fi."\n\n"Toto nastavení ovlivní všechny uživatele tohoto telefonu."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Vy"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Další uživatelé"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Přidat uživatele"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Aktivní"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Neaktivní"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Není nastaveno"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Vlastník"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Přezdívka"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Přidat nového uživatele"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Vytvořením dalších uživatelů můžete toto zařízení sdílet s jinými lidmi. Každý uživatel má své prostředí, které může personalizovat, nainstalovat své aplikace, tapetu atd. Uživatelé také mohou upravit nastavení tabletu (např. Wi-Fi), která ovlivní všechny ostatní uživatele."\n\n"Když vytvoříte nového uživatele, bude muset provést nastavení."\n\n"Každý uživatel může přijmout aktualizovaná oprávnění aplikací jménem všech ostatních uživatelů."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Když vytvoříte nového uživatele, bude muset provést nastavení."\n\n"Každý uživatel může přijmout aktualizovaná oprávnění aplikací jménem všech ostatních uživatelů."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Nastavit uživatele?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Ujistěte se, že je uživatel k dispozici a může si na tabletu nastavit svůj prostor"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 67bebe6..c3345b6 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardgrænse"</item>
     <item msgid="4071574792028999443">"Ingen baggrundsprocesser"</item>
@@ -277,4 +290,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..0f93604 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Nej"</string>
     <string name="create" msgid="3578857613172647409">"Opret"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ukendt"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Du er nu <xliff:g id="STEP_COUNT">%1$d</xliff:g> skridt væk fra at være udvikler."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Denne 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\n"Denne 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 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Der opstod et problem ved ændring af indstillingen"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi-optimering"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimer batteribrug, når Wi-Fi er slået til"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Tilføj netværk"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Scan"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Andre netværk..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mere"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk konfig. (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Din tablet skal have adgang til Wi-Fi for at kunne fuldføre konfigurationen. Efter konfigurationen kan du skifte mellem mobildata og Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Indtast pinkoden <xliff:g id="NUMBER">%1$s</xliff:g> på din Wi-Fi-router. Konfigurationen kan tage op til to minutter at fuldføre."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Konfiguration af tabletten kan kræve en betydelig mængde aktivitet på netværket."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ADVARSEL! Du kan blive udsat for ekstraudgifter til mobilselskabet."\n\n"Konfiguration af telefonen kan kræve en betydelig mængde aktivitet på netværket."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ADVARSEL! Tabletten vil ikke kunne kontrollere, om din software er opdateret."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ADVARSEL! Telefonen vil ikke kunne kontrollere, om din software er opdateret."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tabletten kunne ikke oprette forbindelse til dette Wi-Fi-netværk."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefonen kunne ikke oprette forbindelse til dette Wi-Fi-netværk."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Avanceret Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi-frekvensbånd"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Angiv frekvensintervallet"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Vil du glemme denne gruppe?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Bærbart Wi-Fi-hotspot"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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 der skal dagdrømmes"</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>
@@ -716,6 +764,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>
@@ -748,6 +797,7 @@
     <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>
@@ -756,6 +806,7 @@
     <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_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 +821,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 +846,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>
@@ -917,6 +971,7 @@
     <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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Applikationen er ikke installeret på din telefon."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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,6 +1115,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">"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>
@@ -1077,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Lagerforbrug"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Konfigurer valgmuligheder for appudvikling"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-fejlretning"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Fejlretningstilstand, når USB er tilsluttet"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"Rapporter om fejl i menu til startknap"</string>
+    <string name="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="allow_mock_location" msgid="2787962564578664888">"Imiterede placeringer"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Mens 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\n"Bemæ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\n"Trin 1: Tryk på afbryderknappen, og hold den nede, indtil du hører en lyd eller mærker en vibration."\n\n"Trin 2: Tryk med to fingre, og hold nede, indtil du hører bekræftelseslyden."\n\n"Hvis 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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Styrk tilgængeligheden på nettet"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Indstillinger"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Tændt"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Fra"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Til"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Fra"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Tilladt"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Ikke tilladt"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Tillad"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Opdaterer Bluetooth-indstilling"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"til"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"fra"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"aktiverer"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"deaktiverer"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Vis GPU-overdraw"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Fra bedst til værst: blå, grøn, lys rød, rød"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Deaktiver HW-overlejring"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Brug altid GPU til skærmsammensætning"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Aktivér spor"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Din mobildataforbindelse deaktiveres, når den angivne grænse er nået."\n\n"Da dataforbrug måles af din telefon, og dit mobilselskab muligvis bruger en anden metode til beregning af forbrug, kan du overveje at angive en lav grænse."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vil du begrænse baggrundsdata?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Hvis du begrænser mobildata i baggrunden, vil nogle apps og tjenester ikke fungere, medmindre du har forbindelse til et Wi-Fi-netværk."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Hvis du begrænser mobildata, der kører i baggrunden, vil nogle apps og tjenester ikke fungere, hvis du ikke har forbindelse til et Wi-Fi-netværk."\n\n"Denne indstilling påvirker alle brugere på denne tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Hvis du begrænser mobildata, der kører i baggrunden, vil nogle apps og tjenester ikke fungere, hvis du ikke har forbindelse til et Wi-Fi-netværk."\n\n"Denne indstilling påvirker alle brugere på denne telefon."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Dig"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Andre brugere"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Tilføj bruger"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Aktiv"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Ikke aktiv"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Ikke konfigureret"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Ejer"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Kaldenavn"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Tilføj ny bruger"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Du kan dele denne enhed med andre personer ved at oprette yderligere brugere. Hver bruger har deres egen plads, som de kan tilpasse med deres egne apps, baggrunde osv. Brugerne kan også ændre indstillinger på tabletten, der påvirker alle, f.eks. indstillinger for Wi-Fi."\n\n"Når du opretter en ny bruger, skal denne person gennemgå en oprettelsesproces."\n\n"Alle brugere kan acceptere opdaterede apptilladelser på vegne af alle andre brugere."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Når du opretter en ny bruger, skal denne person gennemgå en oprettelsesproces."\n\n"Alle brugere kan acceptere opdaterede apptilladelser på vegne af alle andre brugere."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Vil du konfigurere brugeren nu?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Sørg for, at personen kan tage tabletten og etablere deres plads"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 10fb68a..03d0143 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardlimit"</item>
     <item msgid="4071574792028999443">"Keine Hintergrundprozesse"</item>
@@ -277,4 +290,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..b8ab38c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Nein"</string>
     <string name="create" msgid="3578857613172647409">"Erstellen"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Unbekannt"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"In <xliff:g id="STEP_COUNT">%1$d</xliff:g> Schritten sind Sie ein Entwickler."</string>
+    <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 +87,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>
@@ -177,7 +182,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>
@@ -190,6 +195,7 @@
     <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="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 +253,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>
@@ -264,9 +270,11 @@
     <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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Wenn Sie Roaming zulassen, können erhebliche Roaming-Gebühren entstehen."\n\n"Diese Einstellung betrifft alle Nutzer auf diesem Tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Wenn Sie Roaming zulassen, können erhebliche Roaming-Gebühren entstehen."\n\n"Diese Einstellung betrifft alle Nutzer auf diesem Telefon."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Roaming zulassen?"</string>
     <string name="networks" msgid="6333316876545927039">"Netzbetreiberauswahl"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Netzbetreiber auswählen"</string>
@@ -297,6 +305,8 @@
     <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="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="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>
@@ -314,8 +324,8 @@
     <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 +333,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_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 +372,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>
@@ -426,7 +436,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 +480,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,13 +491,34 @@
     <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"</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Um Geräte zu sehen, aktivieren Sie die kabellose Übertragung."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Kabellose Übertragung ist deaktiviert, da WLAN deaktiviert ist."</string>
+    <string name="wifi_display_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_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"</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="nsd_quick_toggle_title" msgid="3125572815278848258">"Diensterkennung"</string>
@@ -508,11 +539,14 @@
     <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_setting_sleep_policy_title" msgid="9107237003911220057">"WLAN im Ruhezustand aktiviert lassen"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Beim Ändern der Einstellung ist ein Problem aufgetreten."</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"WLAN-Optimierung"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Akkuverbrauch bei aktiviertem WLAN minimieren"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Netzwerk hinzufügen"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Scannen"</string>
@@ -525,14 +559,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Anderes Netzwerk…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mehr"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisches Setup (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Ihr Tablet muss eine WLAN-Verbindung haben, damit die Einrichtung abgeschlossen werden kann. Nach der Einrichtung können Sie zwischen WLAN und Mobilfunk wechseln."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Geben Sie die PIN <xliff:g id="NUMBER">%1$s</xliff:g> auf Ihrem WLAN-Router ein. Die Einrichtung kann bis zu 2 Minuten dauern."</string>
     <string name="wifi_wps_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_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>
@@ -572,6 +607,14 @@
     <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_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\n"Das Einrichten des Tablets kann eine erhöhte Netzwerkaktivität erfordern."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"Achtung: Es können zusätzliche Kosten für die Datenübertragung vonseiten des Mobilfunkanbieters anfallen."\n\n"Das Einrichten des Telefons kann eine erhöhte Netzwerkaktivität erfordern."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"Achtung: Das Tablet kann nicht prüfen, ob Ihre Software aktuell ist."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"Achtung: Das Telefon kann nicht prüfen, ob Ihre Software aktuell ist."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Das Tablet konnte nicht auf dieses WLAN zugreifen."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Das Telefon konnte nicht auf dieses WLAN zugreifen."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Erweiterte WLAN-Einstellungen"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"WLAN-Frequenzband"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Frequenzbereich für Betrieb festlegen"</string>
@@ -596,6 +639,7 @@
     <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,7 +647,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Diese Gruppe entfernen?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Mobiler WLAN-Hotspot"</string>
+    <string name="wifi_tether_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>
@@ -672,15 +719,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>
@@ -717,6 +765,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>
@@ -749,6 +798,7 @@
     <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>
@@ -757,7 +807,8 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Bilder, Videos"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (Musik, Töne, usw.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Sonstiges"</string>
-    <string name="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>
@@ -771,7 +822,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 +847,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>
@@ -854,7 +908,7 @@
     <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 +939,40 @@
     <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="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_network_based" msgid="7472814266821714527">"Standort per WLAN &amp; Mobilfunknetz"</string>
+    <string name="location_neighborhood_level" msgid="5626515380188353712">"Apps dürfen meinen Standort mit dem Google-Standortdienst schneller bestimmen. Anonyme Standortdaten werden erfasst und an Google gesendet."</string>
     <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Standort per WLAN bestimmt"</string>
     <string name="location_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 Standortinformationen 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 +991,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>
@@ -967,6 +1022,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="activity_not_found" msgid="5551664692991605325">"App ist nicht auf dem Telefon installiert."</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>
@@ -982,6 +1038,8 @@
     <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="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 +1052,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 +1060,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>
@@ -1031,6 +1091,7 @@
     <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 +1116,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 +1133,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,6 +1141,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Speichernutzung"</string>
@@ -1095,6 +1160,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,7 +1190,7 @@
     <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>
@@ -1151,7 +1218,7 @@
     <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>
@@ -1200,6 +1267,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Optionen zur App-Entwicklung festlegen"</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="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="allow_mock_location" msgid="2787962564578664888">"Falsche Standorte"</string>
@@ -1208,6 +1277,8 @@
     <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="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>
@@ -1235,14 +1306,23 @@
     <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\n"Wenn 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\n"Hinweis: 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\n"1. Schritt: Drücken und halten Sie die Ein-/Austaste, bis Sie einen Ton hören oder eine Vibration spüren."\n\n"2. Schritt: Berühren und halten Sie mit zwei Fingern, bis Sie eine Audiobestätigung hören."\n\n"Falls das Gerät mehrere Nutzer hat, werden die Bedienungshilfen durch Verwendung dieser Verknüpfung in der Bildschirmsperre solange aktiviert, bis das Gerät entsperrt ist."</string>
+    <string name="accessibility_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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Web-Bedienung verbessern"</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_feature_state_on" msgid="2864292320042673806">"An"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Aus"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Zugelassen"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nicht zugelassen"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Zulassen"</string>
@@ -1266,7 +1346,7 @@
     <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>
@@ -1283,7 +1363,7 @@
     <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_screen" msgid="3023346080675904613">"Display"</string>
     <string name="power_wifi" msgid="2382791137776486974">"WLAN"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Mobilfunk-Standby"</string>
@@ -1303,7 +1383,7 @@
     <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>
@@ -1325,6 +1405,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,7 +1430,7 @@
     <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_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>
@@ -1381,6 +1462,20 @@
     <string name="gadget_title" msgid="5519037532720577836">"Energiesteuerung"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Aktualisieren der WLAN-Einstellung"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Aktualisieren der Bluetooth-Einstellung"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"an"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"aus"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"Wird aktiviert..."</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"Wird deaktiviert..."</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"WLAN"</string>
+    <string name="gadget_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>
@@ -1404,7 +1499,7 @@
     <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>
@@ -1417,9 +1512,6 @@
     <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>
@@ -1486,7 +1578,7 @@
     <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="sync_error" msgid="5060969083117872149">"Synchronisierungsfehler"</string>
     <string name="last_synced" msgid="4242919465367022234">"Zuletzt synchronisiert am <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"Synchronisieren…"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Einstellungen sichern"</string>
@@ -1545,28 +1637,36 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"GPU-Überlastung anzeigen"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Niedrig nach hoch: blau, grün, hellrot, rot"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW-Overlays deaktivieren"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"GPU immer für Bildschirmaufbau verwenden"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Tracing aktivieren"</string>
     <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Aktivierte Traces wählen"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"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_traces_summary_none" msgid="1867562808503494163">"Keine Traces aktiviert"</string>
+    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> Traces aktiviert"</string>
+    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Alle Traces aktiviert"</string>
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL-Traces aktivieren"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Layoutgrenzen einblenden"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Clip-Begrenzungen, Ränder usw. anzeigen"</string>
     <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="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>
@@ -1588,7 +1688,7 @@
     <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_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>
@@ -1600,7 +1700,7 @@
     <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">"Mobilfunk"</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>
@@ -1609,7 +1709,7 @@
     <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_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>
@@ -1625,9 +1725,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Ihre mobile Datenverbindung wird deaktiviert, sobald das angegebene Limit erreicht ist."\n\n"Der Datenverbrauch wird von Ihrem Telefon berechnet und kann von der Abrechnung Ihres Mobilfunkanbieters abweichen. Ziehen Sie deshalb die Verwendung eines niedrigen Limits in Betracht."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Hintergrunddaten beschränken?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Wenn Sie mobile Hintergrunddaten beschränken, funktionieren einige Apps und Dienste nur bei WLAN-Verbindung."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Wenn Sie die mobilen Hintergrunddaten beschränken, funktionieren einige Apps und Dienste nur bei verfügbarer WLAN-Verbindung."\n\n"Diese Einstellung betrifft alle Nutzer auf diesem Tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Wenn Sie die mobilen Hintergrunddaten beschränken, funktionieren einige Apps und Dienste nur bei verfügbarer WLAN-Verbindung."\n\n"Diese Einstellung betrifft alle Nutzer auf diesem Telefon."</string>
     <string name="data_usage_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>
@@ -1668,6 +1771,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 +1786,53 @@
     <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="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_you_section" msgid="6247838798859425408">"Ich"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Andere Nutzer"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Nutzer hinzufügen"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Aktiv"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Nicht aktiv"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nicht eingerichtet"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Eigentümer"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Alias"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Neuen Nutzer hinzufügen"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Sie können dieses Gerät mit anderen Personen teilen und dazu zusätzliche Nutzer erstellen. Jeder Nutzer hat seinen eigenen Bereich, in dem er unter anderem eigene Apps oder Hintergründe installieren kann. Nutzer können auch Tablet-Einstellungen wie WLAN anpassen, die jeden Nutzer betreffen."\n\n"Nachdem Sie einen neuen Nutzer erstellt haben, muss dieser einen Einrichtungsprozess durchlaufen."\n\n"Jeder Nutzer kann aktualisierte App-Berechtigungen im Namen aller anderen Nutzer akzeptieren."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Nachdem Sie einen neuen Nutzer erstellt haben, muss dieser einen Einrichtungsprozess durchlaufen."\n\n"Jeder Nutzer kann aktualisierte App-Berechtigungen im Namen aller anderen Nutzer akzeptieren."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Nutzer jetzt einrichten?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Der Nutzer muss Zugang zu dem Tablet haben und seinen Speicherplatz einrichten."</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index c394858..f59025a 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Τυπικό όριο"</item>
     <item msgid="4071574792028999443">"Δεν υπάρχουν διεργασίες παρασκηνίου"</item>
@@ -277,4 +290,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..18b1697 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Όχι"</string>
     <string name="create" msgid="3578857613172647409">"Δημιουργία"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Άγνωστο"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Απομένουν <xliff:g id="STEP_COUNT">%1$d</xliff:g> βήματα για να γίνετε προγραμματιστής."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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>
@@ -297,6 +305,8 @@
     <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="location_settings_title" msgid="4483843407328665068">"Πρόσβαση τοποθεσίας"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Ασφάλεια"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ορισμός του \"Η τοποθεσία μου\", ξεκλειδώματος οθόνης, κλειδώματος κάρτας SIM, κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
@@ -330,7 +340,7 @@
     <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 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"Η ασύρματη οθόνη έχει απενεργοποιηθεί επειδή το 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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Προέκυψε κάποιο πρόβλημα κατά την αλλαγή της ρύθμισης"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Βελτιστοποίηση Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Ελαχιστοποίηση χρήσης μπαταρίας όταν το Wi-Fi είναι ενεργό"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Προσθήκη δικτύου"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Δίκτυα 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_scan" msgid="1470911530412095868">"Σάρωση"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Άλλο δίκτυο…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Περισσότερα"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Αυτόματη ρύθμιση (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Για να ολοκληρώσετε τη ρύθμιση, το tablet σας χρειάζεται πρόσβαση σε δίκτυο Wi-Fi. Μετά τη ρύθμιση, μπορείτε να κάνετε εναλλαγή μεταξύ δεδομένων κινητής τηλεφωνίας και δικτύου Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Εμφάνιση σύνθετων επιλογών"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Ρύθμιση προστατευόμενου 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_pin" msgid="8067502591043979939">"Εισαγάγετε το 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_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>
@@ -571,6 +606,14 @@
     <string name="wifi_save" msgid="3331121567988522826">"Αποθήκευση"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Αποτυχία αποθήκευσης δικτύου"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Ακύρωση"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"Παράλειψη"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"Χωρίς παράλειψη"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: ενδέχεται να ισχύουν επιπλέον χρεώσεις από την εταιρεία κινητής τηλεφωνίας."\n\n"Η ρύθμιση του tablet μπορεί να προκαλέσει μεγάλη δραστηριότητα δικτύου."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: ενδέχεται να ισχύουν επιπλέον χρεώσεις από την εταιρεία κινητής τηλεφωνίας."\n\n"Η ρύθμιση του τηλεφώνου μπορεί να προκαλέσει μεγάλη δραστηριότητα δικτύου."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το tablet δεν θα είναι σε θέση να επαληθεύσει ότι το λογισμικό σας είναι ενημερωμένο."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το τηλέφωνο δεν θα είναι σε θέση να επαληθεύσει ότι το λογισμικό σας είναι ενημερωμένο."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Δεν ήταν δυνατή η σύνδεση του tablet σε αυτό το δίκτυο Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Δεν ήταν δυνατή η σύνδεση του τηλεφώνου σε αυτό το δίκτυο Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Σύνθετο Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Ζώνη συχνοτήτων Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Προσδιορίστε το εύρος συχνότητας της λειτουργίας"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Αν αποσυνδεθείτε, θα λήξει η σύνδεσή σας με τη συσκευή <xliff:g id="PEER_NAME">%1$s</xliff:g> και <xliff:g id="PEER_COUNT">%2$s</xliff:g> άλλες συσκευές."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Ακύρωση πρόσκλησης;"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Θέλετε να ακυρώσετε την πρόσκληση για τη σύνδεση με τη συσκευή <xliff:g id="PEER_NAME">%1$s</xliff:g>;"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Διαγραφή αυτής της ομάδας;"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Φορητό σημείο πρόσβασης 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>
@@ -671,15 +718,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">"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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Η εφαρμογή δεν έχει εγκατασταθεί στο τηλέφωνό σας."</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>
@@ -981,6 +1037,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>
@@ -1001,6 +1059,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>
@@ -1030,6 +1090,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Αποθ. χώρος USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Στην κάρτα SD"</string>
     <string name="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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Αποθηκευτικός χώρος"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Ορισμός επιλογών για ανάπτυξη εφαρμογής"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Εντοπισμός σφαλμάτων USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Λειτουργία εντοπισμού σφαλμάτων όταν το USB είναι συνδεδεμένο"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"Αναφορές σφαλμάτων μενού λειτουργίας"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Συμπερίληψη επιλογής στο μενού λειτουργίας για λήψη αναφοράς σφαλμάτων"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Παραμονή σε κανονική κατάσταση λειτουργίας"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Η οθόνη δεν θα μεταβαίνει ποτέ σε κατάσταση αδράνειας κατά τη φόρτιση"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
@@ -1207,6 +1276,8 @@
     <string name="adb_warning_message" msgid="7316799925425402244">"Ο εντοπισμός σφαλμάτων 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>
@@ -1234,14 +1305,23 @@
     <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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Βελτίωση προσβασιμότητας στον ιστό"</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_feature_state_on" msgid="2864292320042673806">"Ενεργή"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Ανενεργή"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Επιτρέπεται"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Δεν επιτρέπεται"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Να επιτραπεί"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <string name="gadget_title" msgid="5519037532720577836">"Έλεγχος ισχύος"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Ενημέρωση ρύθμισης Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ενημέρωση ρύθμισης Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"ενεργή"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"απενεργοποιημένη"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"ενεργοποίηση"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"απενεργοποίηση"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Εμφάνιση μεγέθους υπερανάληψης σε GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Από το καλύτερο στο χειρότερο: μπλε, πράσινο, απαλό κόκκινο, κόκκινο"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Απενεργ. επικαλύψεων HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Να γίνεται πάντα χρήση του GPU για σύνθεση οθόνης"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Ενεργοποίηση ιχνών"</string>
@@ -1555,17 +1651,21 @@
     <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="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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Η σύνδεση των δεδομένων του κινητού τηλεφώνου σας θα απενεργοποιηθεί μόλις συμπληρωθεί το καθορισμένο όριο."\n\n"Επειδή η χρήση δεδομένων υπολογίζεται από το τηλέφωνό σας και ενδέχεται η εταιρεία κινητής τηλεφωνίας να την υπολογίζει με διαφορετικό τρόπο, σκεφτείτε το ενδεχόμενο να χρησιμοποιήσετε ένα συντηρητικό όριο."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Περιορ.δεδομ.παρασκην.;"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Αν περιορίσετε τα δεδομένα παρασκηνίου κινητής τηλεφωνίας, ορισμένες εφαρμογές και υπηρεσίες δεν θα λειτουργούν εκτός και αν έχετε συνδεθεί σε δίκτυο Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Αν περιορίσετε τη χρήση των δεδομένων κινητής τηλεφωνίας στο παρασκήνιο, ορισμένες εφαρμογές και υπηρεσίες δεν θα λειτουργούν, εκτός εάν είστε συνδεδεμένοι σε δίκτυο Wi-Fi."\n\n"Αυτή η ρύθμιση επηρεάζει όλους τους χρήστες στο συγκεκριμένο tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Αν περιορίσετε τη χρήση των δεδομένων κινητής τηλεφωνίας στο παρασκήνιο, ορισμένες εφαρμογές και υπηρεσίες δεν θα λειτουργούν, εκτός εάν είστε συνδεδεμένοι σε δίκτυο Wi-Fi."\n\n"Αυτή η ρύθμιση επηρεάζει όλους τους χρήστες στο συγκεκριμένο τηλέφωνο."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Εσείς"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Άλλοι χρήστες"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Προσθήκη χρήστη"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Ενεργός"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Μη ενεργός"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Δεν υπάρχει ρύθμιση"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Κάτοχος"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Ψευδώνυμο"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Προσθήκη νέου χρήστη"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Μπορείτε να μοιραστείτε αυτή τη συσκευή με άλλους χρήστες δημιουργώντας επιπλέον χρήστες. Κάθε χρήστης διαθέτει τον δικό του χώρο, τον οποίο μπορεί να προσαρμόσει με τις δικές του εφαρμογές, την ταπετσαρία και ούτω καθεξής. Οι χρήστες μπορούν επίσης να προσαρμόσουν τις ρυθμίσεις tablet όπως το Wi-Fi που επηρεάζουν τους πάντες."\n\n"Αφού δημιουργήσετε έναν νέο χρήστη, αυτό το άτομο θα πρέπει να ολοκληρώσει τη διαδικασία ρύθμισης."\n\n"Οποιοδήποτε χρήστης μπορεί να αποδεχτεί ενημερωμένα δικαιώματα εφαρμογών εκ μέρους των άλλων χρηστών."</string>
+    <string name="user_add_user_message_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_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 0af57e7..79ecf36 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standard limit"</item>
     <item msgid="4071574792028999443">"No background processes"</item>
@@ -277,4 +290,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..faacd7c 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="create" msgid="3578857613172647409">"Create"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Unknown"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"You are now <xliff:g id="STEP_COUNT">%1$d</xliff:g> steps away from being a developer."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"This setting affects all users on this tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"When you allow data roaming, you may incur significant roaming charges!"\n\n"This setting affects all users on this phone."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Allow data roaming?"</string>
     <string name="networks" msgid="6333316876545927039">"Operator selection"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Choose a network operator"</string>
@@ -297,6 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"There was a problem while changing the setting"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-FI optimisation"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimise battery usage when Wi-FI is on"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Add network"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Scan"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Other network…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"More"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatic setup (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"To complete setup, your tablet needs access to Wi-Fi. After setup, you can switch between mobile data and Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Enter pin <xliff:g id="NUMBER">%1$s</xliff:g> on your Wi-Fi router. The setup may take up to two minutes to complete."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <string name="wifi_save" msgid="3331121567988522826">"Save"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Failed to save network"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancel"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"Skip anyway"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"Don\'t skip"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"WARNING: You may incur extra carrier data charges."\n\n"Tablet setup can require significant network activity."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"WARNING: You may incur extra carrier data charges."\n\n"Phone setup can require significant network activity."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"WARNING: The tablet won\'t be able to verify that your software is up to date."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"WARNING: The phone won\'t be able to verify that your software is up to date."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"The tablet was unable to connect to this Wi-Fi network."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"The phone was unable to connect to this Wi-Fi network."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Advanced Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi frequency band"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Specify the frequency range of operation"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"If you disconnect, your connection with <xliff:g id="PEER_NAME">%1$s</xliff:g> and <xliff:g id="PEER_COUNT">%2$s</xliff:g> other devices will end."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancel invitation"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Do you want to cancel invitation to connect with <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Forget this group?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Application is not installed on your phone."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Storage use"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Set options for app development"</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="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="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"While 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\n"Note: 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\n"Step 1: Press and hold the power button until you hear a sound or feel a vibration."\n\n"Step 2: Touch and hold two fingers until you hear audio confirmation."\n\n"If 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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Enhance web accessibility"</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_feature_state_on" msgid="2864292320042673806">"On"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Off"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Allowed"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Not allowed"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Allow"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <string name="gadget_title" msgid="5519037532720577836">"Power control"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Updating WiFi setting"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Updating Bluetooth setting"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"on"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"off"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"turning on"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"turning off"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Show GPU overdraw"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"From best to worst: blue, green, light red, red"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Disable HW overlays"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Always use GPU for screen compositing"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Enable tracing"</string>
@@ -1555,17 +1651,21 @@
     <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_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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Your mobile data connection will be disabled when the specified limit is reached."\n\n"Since data usage is measured by your phone, and your carrier may account for usage differently, consider using a conservative limit."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Restrict background data?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi-Fi network."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi-Fi network."\n\n"This setting affects all users on this tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi-Fi network."\n\n"This setting affects all users on this phone."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"You"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Other users"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Add user"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Active"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Not active"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Not set up"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Owner"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Nickname"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Add new user"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"You can share this device with other people by creating additional users. Each user has their own space, which they can customise with their own apps, wallpaper and so on. Users can also adjust tablet settings like Wi-Fi that affect everyone."\n\n"After you create a new user, that person needs to go through a setup process."\n\n"Any user can accept updated app permissions on behalf of all other users."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"After you create a new user, that person needs to go through a setup process."\n\n"Any user can accept updated app permissions on behalf of all other users."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Set up user now?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Make sure the person is available to take the tablet and set up their space"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 7ab6588..85b471f 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Límite estándar"</item>
     <item msgid="4071574792028999443">"No hay procesos de fondo."</item>
@@ -277,4 +290,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..402a8a8 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="create" msgid="3578857613172647409">"Crear"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Ahora estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> pasos de ser un programador."</string>
+    <string name="show_dev_on" msgid="1110711554982716293">"Ahora eres un programador."</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"No es necesario, ya eres un programador."</string>
     <string name="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>
@@ -84,12 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Has perdido la conectividad de los datos porque has dejado la red doméstica con roaming de datos desactivado."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Enciéndelo"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Al permitir el roaming de datos, puedes incurrir en gastos de roaming importantes."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Al permitir el roaming de datos, los costos de roaming que deberás asumir pueden ser altos."\n\n"Esta configuración afecta a todos los usuarios de esta tableta."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Al permitir el roaming de datos, los costos de roaming que deberás asumir pueden ser altos."\n\n"Esta configuración afecta a todos los usuarios de este dispositivo."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"¿Deseas permitir el roaming de datos?"</string>
     <string name="networks" msgid="6333316876545927039">"Selección de operador"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Elige un operador de red"</string>
@@ -293,10 +301,12 @@
     <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="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>
@@ -331,13 +341,13 @@
     <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 +359,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 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"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_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="default" msgid="5237208142892767592">"Permitir el intercambio de datos cuando el dispositivo toque otro dispositivo"</string>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Hubo un problema mientras se cambiaba la configuración"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimización de Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimizar el consumo de la batería con Wi-Fi activado"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Agregar red"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Pulsador WPS"</string>
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Más opciones"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Ingreso PIN WPS"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Buscar"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Otra red…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Más"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuración automática (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Necesitas conexión Wi-Fi para completar la configuración. Una vez finalizada, podrás alternar entre Wi-Fi y conexión de datos móviles."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Introduce el código PIN <xliff:g id="NUMBER">%1$s</xliff:g> en el router Wi-Fi. El proceso de configuración puede tardar hasta dos minutos."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_skip_anyway" msgid="6965361454438011190">"Omitir de todos modos"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"No omitir"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ADVERTENCIA: Es posible que tu proveedor te cobre cargos adicionales por el uso de datos."\n\n"La configuración de la tableta puede requerir una significativa actividad de la red."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ADVERTENCIA: Es posible que tu proveedor te cobre cargos adicionales por el uso de datos."\n\n"La configuración del dispositivo puede requerir una significativa actividad de la red."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ADVERTENCIA: Tu tableta no podrá verificar si el software está actualizado."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ADVERTENCIA: Tu dispositivo no podrá verificar si el software está actualizado."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"La tableta no se ha podido conectar a esta red Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"El dispositivo no se ha podido conectar a esta red Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi avanzada"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda de frecuencia Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Especificar el rango de frecuencia de la operación"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"¿Deseas borrar este grupo?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Zona Wi-Fi portátil"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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 activar el protector de pantalla"</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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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>
@@ -793,6 +846,7 @@
     <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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"La aplicación no está instalada en tu dispositivo."</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>
@@ -981,6 +1037,8 @@
     <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="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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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="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>
@@ -1054,6 +1115,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">"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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Uso del almacenamiento"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <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="enable_adb_summary" msgid="4881186971746056635">"Modo de depuración cuando se conecta el 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>
@@ -1207,6 +1276,8 @@
     <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="dev_settings_warning_title" msgid="7244607768088540165">"¿Permitir configuración de desarrollo?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Estos parámetros de configuración están destinados únicamente a los programadores. Pueden hacer que el dispositivo o sus aplicaciones no funcionen correctamente."</string>
+    <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verificar aplicaciones por USB"</string>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Comprueba que las aplicaciones instaladas mediante ADB/ADT no ocasionen daños."</string>
     <string name="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>
@@ -1234,14 +1305,23 @@
     <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\n"A 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\n"Nota: 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\n"Paso 1: mantén presionado el botón de encendido hasta que oigas un sonido o notes una vibración."\n\n"Paso 2: mantén la pantalla presionada con dos dedos hasta que oigas una confirmación."\n\n"Si 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">"El botón de encendido finaliza la llamada."</string>
+    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Decir contraseñas"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Retraso entre tocar y mantener presionado"</string>
+    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Mejorar la accesibilidad web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configuración"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Activado"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Desactivado"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activado"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desactivado"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Permitido"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"No se permite"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Permitir"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Actualización de la configuración de Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"activado"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"desactivado"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"activando"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"desactivando"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
+    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_sync" msgid="858895763714222152">"Sincronización"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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_summary_change" msgid="2731163425081172638">"Toca para cambiar o eliminar la contraseña de las copias de seguridad completas de tu escritorio."</string>
@@ -1548,6 +1640,10 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Mostrar superficies de vent. cuando se actualizan"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Ver actualiz. vistas GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Mostrar vistas de ventanas procesadas con GPU"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Actualiz. capas hardware"</string>
+    <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Luz verde en capas de hardware al actualizarse"</string>
+    <string name="show_hw_overdraw" msgid="1136884304711318251">"Mostrar superposición GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"De mejor a peor: azul, verde, rojo claro, rojo"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Desactivar superpos. HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Usar GPU para combinar pantallas"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Activar seguimientos"</string>
@@ -1555,17 +1651,21 @@
     <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="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="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="track_frame_time" msgid="6146354853663863443">"Represent. GPU del perfil"</string>
     <string name="track_frame_time_summary" msgid="447577515813970287">"Medir tiempo de repr. en adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Ventana de escala de animación"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Transición de escala de animación"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Escala duración animador"</string>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simular pantallas secund."</string>
     <string name="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Tu conexión de datos móvil se desactivará cuando se alcance el límite especificado."\n\n"Debido a que el uso de datos medido por tu teléfono puede diferir del cálculo de uso de tu proveedor, considera usar un límite prudente."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"¿Restringir el uso de datos de referencia?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Si restringes los datos para celulares de referencia, algunas aplicaciones y servicios no funcionarán a menos que te conectes a una red Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Si restringes los datos móviles de referencia, algunos servicios y aplicaciones no funcionarán a menos que te conectes a una red Wi-Fi."\n\n"Esta configuración afecta a todos los usuarios de esta tableta."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Si restringes los datos móviles de referencia, algunos servicios y aplicaciones no funcionarán a menos que te conectes a una red Wi-Fi."\n\n"Esta configuración afecta a todos los usuarios de este dispositivo."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Tú"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Otros usuarios"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Agregar usuario"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Activo"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Inactivo"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"No configurado"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Propietario"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Seudónimo"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Agregar usuario nuevo"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Puedes crear usuarios adicionales para compartir este dispositivo con otras personas. Cada usuario cuenta con su propio espacio y puede personalizarlo con sus propios fondos de pantalla, aplicaciones, etc. Los usuarios también pueden ajustar parámetros de configuración de la tableta como la red Wi-Fi."\n\n"Luego de que crees un usuario nuevo, este tiene que pasar por un proceso de configuración."\n\n"Cualquier usuario puede aceptar permisos de aplicaciones actualizados en nombre del resto de los usuarios."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Luego de que crees un usuario nuevo, este tiene que pasar por un proceso de configuración."\n\n"Cualquier usuario puede aceptar permisos de aplicaciones actualizados en nombre del resto de los usuarios."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"¿Configurar el usuario ahora?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Asegúrate de que la persona esté disponible para aceptar la tableta y configurar su espacio."</string>
+    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configurar ahora"</string>
+    <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ahora no"</string>
+    <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Solo los propietarios de la tableta pueden administrar los usuarios."</string>
+    <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Solo los propietarios del dispositivo pueden administrar los usuarios."</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_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_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Perderás tu espacio y tus datos en esta tableta. No puedes deshacer esta acción."</string>
+    <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Perderás tu espacio y tus datos en este dispositivo. No puedes deshacer esta acción."</string>
+    <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"El espacio y los datos de este usuario desaparecerán de esta tableta. No puedes deshacer esta acción."</string>
+    <string name="user_confirm_remove_message" product="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_adding_new_user" msgid="1521674650874241407">"Agregando usuario nuevo..."</string>
+    <string name="user_delete_user_description" msgid="3158592592118767056">"Eliminar usuario"</string>
+    <string name="user_delete_button" msgid="5131259553799403201">"Eliminar"</string>
+    <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta configuración afecta a todos los usuarios de esta tableta."</string>
+    <string name="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="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>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index beddc81..564f631 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Límite estándar"</item>
     <item msgid="4071574792028999443">"Sin procesos en segundo plano"</item>
@@ -277,4 +290,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..d349944 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="create" msgid="3578857613172647409">"Crear"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Solo te quedan <xliff:g id="STEP_COUNT">%1$d</xliff:g> pasos para ser un desarrollador."</string>
+    <string name="show_dev_on" msgid="1110711554982716293">"¡Ahora eres un desarrollador!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"No es necesario, ya eres un desarrollador."</string>
     <string name="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>
@@ -84,12 +87,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">"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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Esta 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\n"Esta 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 +305,9 @@
     <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="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>
@@ -328,7 +338,7 @@
     <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_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 +372,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>
@@ -480,6 +490,27 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz del teléfono"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música y contenido multimedia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ajustes de recordatorio"</string>
+    <string name="wifi_display_settings_title" msgid="564299108014609382">"Pantalla inalámbrica"</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Para ver los dispositivos, activa la pantalla inalámbrica."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"La pantalla inalámbrica está inhabilitada porque la red Wi-Fi está desactivada."</string>
+    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Buscar pantallas"</string>
+    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Buscando…"</string>
+    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Sin pantallas inalámbricas cercanas"</string>
+    <string name="wifi_display_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_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>
@@ -503,15 +534,18 @@
     <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" msgid="4925789238170207169">"Solo conexiones estables"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"No usar una red Wi-Fi a menos que tenga una buena conexión a Internet"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Usar Wi-Fi en suspensión"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Error al cambiar la configuración"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimización de Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimizar el uso de la batería cuando el Wi-Fi esté activado"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Añadir red"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Buscar"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Otra red…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Más"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuración automática (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Necesitas conexión Wi-Fi para completar la configuración. Una vez finalizada, podrás alternar entre Wi-Fi y conexión de datos."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Introduce el código PIN <xliff:g id="NUMBER">%1$s</xliff:g> en el router Wi-Fi. El proceso de configuración puede tardar hasta dos minutos."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"La configuración del tablet puede requerir una gran cantidad de actividad de red."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ADVERTENCIA: es posible que se facturen cargos de datos adicionales."\n\n"La configuración del teléfono puede requerir una gran cantidad de actividad de red."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ADVERTENCIA: el tablet no puede verificar si el software está actualizado."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ADVERTENCIA: el teléfono no puede verificar si el software está actualizado."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"El tablet no se ha podido conectar a esta red Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"El teléfono no se ha podido conectar a esta red Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Ajustes avanzados de Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda de frecuencia WiFi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Especificar intervalo frecuencia de funcionamiento"</string>
@@ -595,6 +638,7 @@
     <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 +646,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_p2p_delete_group_message" msgid="834559380069647086">"¿Borrar este grupo?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Zona Wi-Fi portátil"</string>
-    <string name="wifi_tether_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_starting" msgid="1322237938998639724">"Activando zona Wi-Fi…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desactivando zona Wi-Fi…"</string>
+    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Zona Wi-Fi portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activa"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error de zona Wi-Fi portátil"</string>
     <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configurar zona Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Zona Wi-Fi portátil de <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> de <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
+    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Zona Wi-Fi portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> con seguridad <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
@@ -628,8 +675,8 @@
     <string name="dock_settings_summary" msgid="455802113668982481">"Ajustes de audio del conector adjunto"</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="lock_sounds_enable_title" msgid="450098505659399520">"Sonido de 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>
@@ -667,19 +714,20 @@
     <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 un conector o inactivo y cargando"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ambos casos"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la carga"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Cuando el dispositivo esté en un conector"</string>
+    <string name="screensaver_settings_summary_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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 aplicaciones y contenido multimedia)"</string>
@@ -756,6 +806,7 @@
     <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 +821,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 +846,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>
@@ -823,7 +877,7 @@
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN inhabilitado"</string>
     <string name="bearer" msgid="594270280031923558">"Tipo de conexión"</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,7 +886,7 @@
     <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>
@@ -898,7 +952,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móviles"</string>
     <string name="location_title" msgid="1029961368397484576">"Mi ubicación"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Ubicación de red móvil y Wi-Fi"</string>
+    <string name="location_network_based" msgid="7472814266821714527">"Ubicación por red móvil y Wi-Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que las aplicaciones usen el servicio de ubicación de Google para calcular tu ubicación más rápido. Se recopilarán datos de ubicación anónimos y se enviarán a Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Ubicación determinada por Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satélites GPS"</string>
@@ -909,14 +963,15 @@
     <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>
@@ -959,13 +1014,14 @@
     <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_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="activity_not_found" msgid="5551664692991605325">"La aplicación no está instalada en el teléfono."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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>
@@ -1054,6 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Uso de almacenamiento"</string>
@@ -1094,6 +1159,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>
@@ -1198,7 +1265,9 @@
     <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="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="bugreport_in_power" msgid="4548816486587403971">"Informe de error en menú"</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="allow_mock_location" msgid="2787962564578664888">"Ubicaciones simuladas"</string>
@@ -1207,12 +1276,14 @@
     <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="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_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="gadget_picker_title" msgid="98374951396755811">"Seleccionar gadget"</string>
@@ -1234,14 +1305,23 @@
     <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\n"A 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\n"Nota: 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\n"Paso 1: mantén pulsado el botón de encendido hasta que escuches un sonido o notes una vibración."\n\n"Paso 2: mantén la pantalla pulsada con dos dedos hasta que escuches una confirmación."\n\n"Si 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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Mejorar accesibilidad web"</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_feature_state_on" msgid="2864292320042673806">"Activada"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desactivada"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Permitido"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"No permitido"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Permitir"</string>
@@ -1280,7 +1360,7 @@
     <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>
@@ -1314,7 +1394,7 @@
     <string name="battery_desc_radio" msgid="5479196477223185367">"Batería utilizada por la radio"</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_sugg_display" msgid="3370202402045141760">"Reduce el brillo y el tiempo que permanece encendida la pantalla."</string>
     <string name="battery_desc_wifi" msgid="1702486494565080431">"Batería utilizada por la conexión Wi-Fi"</string>
     <string name="battery_sugg_wifi" msgid="2085605314976704287">"Desactiva la conexión Wi-Fi cuando no la estés utilizando o cuando no esté disponible."</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Batería usada por Bluetooth"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Actualización de la configuración de la conexión Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"activado"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"desactivado"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"activando..."</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"desactivando..."</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,10 +1511,7 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Mostrar superación de GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"De mejor a peor: azul, verde, rojo claro, rojo"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"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>
@@ -1555,17 +1651,21 @@
     <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="force_msaa" msgid="7920323238677284387">"Forzar MSAA 4x"</string>
+    <string name="force_msaa_summary" msgid="9123553203895817537">"Habilitar MSAA 4x en aplicaciones de OpenGL ES 2.0"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Representación GPU perfil"</string>
     <string name="track_frame_time_summary" msgid="447577515813970287">"Medir tiempo representación en adb shell dumpsys gfxinfo"</string>
     <string name="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="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>
@@ -1580,7 +1680,7 @@
     <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"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>
@@ -1610,8 +1710,8 @@
     <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_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\n"Algunas cuentas como, por ejemplo, las cuentas de Google, también reflejarán en la Web los cambios que hagas en el tablet. "\n\n"Para seleccionar qué tipo de información se sincronizará con cada cuenta, accede a Ajustes &gt; Cuentas."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Los cambios que hagas en tus cuentas en la Web se reflejarán automáticamente en el teléfono."\n\n"Algunas cuentas como, por ejemplo, las cuentas de Google, también reflejarán en la Web los cambios que hagas en el teléfono. "\n\n"Para seleccionar qué tipo de información se sincronizará con cada cuenta, accede a Ajustes &gt; Cuentas."</string>
     <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>
@@ -1624,13 +1724,16 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Tu conexión de datos se inhabilitará cuando se alcance el límite especificado."\n\n"Como el teléfono es el que calcula los datos y el cálculo del operador puede ser diferente, te recomendamos que uses un límite moderado."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"¿Restringir datos de referencia?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Si restringes los datos móviles de referencia, algunas aplicaciones y algunos servicios no funcionarán sin conexión Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Si restringes los datos móviles en segundo plano, algunas aplicaciones y algunos servicios no funcionarán sin conexión Wi-Fi."\n\n"Esta configuración afecta a todos los usuarios de este tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Si restringes los datos móviles en segundo plano, algunas aplicaciones y algunos servicios no funcionarán sin conexión Wi-Fi."\n\n"Esta configuración afecta a todos los usuarios de este teléfono."</string>
     <string name="data_usage_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_mobile" msgid="5423305619126978393">"Redes móviles"</string>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Tú"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Otros usuarios"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Añadir usuario"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Activo"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Inactivo"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Sin configurar"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Propietario"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Apodo"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Añadir nuevo usuario"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Puedes crear más usuarios para compartir este dispositivo con otras personas. Cada usuario tiene su propio espacio y puede personalizarlo con sus propias aplicaciones, fondos de pantalla y muchas otras cosas. Asimismo, los usuarios pueden modificar las opciones de configuración del tablet, como la conexión Wi-Fi, que afectan a todos los usuarios."\n\n"Después de crear un nuevo usuario, este debe completar un proceso de configuración."\n\n"Cualquier usuario puede aceptar permisos de aplicaciones actualizados en nombre del resto de los usuarios."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Cuendo añadas a un nuevo usuario, deberá completar un proceso de configuración."\n\n"Cualquier usuario puede aceptar permisos de aplicaciones actualizados en nombre del resto de usuarios."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"¿Configurar usuario ahora?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Comprueba que el usuario tiene acceso al tablet y puede configurar su espacio."</string>
+    <string name="user_setup_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_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_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_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_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="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="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">"Difusiones móviles"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona los tipos de alertas de emergencia que quieres ver."</string>
 </resources>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index d58b48a..09c8cc5 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardpiir"</item>
     <item msgid="4071574792028999443">"Taustaprotsessideta"</item>
@@ -277,4 +290,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..fb63cfa 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Ei"</string>
     <string name="create" msgid="3578857613172647409">"Loo"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Tundmatu"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> sammu veel ja olete arendaja."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Seade 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\n"Seade 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 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"Juhtmeta ekraaniühendus on keelatud, sest WiFi-ühendus 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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Seade muutmisel tekkis probleem"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"WiFi optimeerimine"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimeeri aku kasutamine, kui WiFi on sees"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Võrgu lisamine"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Skannimine"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Muu võrk ..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Rohkem"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automaatseadistus (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Seadistuse lõpule viimiseks vajab teie tahvelarvuti WiFi-ühendust. Pärast seadistust saate vahetada mobiilse andmeside ja WiFi vahel."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Sisestage WiFi-ruuteril PIN-kood <xliff:g id="NUMBER">%1$s</xliff:g>. Seadistuse lõpuleviimiseks võib kuluda kuni kaks minutit."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Tahvelarvuti seadistamiseks võib olla vajalik suur võrguaktiivsus."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"HOIATUS: operaatoril võib andmeedastusele kehtida lisahind."\n\n"Telefoni seadistamiseks võib olla vajalik suur võrguaktiivsus."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"HOIATUS: tahvelarvuti ei saa kontrollida, kas teie tarkvara on ajakohane."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"HOIATUS: telefon ei saa kontrollida, kas teie tarkvara on ajakohane."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tahvelarvutil ei õnnestunud luua ühendust selle WiFi-võrguga."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefonil ei õnnestunud luua ühendust selle WiFi-võrguga."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Täpsemad WiFi-seaded"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"WiFi sagedusriba"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Tegevuse sagedusvahemiku määramine"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Kas unustada see rühm?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Kantav WiFi-tööpunkt"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Rakendus pole teie telefoni installitud."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Kasutatud mälu"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Rakenduse arenduse valikute määramine"</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="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="allow_mock_location" msgid="2787962564578664888">"Luba võltsasukohti"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Suurendatult 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\n"Mä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\n"1. samm: vajutage ja hoidke all toitenuppu, kuni kuulete heli või tunnete vibratsiooni."\n\n"2. samm: puudutage ja hoidke kahe sõrmega, kuni kuulete helikinnitust."\n\n"Kui 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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Veebijuurdepääsu täiustamine"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Seaded"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Sees"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Väljas"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Sees"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Väljas"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Lubatud"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Ei ole lubatud"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Luba"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Bluetoothi seade värskendamine"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"sees"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"väljas"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"sisselülitamine"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"väljalülitamine"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Kuva GPU ülejoonistamine"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Parimast halvimani: sin., roh., helepunane, punane"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Keela HW ülekatted"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Kasuta alati GPU-d kuva koostamisel"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Luba jälgimine"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Määratud limiidi saavutamisel keelatakse mobiilne  andmesideühendus."\n\n"Kaaluge konservatiivse limiidi kasutamist, kuna andmekasutust mõõdab teie telefon ja teenusepakkuja võib arvestada kasutust teisiti."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Kas soovite taustandmeid piirata?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Kui piirate mobiilside taustandmed, siis WiFi-võrgu puudumisel mõned rakendused ja teenused ei tööta."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Kui piirate mobiilset taustandmevahetust, siis teatud rakendused ja teenused ei tööta, välja arvatud juhul, kui olete ühenduses WiFi-võrguga."\n\n"Seade mõjutab kõiki tahvelarvuti kasutajaid."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Kui piirate mobiilset taustandmevahetust, siis teatud rakendused ja teenused ei tööta, välja arvatud juhul, kui olete ühenduses WiFi-võrguga."\n\n"Seade mõjutab kõiki telefoni kasutajaid."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Teie"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Teised kasutajad"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Kasutaja lisamine"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Aktiivne"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Pole aktiivne"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Pole seadistatud"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Omanik"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Hüüdnimi"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Uue kasutaja lisamine"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Võite jagada seadet teiste kasutajatega, luues uusi kasutajaid. Igal kasutajal on oma ruum, mida saab kohandada rakenduste, taustapildi ja muuga. Kasutajad saavad kohandada ka tahvelarvuti seadeid, näiteks WiFi valikuid, mis mõjutavad kõiki kasutajaid."\n\n"Pärast uue kasutaja loomist peab kasutaja läbima seadistusprotsessi."\n\n"Iga kasutaja saab teiste kasutajate nimel võtta vastu värskendatud rakenduste lubasid."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Pärast uue kasutaja loomist peab kasutaja läbima seadistusprotsessi."\n\n"Iga kasutaja saab teiste kasutajate nimel võtta vastu värskendatud rakenduste lubasid."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Kas seadistada nüüd kasutaja?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Veenduge, et isik saab tahvelarvutit kasutada ja oma ruumi seadistada"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </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..0e1c59e 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>
@@ -85,7 +85,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>
@@ -133,9 +133,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">
@@ -207,7 +207,7 @@
     <item msgid="6848428671997893147">"مشخص نشده"</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>
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"حد استاندارد"</item>
     <item msgid="4071574792028999443">"بدون پردازش در پس‌زمینه"</item>
@@ -277,4 +290,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..fd5e936 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"خیر"</string>
     <string name="create" msgid="3578857613172647409">"ایجاد"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ناشناس"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"شما در حال حاضر، <xliff:g id="STEP_COUNT">%1$d</xliff:g> قدم تا برنامه‌نویس شدن فاصله دارید."</string>
+    <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 +87,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>
@@ -161,7 +166,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 +195,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 +245,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>
@@ -267,6 +273,8 @@
     <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 +291,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 +305,8 @@
     <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="location_settings_title" msgid="4483843407328665068">"دسترسی به موقعیت مکانی"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"امنیت"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل محل ذخیره اطلاعات کاربری"</string>
@@ -362,7 +372,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>
@@ -477,9 +487,30 @@
     <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="7363832031876872257">"صفحه نمایش بی‌سیم غیرفعال است زیرا 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_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,7 +519,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"خاموش"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"در دسترس نیست زیرا NFC خاموش است"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"هنگام تغییر تنظیمات مشکلی رخ داد"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"بهینه‌سازی Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"به حداقل رساندن مصرف باتری زمانی که Wi-Fi روشن است"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"افزودن شبکه"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"شبکه‌های 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_scan" msgid="1470911530412095868">"اسکن"</string>
@@ -521,23 +555,24 @@
     <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_other_network" msgid="1048006316504242214">"شبکه‌ای دیگر…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"بیشتر"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"تنظیم خودکار (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"برای تکمیل نصب، رایانه لوحی شما باید به Wi-Fi دسترسی پیدا کند. بعد از نصب، می‌توانید بین داده‌های تلفن همراه و Wi-Fi جابجا شوید."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"نمایش گزینه‌های پیشرفته"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"نصب 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_pin" msgid="8067502591043979939">"پین <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_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_security" msgid="6603611185592956936">"امنیت"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"قدرت سیگنال"</string>
     <string name="wifi_status" msgid="4824568012414605414">"وضعیت"</string>
@@ -571,6 +606,14 @@
     <string name="wifi_save" msgid="3331121567988522826">"ذخیره"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"شبکه ذخیره نشد"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"لغو"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"با این وجود، رد می‌شوید"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"رد نمی‌شوید"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"اخطار: ممکن است هزینه‌ حامل مخابراتی اضافی از شما دریافت شود."\n\n"راه‌اندازی رایانه لوحی ممکن است به فعالیت شبکه قابل‌ توجهی نیاز داشته باشد."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"اخطار: ممکن است هزینه‌ حامل مخابراتی اضافی از شما دریافت شود."\n\n"راه‌اندازی تلفن ممکن است به فعالیت شبکه قابل‌ توجهی نیاز داشته باشد."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"اخطار: رایانه لوحی به‌روز بودن نرم‌افزار شما را تأیید نمی‌کند."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"اخطار: تلفن نمی‌تواند به‌روز بودن نرم‌افزار شما را تأیید کند."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"رایانه لوحی قادر به اتصال به این شبکه Wi-Fi نیست."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"تلفن قادر به اتصال به این شبکه Wi-Fi نیست."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi پیشرفته"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"باند فرکانس Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"تعیین دامنه فرکانس عملکرد"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"اگر اتصال شما قطع شود، اتصال شما با <xliff:g id="PEER_NAME">%1$s</xliff:g> و سایر دستگاه‌های <xliff:g id="PEER_COUNT">%2$s</xliff:g> به پایان خواهد رسید."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"دعوتنامه لغو شود؟"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"آیا می‌خواهید دعوت برای ارتباط با <xliff:g id="PEER_NAME">%1$s</xliff:g> را لغو کنید؟"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"این گروه فراموش شود؟"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"نقطه اتصال 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>
@@ -615,7 +662,7 @@
     <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="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="incoming_call_volume_title" msgid="8073714801365904099">"آهنگ زنگ"</string>
@@ -671,15 +718,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>
@@ -710,12 +758,13 @@
     <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,8 +781,8 @@
     <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_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>
@@ -748,6 +797,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 +806,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 +821,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 +840,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>
@@ -897,9 +951,9 @@
     <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_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_gps" msgid="8392461023569708478">"ماهواره‌های GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"به برنامه‌های کاربردی اجازه داده شود برای مشخص کردن دقیق مکان شما از GPS رایانه لوحیتان استفاده کنند"</string>
@@ -909,14 +963,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>
@@ -966,12 +1021,13 @@
     <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="activity_not_found" msgid="5551664692991605325">"برنامه کاربردی در گوشی شما نصب نشد."</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="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="manageapplications_settings_title" msgid="7041951105633616745">"مدیریت برنامه‌ها"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"مدیریت و حذف برنامه‌های نصب شده"</string>
     <string name="applications_settings" msgid="1721442176406964682">"برنامه‌ها"</string>
@@ -981,6 +1037,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 +1059,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,7 +1074,7 @@
     <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>
@@ -1025,11 +1085,12 @@
     <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_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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"استفاده از حافظه"</string>
@@ -1094,6 +1159,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>
@@ -1195,10 +1262,12 @@
     <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="enable_adb" msgid="7982306934419797485">"رفع عیب USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"با اتصال USB حالت رفع عیب فعال شود"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"گزارش‌های اشکال در منوی نیرو"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"گزینه‌ای در منوی نیرو برای گرفتن گزارش اشکال اضافه شود"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"بیدار ماندن"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"صفحه هرگز در حین شارژ شدن به حالت خواب نمی‌رود"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"مکان‌های کاذب مجاز هستند"</string>
@@ -1207,6 +1276,8 @@
     <string name="adb_warning_message" msgid="7316799925425402244">"رفع عیب 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>
@@ -1234,14 +1305,23 @@
     <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_toggle_script_injection_preference_title" msgid="7950932054266694403">"بهبود قابلیت دسترسی وب"</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_feature_state_on" msgid="2864292320042673806">"فعال"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"غیرفعال"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"مجاز"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"مجاز نیست"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"اجازه داده شود"</string>
@@ -1270,7 +1350,7 @@
     <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_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>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <string name="gadget_title" msgid="5519037532720577836">"کنترل نیرو"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"به‌روزرسانی تنظیمات Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"به‌روزرسانی تنظیمات بلوتوث"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"فعال"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"غیرفعال"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"روشن کردن"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"در حال خاموش کردن"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1406,19 +1501,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="9157861529438245957">"تهیهٔ نسخهٔ پشتیبان از داده‌های برنامه، گذرواژه‌های 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 +1518,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="7218566008912418809">"تهیهٔ نسخهٔ پشتیبان را از گذرواژه‌های 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>
@@ -1483,23 +1575,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 +1600,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 />
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"نمایش بازنویسی GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"از بهترین تا بدترین: آبی، سبز، قرمز روشن، قرمز"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"غیر فعال کردن پوشش HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"همیشه از GPU در ترکیب صفحه استفاده شود"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"فعال کردن ردیابی"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1607,7 +1707,7 @@
     <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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"زمانی که مقدار تعیین شده استفاده از داده برای شما به پایان برسد، اتصال داده‌ شما تلفن همراه شما غیرفعال می‌شود."\n\n"از آنجا که مقدار استفاده از داده، توسط گوشی شما محاسبه شده است و شرکت مخابراتی شما ممکن است استفاده از داده را به صورت دیگری محاسبه کند، لطفاً سقف محتاطانه‌تری را در نظر بگیرید."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"محدود کردن داده‌های پس‌زمینه؟"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"در صورت محدود کردن داده‌های تلفن همراه در پس‌زمینه، برخی از برنامه‌های کاربردی و سرویس‌ها کار نمیکنند مگر آنکه به شبکه Wi-Fi متصل شوید."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"اگر شما داده‌های تلفن همراه پس‌زمینه را محدود کنید، برخی از برنامه‌ها و سرویس‌ها تنها در صورتی کار می‌کنند که به یک شبکه Wi-Fi متصل شوید."\n\n" این تنظیم روی همه کاربران موجود در این رایانه لوحی تأثیر می‌گذارد."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"اگر شما داده‌های تلفن همراه پس‌زمینه را محدود کنید، برخی از برنامه‌ها و سرویس‌ها تنها در صورتی کار می‌کنند که به یک شبکه Wi-Fi متصل شوید."\n\n" این تنظیم روی همه کاربران موجود در این تلفن تأثیر می‌گذارد."</string>
     <string name="data_usage_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>
@@ -1650,7 +1753,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 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"شما"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"کاربران دیگر"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"افزودن کاربر"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"فعال"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"غیرفعال"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"تنظیم نشده"</string>
+    <string name="user_owner" msgid="3879126011135546571">"مالک"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"نام مستعار"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"اضافه کردن کاربر جدید"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"شما می‌توانید با ایجاد کاربران اضافی، این دستگاه را با سایر افراد به اشتراک بگذارید. هر کاربر فضای مخصوص به خود دارد و می‌تواند این فضا را با برنامه‌ها، تصویر زمینه و موارد دیگر خود سفارشی کند. کاربران همچنین می‌توانند تنظیماتی را در رایانه لوحی ایجاد کنند که بر همه کاربرها تأثیر می‌گذارد، مانند Wi-Fi."\n\n"بعد از ایجاد یک کاربر جدید، آن شخص باید مرحله تنظیم را انجام دهد."\n\n"هر کاربر می‌تواند مجوزهای برنامه به‌روز شده را از طرف همه کاربران دیگر بپذیرد."</string>
+    <string name="user_add_user_message_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_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index fb8efd9..41dfd36 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Vakioraja"</item>
     <item msgid="4071574792028999443">"Ei taustaprosesseja"</item>
@@ -277,4 +290,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..b00eb7b 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Ei"</string>
     <string name="create" msgid="3578857613172647409">"Luo"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Tuntematon"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Kehittäjäasetukset otetaan käyttöön <xliff:g id="STEP_COUNT">%1$d</xliff:g> vaiheen päästä."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Tä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\n"Tä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 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"Langaton näyttäminen 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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Asetuksen vaihtaminen epäonnistui"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wifi-optimointi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Vähennä akun kulutusta, kun wifi on käytössä"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Lisää verkko"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Etsi"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Muu verkko..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lisää"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automaattiset aset. (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Asetuksien viimeistelyyn vaaditaan wifi-yhteys. Asetuksien määrittämisen jälkeen voit käyttää mobiiliverkkoyhteyttä tai wifi-yhteyttä."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Näppäile wifi-reitittimen pin-koodi <xliff:g id="NUMBER">%1$s</xliff:g>. Asennus voi kestää kaksi minuuttia."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Tablet-laitteen asetusten määrittäminen voi vaatia paljon tiedonsiirtoa."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"VAROITUS: Voit joutua maksamaan ylimääräisiä tiedonsiirtomaksuja."\n\n"Puhelimen asetusten määrittäminen voi vaatia paljon tiedonsiirtoa."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"VAROITUS: tablet-laite ei voi tarkistaa, onko ohjelmisto ajan tasalla."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"VAROITUS: puhelin ei voi tarkistaa, onko ohjelmisto ajan tasalla."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tablet-laite ei voi muodostaa yhteyttä tähän wifi-verkkoon."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Puhelin ei voi muodostaa yhteyttä tähän wifi-verkkoon."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Edistynyt wifi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wifi-taajuusalue"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Määritä toiminnan taajuusalue"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Unohdetaanko tämä ryhmä?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Kannettava wifi-yhteyspiste"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -910,13 +964,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Sovellusta ei ole asennettu puhelimeesi."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Tallennustilan käyttö"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Valitse sovellusten kehittämisasetukset"</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="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="allow_mock_location" msgid="2787962564578664888">"Salli sijaintien imitointi"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Lä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\n"Huomaa: 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\n"Vaihe 1: paina virtapainiketta, kunnes kuulet äänen tai tunnet värinän."\n\n"Vaihe 2: kosketa kahdella sormella, kunnes kuulet äänivahvistuksen."\n\n"Jos 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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Paranna verkon esteettömyyttä"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Asetukset"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Käytössä"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Pois"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Käytössä"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Pois käyt."</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Sallittu"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Ei sallittu"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Salli"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Päivitetään Bluetooth-asetuksia"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"käytössä"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"pois käytöstä"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"otetaan käyttöön"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"poistetaan käytöstä"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wifi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Näytä GPU-ylitys"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Paras -&gt; huonoin: sin., vihr., vaal.pun., pun."</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Poista HW-peittok. käyt."</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Käytä GPU:ta ruudun koostamiseen"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Ota jäljitys käyttöön"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobiiliyhteytesi poistetaan käytöstä, jos määritetty tiedonsiirtoraja saavutetaan."\n\n"Puhelin mittaa tiedonsiirron. Operaattorisi voi kuitenkin käyttää eri mittaustapaa, joten suosittelemme määrittämään rajan todellista käyttöä tiukemmaksi."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Rajoitetaanko taustatiedonsiirtoa?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Jos rajoitat taustalla tapahtuvaa mobiilitiedonsiirtoa, jotkin sovellukset ja palvelut eivät toimi, ellei wifi-verkko ole käytettävissä."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Jos rajoitat taustalla tapahtuvaa mobiilitiedonsiirtoa, jotkin sovellukset ja palvelut eivät toimi, ellet ole yhteydessä wifi-verkkoon."\n\n"Tämä asetus vaikuttaa kaikkiin tämän tablet-laitteen käyttäjiin."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Jos rajoitat taustalla tapahtuvaa mobiilitiedonsiirtoa, jotkin sovellukset ja palvelut eivät toimi, ellet ole yhteydessä wifi-verkkoon."\n\n"Tämä asetus vaikuttaa kaikkiin tämän puhelimen käyttäjiin."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Sinä"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Muut käyttäjät"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Lisää käyttäjä"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Aktiivinen"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Ei aktiivinen"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Ei määritetty"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Omistaja"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Lempinimi"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Lisää uusi käyttäjä"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Voit jakaa tämän laitteen muiden kanssa luomalla uusia käyttäjiä. Jokaisella käyttäjällä on oma tila, johon he voivat lisätä omia sovelluksiaan, taustakuvan ynnä muuta. Käyttäjät voivat myös muokata kaikkiin käyttäjiin vaikuttavia tablet-laitteen asetuksia, kuten wifi-yhteysasetuksia."\n\n"Kun luot uuden käyttäjän, hänen täytyy määrittää omat asetuksensa."\n\n"Kaikki käyttäjät voivat hyväksyä päivitettyjä sovelluksien lupia muiden käyttäjien puolesta."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Kun luot uuden käyttäjän, hänen täytyy määrittää omat asetuksensa."\n\n"Kaikki käyttäjät voivat hyväksyä päivitettyjä sovelluksien lupia muiden käyttäjien puolesta."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Määritetäänkö käyttäjän asetukset nyt?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Varmista, että tämä henkilö voi ottaa tablet-laitteen käyttöönsä, ja määritä hänen tilansa asetukset"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 3304e32..0e963b3 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -91,7 +91,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 +105,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) -->
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite standard"</item>
     <item msgid="4071574792028999443">"Aucun processus en arrière-plan"</item>
@@ -277,4 +290,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..81496c3 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Non"</string>
     <string name="create" msgid="3578857613172647409">"Créer"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Inconnu"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Plus que <xliff:g id="STEP_COUNT">%1$d</xliff:g> étapes pour devenir un développeur."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Ce 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\n"Ce 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 +305,9 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"L\'affichage sans fil est désactivé, car la connexion Wi-Fi est inactive."</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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Un problème est survenu lors de la modification des paramètres."</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimisation Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimiser la consommation de la batterie lorsque le Wi-Fi est activé"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Ajouter un réseau"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Rechercher"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Autre réseau…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Plus"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuration auto (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Pour terminer la configuration de votre tablette, vous devez disposer d\'un accès Wi-Fi. Une fois la configuration effectuée, vous pouvez choisir d\'utiliser un forfait de données pour mobile ou un réseau Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Saisissez le code <xliff:g id="NUMBER">%1$s</xliff:g> sur votre routeur Wi-Fi. La configuration peut prendre jusqu\'à deux minutes."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"La configuration de la tablette peut générer une forte activité sur le réseau."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AVERTISSEMENT : Des frais supplémentaires de connexion à Internet peuvent être appliqués par votre opérateur."\n\n"La configuration du téléphone peut générer une forte activité sur le réseau."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"AVERTISSEMENT : La tablette ne sera pas en mesure de vérifier que votre logiciel est à jour."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"AVERTISSEMENT : Le téléphone ne sera pas en mesure de vérifier que votre logiciel est à jour."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Connexion impossible de la tablette à ce réseau Wi-Fi gratuit."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Connexion impossible du téléphone à ce réseau Wi-Fi gratuit."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Paramètres Wi-Fi avancés"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Plage de fréquences Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Définir la plage de fréquences"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Voulez-vous vraiment supprimer ce groupe ?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Point d\'accès Wi-Fi"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,7 @@
     <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>
@@ -960,12 +1015,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="activity_not_found" msgid="5551664692991605325">"L\'application n\'est pas installée sur votre téléphone."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Utilisation du stockage"</string>
@@ -1094,6 +1159,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,7 +1194,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" msgid="3001113966880559611">"Faire apparaître mots de passe"</string>
     <string name="show_password_summary" msgid="7345931695292850058"></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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Définir les options pour le développement de l\'application"</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="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="allow_mock_location" msgid="2787962564578664888">"Positions fictives"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Lorsque 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\n"Remarque : 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\n"Si 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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Améliorer l\'accessibilité Web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Paramètres"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Activé"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Désactivé"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activé"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Désactivé"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Autorisé"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Non autorisé"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Autoriser"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Mise à jour des paramètres Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"activé"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"désactivé"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"activation"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"désactivation"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Afficher dépassements GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Du mieux au pire : bleu, vert, rouge clair, rouge"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Désact. superpos. matér."</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Toujours utiliser le GPU pour la composition écran"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Activer les traces"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Votre connexion Internet mobile sera désactivée une fois le seuil défini atteint."\n\n"La consommation des données étant mesurée par le téléphone, celle mesurée par votre opérateur peut différer. Nous vous recommandons donc de définir un seuil plus bas."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Limiter les données en arrière-plan ?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Si vous limitez les données mobiles en arrière-plan, certains services et applications ne fonctionneront que si vous êtes connecté à un réseau Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Si vous limitez les données mobiles en arrière-plan, certaines applications et certains services ne fonctionneront pas correctement, sauf si vous êtes connecté à un réseau Wi-Fi."\n\n"Ce paramètre affecte tous les utilisateurs de cette tablette."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Si vous limitez les données mobiles en arrière-plan, certaines applications et certains services ne fonctionneront pas correctement, sauf si vous êtes connecté à un réseau Wi-Fi."\n\n"Ce paramètre affecte tous les utilisateurs de ce téléphone."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1794,46 @@
     <!-- 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="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_you_section" msgid="6247838798859425408">"Vous"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Autres utilisateurs"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Ajouter utilisateur"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Actif"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Inactif"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Non configuré"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Propriétaire"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Pseudonyme"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Ajouter un utilisateur"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Vous pouvez partager cet appareil avec d\'autres personnes en créant des utilisateurs supplémentaires. Chaque utilisateur dispose de son propre espace, où il peut personnaliser ses propres applications, ses fonds d\'écran, et autres. Chacun peut également modifier les paramètres d\'une tablette, tels que le Wi-Fi, qui affectent tous les utilisateurs."\n\n"Lorsque vous créez un nouvel utilisateur, celui-ci doit suivre une procédure d\'installation."\n\n"N\'importe quel utilisateur peut accepter des autorisations mises à jour pour les applications au nom de tous les autres."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Lorsque vous créez un nouvel utilisateur, celui-ci doit suivre une procédure d\'installation."\n\n"N\'importe quel utilisateur peut accepter des autorisations mises à jour pour les applications au nom de tous les autres."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurer l\'utilisateur ?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Assurez-vous que la personne est disponible, et qu\'elle peut utiliser la tablette et configurer son espace."</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 63c672d..c6c7aab 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"मानक सीमा"</item>
     <item msgid="4071574792028999443">"कोई पृष्ठभूमि प्रक्रियाएं नहीं"</item>
@@ -277,4 +290,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..2edb73c 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"नहीं"</string>
     <string name="create" msgid="3578857613172647409">"बनाएं"</string>
     <string name="device_info_default" msgid="7847265875578739287">"अज्ञात"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"अब आप डेवलपर बनने से <xliff:g id="STEP_COUNT">%1$d</xliff:g> चरण दूर हैं."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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 +299,14 @@
     <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="location_settings_title" msgid="4483843407328665068">"स्थान पहुंच"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"सुरक्षा"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"मेरा स्‍थान, स्‍क्रीन अनलॉक, सिम कार्ड लॉक, क्रेडेंशियल संग्रहण लॉक सेट करें"</string>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"वायरलेस प्रदर्शन अक्षम है क्योंकि 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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"सेटिंग बदलने में एक समस्‍या थी"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi ऑप्टिमाइज़ेशन"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Wi-Fi के चालू रहने पर बैटरी उपयोग को न्यूनतम करें"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"नेटवर्क जोड़ें"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"स्कैन करें"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"अन्‍य नेटवर्क…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"अधिक"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"स्‍वचालित सेटअप (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"सेटअप पूर्ण करने के लिए, आपके टेबलेट को Wi-Fi का उपयोग करना होगा. सेटअप के बाद, आप मोबाइल डेटा और Wi-Fi के बीच स्विच कर सकते हैं."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"उन्नत विकल्प दिखाएं"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"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_pin" msgid="8067502591043979939">"अपने 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_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>
@@ -571,6 +606,14 @@
     <string name="wifi_save" msgid="3331121567988522826">"सहेजें"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"नेटवर्क सहेजने में विफल रहा"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"रद्द करें"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"फिर भी छोड़ें"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"छोड़े नहीं"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"चेतावनी: आपको अतिरिक्त वाहक डेटा शुल्क लग सकते हैं."\n\n"टेबलेट सेटअप के लिए महत्वपूर्ण नेटवर्क गतिविधि की आवश्यकता हो सकती है."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"चेतावनी: आपको अतिरिक्त वाहक डेटा शुल्क लग सकते हैं."\n\n"फ़ोन सेटअप के लिए महत्वपूर्ण नेटवर्क गतिविधि की आवश्यकता हो सकती है."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"चेतावनी: टेबलेट यह सत्यापित नहीं कर सकेगा कि आपका सॉफ़्टवेयर अद्यतित है."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"चेतावनी: फ़ोन यह सत्यापित नहीं कर सकेगा कि आपका सॉफ़्टवेयर अद्यतित है."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"टेबलेट इस Wi-Fi नेटवर्क से कनेक्ट नहीं कर सका."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"फ़ोन इस Wi-Fi नेटवर्क से कनेक्ट नहीं कर सका."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"उन्‍नत Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi फ़्रीक्वेंसी बैंड"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"संचालन की फ़्रीक्‍वेंसी रेंज निर्दिष्ट करें"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"यदि आप डिस्‍कनेक्‍ट करते हैं, तो <xliff:g id="PEER_NAME">%1$s</xliff:g> और <xliff:g id="PEER_COUNT">%2$s</xliff:g> अन्‍य उपकरणों के साथ आपका कनेक्‍शन समाप्त हो जाएगा."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"आमंत्रण रद्द करें?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"क्या आप <xliff:g id="PEER_NAME">%1$s</xliff:g> से कनेक्ट होने का आमंत्रण रद्द करना चाहते हैं?"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"इस समूह को भूलें?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"पोर्टेबल 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>
@@ -666,20 +713,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"आपके फ़ोन पर एप्लिकेशन इंस्टॉल नहीं है."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB संग्रहण"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD कार्ड पर"</string>
     <string name="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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"संग्रहण उपयोग"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"एप्‍लिकेशन विकास के लिए विकल्‍प सेट करें"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB डीबग करना"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"डीबग मोड जब USB कनेक्‍ट किया गया हो"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"पावर मेनू बग रिपोर्ट"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"बग रिपोर्ट लेने के लिए पावर मेनू में विकल्‍प शामिल करें"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"सचेत रहें"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"चार्ज होने के दौरान स्‍क्रीन कभी निष्‍क्रिय नहीं होगी"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"कृत्रिम स्‍थानों को अनुमति दें"</string>
@@ -1207,6 +1276,8 @@
     <string name="adb_warning_message" msgid="7316799925425402244">"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>
@@ -1234,14 +1305,23 @@
     <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_toggle_script_injection_preference_title" msgid="7950932054266694403">"वेब पहुंच-योग्यता को उन्नत करें"</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_feature_state_on" msgid="2864292320042673806">"चालू"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"बंद"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"अनुमति है"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"अनुमति नहीं"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"अनुमति दें"</string>
@@ -1280,7 +1360,7 @@
     <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>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <string name="gadget_title" msgid="5519037532720577836">"पावर नियंत्रण"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Wi-Fi सेटिंग अपडेट कर रहा है"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth सेटिंग अपडेट कर रहा है"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"चालू"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"बंद"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"चालू हो रहा है"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"बंद हो रहा है"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1549,6 +1641,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"GPU ओवरड्रॉ दिखाएं"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"सबसे अच्छे से सबसे खराब: नीला, हरा, हल्का लाल, लाल"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW ओवरले अक्षम करें"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"स्‍क्रीन संयोजन के लिए हमेशा GPU का उपयोग करें"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"ट्रेस सक्षम करें"</string>
@@ -1556,17 +1652,21 @@
     <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="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>
@@ -1625,9 +1725,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"निर्दिष्ट सीमा तक पहुंचने पर आपका डेटा कनेक्‍शन अक्षम हो जाएगा."\n\n"चूंकि डेटा उपयोग को आपके फ़ोन द्वारा मापा जाता है, और आपका वाहक उपयोग के लिए भिन्‍न तरह से शुल्क ले सकता है, इसलिए सीमित उपयोग पर विचार करें."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"पृष्ठभूमि डेटा प्रतिबंधित करें?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"यदि आप पृष्ठभूमि मोबाइल डेटा को प्रतिबंधित करते हैं, तो जब तक आप Wi-Fi नेटवर्क से कनेक्ट नहीं होते, कुछ एप्लिकेशन और सेवाएं काम नहीं करेंगी."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"यदि आप पृष्ठभूमि मोबाइल डेटा प्रतिबंधित करते हैं, तो कुछ एप्लिकेशन और सेवाएं तब तक कार्य नहीं करेंगी जब तक कि आप Wi-Fi नेटवर्क से कनेक्ट नहीं होते."\n\n"यह सेटिंग इस टेबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"यदि आप पृष्ठभूमि मोबाइल डेटा प्रतिबंधित करते हैं, तो कुछ एप्लिकेशन और सेवाएं तब तक कार्य नहीं करेंगी जब तक कि आप Wi-Fi नेटवर्क से कनेक्ट नहीं होते."\n\n"यह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="data_usage_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>
@@ -1668,6 +1771,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 +1793,46 @@
     <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="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_you_section" msgid="6247838798859425408">"आप"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"अन्य उपयोगकर्ता"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"उपयोगकर्ता जोड़ें"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"सक्रिय"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"सक्रिय नहीं"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"सेट नहीं है"</string>
+    <string name="user_owner" msgid="3879126011135546571">"स्वामी"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"प्रचलित नाम"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"नया उपयोगकर्ता जोड़ें"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"आप अतिरिक्त उपयोगकर्ता बनाकर इस उपकरण को अन्य लोगों से साझा कर सकते हैं. प्रत्येक उपयोगकर्ता के पास अपना स्वयं का स्थान होता है, जिसे वे अपने एप्लिकेशन, वॉलपेपर, और ऐसी ही अन्य चीज़ों के साथ कस्टमाइज़ कर सकते हैं. उपयोगकर्ता Wi-Fi जैसी अन्य टेबलेट सेटिंग भी एडजस्ट कर सकते हैं जो सभी को प्रभावित करती है."\n\n"आपके द्वारा नया उपयोगकर्ता बनाने के बाद, उस व्यक्ति को सेटअप प्रक्रिया से गुज़रना आवश्यक है."\n\n"कोई भी उपयोगकर्ता अन्य सभी उपयोगकर्ताओं की ओर से अपडेट की गई एप्लिकेशन अनुमतियां स्वीकार कर सकता है."</string>
+    <string name="user_add_user_message_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_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 0f87f8b..c36d6f2 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardna granica"</item>
     <item msgid="4071574792028999443">"Nema pozadinskih procesa"</item>
@@ -277,4 +290,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..01d4a01 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Ne"</string>
     <string name="create" msgid="3578857613172647409">"Izradi"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nepoznato"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Postat ćete razvojni programer za ovoliko koraka: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Ova 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\n"Ova 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 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"Bežični prikaz onemogućen je 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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Pojavio se problem s promjenom postavke"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimizacija Wi-Fija"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimiziraj potrošnju baterije kad je Wi-Fi uključen"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Dodaj mrežu"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Skeniraj"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Ostale mreže…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Više"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. postavljanje (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Da bi se postavljanje dovršilo, vaše tabletno računalo treba pristupiti Wi-Fi mreži. Nakon postavljanja možete izmjenjivati mobilnu podatkovnu vezu i Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Unesite PIN <xliff:g id="NUMBER">%1$s</xliff:g> na svoj Wi-Fi usmjerivač. Postavljanje može potrajati do dvije minute."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Za postavljanje tabletnog računala može biti potrebna značajna mrežna aktivnost."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"UPOZORENJE: mogući su dodatni troškovi za promet podataka."\n\n"Za postavljanje telefona može biti potrebna značajna mrežna aktivnost."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"UPOZORENJE: tabletno računalo neće moći potvrditi da je vaš softver ažuriran."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"UPOZORENJE: telefon neće moći potvrditi da je vaš softver ažuriran."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tabletno računalo nije se moglo povezati s ovom Wi-Fi mrežom."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefon se nije mogao povezati s ovom Wi-Fi mrežom."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Napredni Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi pojas frekvencije"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Odredi raspon frekvencije rada"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Zaboraviti ovu grupu?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prijenosna pristupna WiFi točka"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Uključivanje žarišne točke…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Isključivanje žarišne točke…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Aktivna je prijenosna WiFi pristupna točka <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Pogreška prijenosne WiFi pristupne točke"</string>
     <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Postavljanje WiFi pristupne točke"</string>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Aplikacija nije instalirana na vašem telefonu."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Upotreba pohrane"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Postavljanje opcija za razvoj aplikacije"</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="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="allow_mock_location" msgid="2787962564578664888">"Dopusti probne lokacije"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Nakon 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\n"Napomena: 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\n"1. korak: pritisnite i držite gumb za uključivanje/isključivanje dok ne začujete zvuk ili osjetite vibraciju."\n\n"2. korak: dodirnite i držite s dva prsta dok ne začujete zvučnu potvrdu."\n\n"Ako 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 uklj./isk. završava poziv"</string>
+    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Izgovori zaporke"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Dodirnite i držite odgodu"</string>
+    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Poboljšavanje web-pristupačnosti"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Postavke"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Uključeno"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Isključeno"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Uključeno"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Isključeno"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Dopušteno"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nije dopušteno"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Omogući"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Ažuriranje postavke Bluetootha"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"uključeno"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"isključeno"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"uključivanje"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"isključivanje"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Prikaz preoptereć. GPU-a"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Najbolje do najgoreg: plavo, zeleno, svjetlocrveno, crveno"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Onemogući HW preklapanja"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Uvijek upotrijebi GPU kod slaganja zaslona"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Omogući tragove"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Vaša podatkovna veza mobilnog uređaja bit će onemogućena kada dosegnete navedeno ograničenje."\n\n"Budući da potrošnju podataka mjeri vaš telefon, a vaš mobilni operater možda obračunava na neki drugi način, razmislite o postavljanju opreznijeg ograničenja."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Ograničenje pozadinskih podataka?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge neće raditi ako niste povezani s Wi-Fi mrežom."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge neće raditi ako niste spojeni na Wi-Fi mrežu."\n\n"Ova postavka utječe na sve korisnike na ovom tabletu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge neće raditi ako niste spojeni na Wi-Fi mrežu."\n\n"Ova postavka utječe na sve korisnike na ovom telefonu."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Vi"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Drugi korisnici"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj korisnika"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Aktivan"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Nije aktivan"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nije postavljen"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Vlasnik"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Nadimak"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Dodaj novog korisnika"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Ovaj uređaj možete dijeliti s drugima tako da stvorite nove korisnike. Svaki korisnik ima vlastiti prostor koji može prilagoditi sa svojim aplikacijama, pozadinom i sličnim stvarima. Korisnici također mogu podesiti postavke tabletnog računala, primjerice Wi-Fi, koje utječu na sve."\n\n"Nakon što stvorite novog korisnika, ta osoba mora proći postupak postavljanja."\n\n"Bilo koji korisnik može prihvatiti ažurirane dozvole aplikacija u ime svih drugih korisnika."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Nakon što stvorite novog korisnika, ta osoba mora proći postupak postavljanja."\n\n"Bilo koji korisnik može prihvatiti ažurirane dozvole aplikacija u ime svih drugih korisnika."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Postaviti korisnika sada?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Provjerite može li osoba uzeti tabletno računalo i postaviti svoj prostor"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 653f0b1..1f4bdaa 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Normál korlátozás"</item>
     <item msgid="4071574792028999443">"Nincsenek háttérfolyamatok"</item>
@@ -277,4 +290,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..39a5af8 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Nem"</string>
     <string name="create" msgid="3578857613172647409">"Létrehozás"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ismeretlen"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> lépésre van attól, hogy fejlesztő legyen."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Ez 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\n"Ez 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 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Probléma adódott a beállítás megváltoztatásakor"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi optimalizálása"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Az akkumulátorhasználat minimalizálása, ha a Wi-Fi be van kapcsolva"</string>
     <string name="wifi_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_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_scan" msgid="1470911530412095868">"Keresés"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Másik hálózat..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Egyebek"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automat. beállítás (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"A telepítés befejezéséhez a táblagépnek Wi-Fi hálózatra van szüksége. A beállítás után válthat a mobil adatforgalom és a Wi-Fi között."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Írja be a Wi-Fi router PIN kódját (<xliff:g id="NUMBER">%1$s</xliff:g>). A telepítés legfeljebb 2 percet vesz igénybe."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"A táblagép beállításához jelentős hálózati tevékenységre lehet szükség."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"FIGYELEM: Előfordulhat, hogy szolgáltatója további adatátviteli díjakat számít fel."\n\n"A telefon beállításához jelentős hálózati tevékenységre lehet szükség."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"FIGYELEM: A táblagép nem tudja ellenőrizni, hogy a szoftver naprakész-e."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"FIGYELEM: A telefon nem tudja ellenőrizni, hogy a szoftver naprakész-e."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"A táblagép nem tudott csatlakozni ehhez a Wi-Fi hálózathoz."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"A telefon nem tudott csatlakozni ehhez a Wi-Fi hálózathoz."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Haladó Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi frekvenciasáv"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Adja meg a működési frekvenciatartományt"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Elfelejtse ezt a csoportot?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hordozható Wi-Fi hotspot"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Az alkalmazás már nincs telepítve a telefonján."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Tárhely-használat"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Alkalmazásfejlesztési beállítások megadása"</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="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="allow_mock_location" msgid="2787962564578664888">"Helyutánzatok engedélyezése"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Nagyí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\n"Megjegyzé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\n"1. lépés: tartsa lenyomva a bekapcsológombot a hangjelzésig vagy rezgésig."\n\n"2. lépés: két ujját tartsa lenyomva a hangjelzéssel történő jóváhagyásig."\n\n"Ha 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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Webelérhetőség fokozása"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Beállítások"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Be"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Ki"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"be"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Ki"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Engedélyezett"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nem lehetséges"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Engedélyezés"</string>
@@ -1287,7 +1367,7 @@
     <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>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Bluetooth beállítások frissítése"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"be"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"ki"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"bekapcsolás"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"kikapcsolás"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1450,7 +1542,7 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"GPU-kitakarás megjelenít."</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Legjobbtól a legrosszabbig: kék, zöld, piros"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW fedvények letiltása"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Mindig a GPU használata képernyő-feldolgozáshoz"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Nyomkövetés engedélyezése"</string>
@@ -1555,17 +1651,21 @@
     <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="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 szim."</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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"A mobilhálózat adatkapcsolatát a rendszer letiltja a megadott korlát elérésekor."\n\n"Mivel az adathasználatot a telefon méri, és a szolgáltató mérése eltérhet ettől, célszerű óvatosabb korlátot beállítani."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Korlátozza a háttéradatokat?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ha korlátozza a háttérben zajló mobiladat-forgalmat, néhány alkalmazás és szolgáltatás nem fog működni, ha a Wi-Fi nincs engedélyezve."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Ha korlátozza a háttérben futó mobil adatátvitelt, bizonyos alkalmazások és szolgáltatások nem fognak működni, amíg nem kapcsolódik Wi-Fi hálózathoz."\n\n"Ez a beállítás minden felhasználót érint ezen a táblagépen."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Ha korlátozza a háttérben futó mobil adatátvitelt, bizonyos alkalmazások és szolgáltatások nem fognak működni, amíg nem kapcsolódik Wi-Fi hálózathoz."\n\n"Ez a beállítás minden felhasználót érint ezen a telefonon."</string>
     <string name="data_usage_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>
@@ -1648,7 +1751,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 +1770,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 +1794,46 @@
     <!-- 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="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_you_section" msgid="6247838798859425408">"Ön"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Egyéb felhasználók"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Felhasználó hozzáad."</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Aktív"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Inaktív"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nincs beállítva"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Tulajdonos"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Becenév"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Új felhasználó hozzáadása"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Ezt a készüléket további felhasználókat létrehozva megoszthatja más emberekkel. Minden felhasználó rendelkezik saját térrel, amelyet személyre szabhat saját alkalmazásaival, háttérképével stb. A felhasználók módosíthatják a táblagép olyan beállításait is, amelyek mindenkit érintenek, például a Wi-Fi beállításait."\n" "\n"Miután létrehoz egy új felhasználót, az adott személynek keresztül kell mennie egy telepítési folyamaton."\n" "\n"Minden felhasználó elfogadhatja a frissített alkalmazások engedélyeit az összes többi felhasználó nevében."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Miután létrehozott egy új felhasználót, az adott személynek keresztül kell mennie egy telepítési folyamaton."\n" "\n"Minden felhasználó elfogadhatja a frissített alkalmazások engedélyeit az összes többi felhasználó nevében."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Beállít most egy felhasználót?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Győződjön meg arról, hogy a személy hozzá tud férni a táblagéphez, hogy beállíthassa a területét"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 12f3cd9..6d0ff16 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Batas standar"</item>
     <item msgid="4071574792028999443">"Tanpa proses latar belakang"</item>
@@ -277,4 +290,9 @@
     <item msgid="4042143101664725090">"Waktu tunggu"</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..3bc7b70 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Tidak"</string>
     <string name="create" msgid="3578857613172647409">"Buat"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Tidak diketahui"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Anda saat ini tinggal melakukan <xliff:g id="STEP_COUNT">%1$d</xliff:g> langkah untuk menjadi pengembang."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Setelan 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\n"Setelan 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 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Ada masalah saat mengubah setelan"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Pengoptimalan Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimalkan penggunaan baterai saat Wi-Fi aktif"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Tambahkan jaringan"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Pindai"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Jaringan lain..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lainnya"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Penyiapan otomatis (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Untuk menyelesaikan penyiapan, tablet Anda perlu mengakses Wi-Fi. Setelah penyiapan, Anda dapat beralih antara data seluler dan Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Masukkan pin <xliff:g id="NUMBER">%1$s</xliff:g> pada router Wi-Fi Anda. Penyiapan memerlukan waktu hingga dua menit untuk selesai."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Penyiapan tablet mungkin memerlukan aktivitas jaringan yang signifikan."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"PERINGATAN: Anda mungkin dikenai tagihan data operator tambahan."\n\n"Penyiapan ponsel mungkin memerlukan aktivitas jaringan yang signifikan."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"PERINGATAN: Tablet tidak akan dapat memverifikasi bahwa perangkat lunak Anda sudah diperbarui."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"PERINGATAN: Ponsel tidak akan dapat memverifikasi bahwa perangkat lunak Anda sudah diperbarui."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tablet tidak dapat menyambung ke jaringan Wi-Fi ini."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Ponsel tidak dapat menyambung ke jaringan Wi-Fi ini."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi Lanjutan"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Pita frekuensi Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Tentukan rentang frekuensi operasi"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Lupakan grup ini?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portabel"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,7 @@
     <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>
@@ -756,6 +806,7 @@
     <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 +821,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 +846,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>
@@ -898,7 +952,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Bantuan"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Jaringan seluler"</string>
     <string name="location_title" msgid="1029961368397484576">"Lokasiku"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Wi-Fi &amp; lokasi jaringan"</string>
+    <string name="location_network_based" msgid="7472814266821714527">"Lokasi jaringan Wi-Fi &amp; seluler"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Izinkan aplikasi menggunakan layanan lokasi Google untuk memperkirakan lokasi Anda dengan lebih cepat. Data lokasi anonim akan dikumpulkan dan dikirim ke Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Lokasi yang dipastikan oleh Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satelit GPS"</string>
@@ -917,6 +971,7 @@
     <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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Aplikasi tidak dipasang pada ponsel Anda."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Penggunaan penyimpanan"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Menyetel opsi untuk pengembangan apl"</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="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="allow_mock_location" msgid="2787962564578664888">"Mengizinkan lokasi palsu"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Saat 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\n"Catatan: 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\n"Langkah 1: Tekan terus tombol daya sampai terdengar suara atau terasa getaran."\n\n"Langkah 2: Sentuh dan tahan dua jari sampai terdengar konfirmasi audio."\n\n"Jika 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  panggilan"</string>
+    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Ucapkan sandi"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Penundaan sentuh &amp; tahan"</string>
+    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Tingkatkan aksesibilitas web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Setelan"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Nyala"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Mati"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Aktif"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Nonaktif"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Diizinkan"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Tidak diizinkan"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Izinkan"</string>
@@ -1324,6 +1404,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,7 +1425,7 @@
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Setelan default di bawah menggantikan setelan apl"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Setelan default"</string>
     <string name="tts_default_synth_title" msgid="4755558388333117572">"Mesin default"</string>
-    <string name="tts_default_synth_summary" msgid="6482936537135251690">"Atur mesin 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>
@@ -1352,15 +1433,15 @@
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Bahasa"</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_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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Memperbarui setelan Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"aktif"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"nonaktif"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"mengaktifkan"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"menonaktifkan"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Tampilkan kelebihan GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Terbaik-terburuk: biru, hijau, merah terang, merah"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Nonaktifkan lapisan HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Selalu gunakan GPU untuk pengomposisian layar"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Aktifkan jejak"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Sambungan data seluler Anda akan dinonaktifkan ketika mencapai batas yang ditentukan."\n\n"Karena penggunaan data dihitung oleh ponsel Anda, dan operator Anda mungkin menghitung penggunaan secara berbeda, pertimbangkan untuk menggunakan batas yang konservatif."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Batasi data latar belakang?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Jika Anda membatasi data latar belakang seluler, beberapa apl dan layanan tidak akan berfungsi kecuali jika Anda terhubung ke jaringan Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Jika Anda membatasi data seluler latar belakang, beberapa aplikasi dan layanan tidak akan bekerja kecuali Anda tersambung ke jaringan Wi-Fi."\n\n"Setelan ini memengaruhi semua pengguna di tablet ini."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Jika Anda membatasi data seluler latar belakang, beberapa aplikasi dan layanan tidak akan bekerja kecuali Anda tersambung ke jaringan Wi-Fi."\n\n"Setelan ini memengaruhi semua pengguna di ponsel ini."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Anda"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Pengguna lainnya"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Tambahkan pengguna"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Aktif"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Tidak aktif"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Tidak disiapkan"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Pemilik"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Nama julukan"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Tambahkan pengguna baru"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Anda dapat membagikan perangkat ini dengan orang lain dengan membuat pengguna tambahan. Setiap pengguna memiliki ruangnya sendiri, yang dapat mereka sesuaikan dengan aplikasi, wallpaper, dan lainnya. Pengguna juga dapat menyesuaikan setelan tablet seperti Wi-Fi yang memengaruhi siapa saja."\n\n"Setelah Anda membuat pengguna baru, orang tersebut perlu menjalani proses penyiapan."\n\n"Setiap pengguna dapat menerima izin aplikasi yang diperbarui atas nama semua pengguna lain."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Setelah Anda membuat pengguna baru, orang tersebut perlu menjalani proses penyiapan."\n\n"Setiap pengguna dapat menerima izin aplikasi yang diperbarui atas nama semua pengguna lain."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Siapkan pengguna sekarang?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Pastikan orang tersebut tersedia untuk mengambil tablet dan menyiapkan ruangnya"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index e66963f..9ce958a 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -213,8 +213,8 @@
   </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="hdcp_checking_titles">
     <item msgid="441827799230089869">"Non verificare mai"</item>
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite standard"</item>
     <item msgid="4071574792028999443">"Nessun processo in background"</item>
@@ -277,4 +290,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..e1bedba 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"No"</string>
     <string name="create" msgid="3578857613172647409">"Crea"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Sconosciuto"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Ora ti mancano <xliff:g id="STEP_COUNT">%1$d</xliff:g> passaggi per diventare uno sviluppatore."</string>
+    <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 +43,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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Questa 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\n"Questa 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 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Si è verificato un problema durante la modifica dell\'impostazione"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Ottimizzazione Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Riduci al minimo l\'utilizzo della batteria quando Wi-Fi è attivo"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Aggiungi rete"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Scansione"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Altra rete…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Altro"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configurazione auto (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Per poter completare la configurazione, il tablet deve poter accedere a una rete Wi-Fi. Dopo la configurazione potrai passare dalla rete di dati mobili alla rete Wi-Fi e viceversa."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Inserisci il PIN <xliff:g id="NUMBER">%1$s</xliff:g> sul router Wi-Fi. Il completamento della configurazione può richiedere fino a due minuti."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <string name="wifi_save" msgid="3331121567988522826">"Salva"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Impossibile salvare la rete"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Annulla"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"Salta comunque"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"Non saltare"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"AVVISO. Potresti incorrere in addebiti extra dell\'operatore per i dati."\n\n"La configurazione del tablet può richiedere notevole attività di rete."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AVVISO. Potresti incorrere in addebiti extra dell\'operatore per i dati."\n\n"La configurazione del telefono può richiedere notevole attività di rete."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"AVVISO. Sul tablet non sarà possibile verificare se il software è aggiornato."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"AVVISO. Sul telefono non sarà possibile verificare se il software è aggiornato."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Impossibile collegare il tablet alla rete Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Impossibile collegare il telefono alla rete Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi avanzate"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda di frequenza Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Specifica campo di frequenza di funzionamento"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Eliminare questo gruppo?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portatile"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -736,7 +785,7 @@
     <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_bt_address" msgid="4195174192087439720">"Indirizzo Bluetooth"</string>
@@ -748,6 +797,7 @@
     <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>
@@ -756,6 +806,7 @@
     <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 +821,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 +846,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>
@@ -917,6 +971,7 @@
     <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>
@@ -966,6 +1021,7 @@
     <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="activity_not_found" msgid="5551664692991605325">"Applicazione non installata sul telefono."</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>
@@ -981,6 +1037,8 @@
     <string name="install_unknown_applications" msgid="176855644862942064">"Consenti l\'installazione di applicazioni da fonti sconosciute"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Il tablet e i dati personali sono più vulnerabili agli attacchi da parte di applicazioni di origini sconosciute. L\'utente accetta di essere il solo responsabile degli eventuali danni al tablet o della perdita di dati che potrebbero derivare dall\'utilizzo di queste applicazioni."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Il telefono e i dati personali sono più vulnerabili agli attacchi da parte di applicazioni di origini sconosciute. L\'utente accetta di essere il solo responsabile degli eventuali danni al telefono o della perdita di dati che potrebbero derivare dall\'utilizzo di queste applicazioni."</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Verifica applicazioni"</string>
+    <string name="verify_applications_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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Utilizzo memoria"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Imposta opzioni per lo sviluppo di applicazioni"</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="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="allow_mock_location" msgid="2787962564578664888">"Posizioni fittizie"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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 ingrandimento"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Quando questa funzione è attiva puoi aumentare e diminuire lo zoom toccando tre volte lo schermo."\n\n"Dopo avere aumentato lo zoom puoi:"\n<ul><li>"Eseguire una panoramica: trascina due o più dita sullo schermo."</li>\n<li>"Regolare il livello di zoom: unisci due o più dita come per fare un pizzicotto o allontanale."</li></ul>\n\n"Puoi anche ingrandire temporaneamente l\'area su cui hai il dito toccando tre volte e tenendo premuto. Nello stato ingrandito puoi trascinare il dito per esaminare parti diverse dello schermo. Solleva il dito per tornare allo stato precedente."\n\n"Nota. Il tocco triplo per ingrandire funziona ovunque tranne che per la tastiera e la barra di navigazione."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Collegamento Accessibilità"</string>
+    <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Attiva"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Disattivato"</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Quando questa funzione è attiva, puoi attivare rapidamente le funzioni di accessibilità in due passaggi:"\n\n"Passaggio 1. Premi e tieni premuto il pulsante di accensione fino all\'emissione di un suono o una vibrazione."\n\n"Passaggio 2. Tocca con due dita e tieni premuto finché senti un suono di conferma."\n\n"Se sul dispositivo sono configurati più utenti e utilizzi questa scorciatoia nella schermata di blocco, l\'accessibilità viene attivata temporaneamente fino allo sblocco del dispositivo."</string>
+    <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Testo grande"</string>
+    <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ingrandimento schermo"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Aggiorn. autom. ingrandim. schermo"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Aggiorna ingrandimento schermo per transizioni app"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Chiudi chiamata con pulsante ON/OFF"</string>
+    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Pronuncia le password"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Ritardo tocco e pressione"</string>
+    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Migliora l\'accessibilità web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Impostazioni"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Attivo"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Disattivato"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Attiva"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Non attiva"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Ammesso"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Non consentito"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Consenti"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Aggiornamento impostazione Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"attivo"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"non attivo"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"attivazione"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"disattivazione"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Mostra overdraw GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Dal migliore al peggiore: blu, verde, rosso chiaro, rosso"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Disabilita overlay HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Usa sempre GPU per la composizione dello schermo"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Abilita tracce"</string>
@@ -1555,17 +1651,21 @@
     <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="track_frame_time" msgid="6146354853663863443">"Rendering GPU"</string>
     <string name="track_frame_time_summary" msgid="447577515813970287">"Misura tempi rendering in adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Scala animazione finestra"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Scala animazione transizione"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Scala durata animatore"</string>
+    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simula display secondari"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Applicazioni"</string>
     <string name="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"La tua connessione dati mobili verrà disattivata al raggiungimento del limite specificato."\n\n"Dato che l\'utilizzo dei dati è misurato dal tuo telefono e che il tuo operatore potrebbe tenere conto dell\'utilizzo in modo diverso, è consigliabile utilizzare un limite conservativo."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Limitare i dati in background?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Se limiti i dati mobili in background, alcuni servizi e applicazioni potrebbero non funzionare senza connessione a una rete Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Se limiti i dati mobili in background, alcuni servizi e applicazioni non funzioneranno a meno che tu non sia connesso a una rete Wi-Fi."\n\n"Questa impostazione influisce su tutti gli utenti di questo tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Se limiti i dati mobili in background, alcuni servizi e applicazioni non funzioneranno a meno che tu non sia connesso a una rete Wi-Fi."\n\n"Questa impostazione influisce su tutti gli utenti di questo telefono."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Tu"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Altri utenti"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Aggiungi utente"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Attivo"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Non attivo"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Non configurato"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Proprietario"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Nickname"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Aggiungi nuovo utente"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Puoi condividere il dispositivo con altri utenti creando altri utenti. Ogni utente ha un proprio spazio personalizzabile con applicazioni, sfondo e così via. Gli utenti possono anche regolare le impostazioni del tablet, come il Wi-Fi, che riguardano tutti."\n\n"Dopo la creazione di un nuovo utente, quella persona deve eseguire una procedura di configurazione."\n\n"Qualsiasi utente può accettare le autorizzazioni delle applicazioni aggiornate per conto di tutti gli altri utenti."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Dopo la creazione di un nuovo utente, quella persona deve eseguire una procedura di configurazione."\n\n"Qualsiasi utente può accettare le autorizzazioni delle applicazioni aggiornate per conto di tutti gli altri utenti."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurare l\'utente ora?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Assicurati che la persona possa utilizzare il tablet e configurare il suo spazio."</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index e236cc8..8a9f26f 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"הגבלת תקן"</item>
     <item msgid="4071574792028999443">"אין תהליכים ברקע"</item>
@@ -277,4 +290,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..04c8649 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"לא"</string>
     <string name="create" msgid="3578857613172647409">"צור"</string>
     <string name="device_info_default" msgid="7847265875578739287">"לא ידוע"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"אתה כעת במרחק של <xliff:g id="STEP_COUNT">%1$d</xliff:g> צעדים מלהיות מפתח."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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 +305,8 @@
     <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="location_settings_title" msgid="4483843407328665068">"גישה למיקום"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"אבטחה"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת כרטיס SIM, נעילת אחסון אישורים"</string>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"הצג האלחוטי מושבת משום ש-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_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>
@@ -509,11 +540,14 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"אירעה בעיה בשינוי ההגדרה"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"אופטימיזציה ל-Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"צמצם את השימוש בסוללה כאשר Wi-Fi מופעל"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"הוסף רשת"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"רשתות 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="2575893749303670353">"‫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>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"רשת אחרת..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"עוד"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"התקנה אוטומטית (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"כדי להשלים את ההתקנה, הטאבלט צריך גישה ל-Wi-Fi. לאחר ההתקנה, תוכל לעבור בין רשת נתונים לנייד ובין Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"הצג אפשרויות מתקדמות"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"התקנה מוגנת של 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_pin" msgid="8067502591043979939">"הזן את מספר ה-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_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>
@@ -571,6 +606,14 @@
     <string name="wifi_save" msgid="3331121567988522826">"שמור"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"נכשל הניסיון לשמור את הרשת"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"ביטול"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"דלג בכל מקרה"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"אל תדלג"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"אזהרה: הספק עלול לגבות עלויות נתונים נוספות."\n\n"הגדרת טאבלט עשויה לצרוך פעילות רבה ברשת."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"אזהרה: הספק עלול לגבות עלויות נתונים נוספות."\n\n"הגדרת טלפון עשויה לצרוך פעילות רבה ברשת."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"אזהרה: הטאבלט לא יוכל לוודא שהתוכנה שלך עדכנית."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"אזהרה: הטלפון לא יוכל לוודא שהתוכנה שלך עדכנית."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"הטאבלט לא הצליח להתחבר לרשת Wi-Fi זו."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"הטלפון לא הצליח להתחבר לרשת Wi-Fi זו."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi מתקדם"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"תדר Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"ציין את טווח התדר של הפעולה"</string>
@@ -588,13 +631,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="400503541488064638">"‫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,7 +646,10 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"אם תתנתק, החיבור שלך עם <xliff:g id="PEER_NAME">%1$s</xliff:g> ועם <xliff:g id="PEER_COUNT">%2$s</xliff:g> מכשירים נוספים יסתיים."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"האם לבטל את ההזמנה?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"האם אתה רוצה לבטל את ההזמנה ליצירת קשר עם <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"לשכוח קבוצה זו?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"נקודה חמה ניידת של 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>
@@ -671,15 +718,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">"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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"היישום אינו מותקן בטלפון."</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>
@@ -974,13 +1030,15 @@
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"הגן על הטלפון שלך מפני שימוש לא מורשה על ידי יצירת קו ביטול נעילה אישי במסך. השתמש באצבע כדי לחבר לפחות ארבע נקודות בכל סדר שהוא במסך הבא."\n\n"מוכן להתחיל? גע באפשרות \'הבא\'."</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 +1059,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>
@@ -1030,6 +1090,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"אחסון USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"בכרטיס SD"</string>
     <string name="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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"שימוש בשטח אחסון"</string>
@@ -1094,6 +1159,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>
@@ -1176,7 +1243,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"הגדרת אפשרויות לפיתוח יישומים"</string>
     <string name="enable_adb" msgid="7982306934419797485">"ניקוי באגים ב-USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"מצב תיקון באגים כאשר USB מחובר"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"דיווחי באגים ב-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="allow_mock_location" msgid="2787962564578664888">"אפשר מיקומים מדומים"</string>
@@ -1207,6 +1276,8 @@
     <string name="adb_warning_message" msgid="7316799925425402244">"ניקוי באגים באמצעות 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>
@@ -1234,14 +1305,23 @@
     <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_toggle_script_injection_preference_title" msgid="7950932054266694403">"שיפור נגישות האינטרנט"</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_feature_state_on" msgid="2864292320042673806">"פועל"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"כבוי"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"מורשה"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"אסור"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"אפשר"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <string name="gadget_title" msgid="5519037532720577836">"בקרת צריכת חשמל"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"מעדכן הגדרת Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"מעדכן הגדרת Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"פועל"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"כבוי"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"מפעיל"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"מכבה"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"הצג שימוש יתר של GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"מהטוב ביותר להכי גרוע: כחול, ירוק, אדום בהיר, אדום"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"השבת שכבות על של HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"השתמש תמיד ב-GPU להרכבת מסך"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"הפעל עקבות"</string>
@@ -1555,18 +1651,22 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"חיבור הנתונים שלך בנייד יושבת כאשר תגיע למגבלה שצוינה."\n\n"מכיוון שנפח העברת הנתונים נמדד על ידי הטלפון, ומכיוון שייתכן שספק השירות שלך מחשב את נפח העברת הנתונים אחרת, מומלץ להשתמש במגבלה שמרנית."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"להגביל נתוני רקע?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"אם תגביל נתונים ניידים ברקע, יישומים ושירותים מסוימים לא יפעלו, אלא אם קיים חיבור Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"אם תגביל את נתוני רקע לנייד, יישומים ושירותים מסוימים לא יפעלו אלא אם אתה מחובר לרשת Wi-Fi‏."\n\n"הגדרה זו משפיעה על כל המשתמשים בטאבלט הזה."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"אם תגביל את נתוני הרקע לנייד, יישומים ושירותים מסוימים לא יפעלו אלא אם אתה מחובר לרשת Wi-Fi‏."\n\n"הגדרה זו משפיעה על כל המשתמשים בטלפון הזה."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"אתה"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"משתמשים אחרים"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"הוסף משתמש"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"פעיל"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"לא פעיל"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"לא מוגדר"</string>
+    <string name="user_owner" msgid="3879126011135546571">"בעלים"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"כינוי"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"הוסף משתמש חדש"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"אתה יכול לשתף את המכשיר הזה עם אנשים אחרים על ידי יצירת משתמשים נוספים. לכל משתמש יש שטח משלו שהוא יכול להתאים אישית עם יישומים, טפט וכן הלאה. משתמשים יכולים גם להתאים את הגדרות הטאבלט, כגון Wi-Fi, שמשפיעות על כולם."\n\n"לאחר יצירת משתמש חדש, עליו לבצע תהליך הגדרה."\n\n"כל משתמש יכול לקבל הרשאות יישום מעודכנות בשם כל המשתמשים האחרים."</string>
+    <string name="user_add_user_message_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_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 578d4a7..2c2e94f 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"標準の上限"</item>
     <item msgid="4071574792028999443">"バックグラウンドプロセスを使用しない"</item>
@@ -277,4 +290,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..e9b1ce8 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"いいえ"</string>
     <string name="create" msgid="3578857613172647409">"作成"</string>
     <string name="device_info_default" msgid="7847265875578739287">"不明"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"デベロッパーになるまであと<xliff:g id="STEP_COUNT">%1$d</xliff:g>ステップです。"</string>
+    <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 +87,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 +96,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>
@@ -192,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>
@@ -269,6 +275,8 @@
     <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>
@@ -299,6 +307,8 @@
     <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="location_settings_title" msgid="4483843407328665068">"位置情報アクセス"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"セキュリティ"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"現在地、画面ロック、SIMカードロック、認証情報ストレージのロック"</string>
@@ -364,7 +374,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>
@@ -482,6 +492,27 @@
     <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="7363832031876872257">"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_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>
@@ -511,9 +542,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"設定の変更中に問題が発生しました"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi最適化"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Wi-FiがONのときに電池使用を節約します"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"ネットワークを追加"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"スキャン"</string>
@@ -526,14 +560,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"他のネットワーク…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"その他"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自動設定（WPS）"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"セットアップを完了するには、タブレットでWi-Fiに接続する必要があります。セットアップ後にモバイルデータ通信とWi-Fiを切り替えられます。"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"詳細オプションを表示"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"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_pin" msgid="8067502591043979939">"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_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>
@@ -573,6 +608,14 @@
     <string name="wifi_save" msgid="3331121567988522826">"保存"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ネットワークを保存できませんでした"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"キャンセル"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"無視してスキップ"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"スキップしない"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"警告: 追加のデータ通信料が発生する可能性があります。"\n\n"タブレットのセットアップでは大量のネットワーク処理が必要となる場合があります。"</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告: 追加のデータ通信料が発生する可能性があります。"\n\n"タブレットのセットアップでは大量のネットワーク処理が必要となる場合があります。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"警告: タブレットは、ソフトウェアが最新の状態かどうかを確認できません。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"警告: 携帯端末は、ソフトウェアが最新の状態かどうかを確認できません。"</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"タブレットからこのWi-Fiネットワークに接続できませんでした。"</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"携帯端末からこのWi-Fiネットワークに接続できませんでした。"</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi詳細設定"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi周波数帯域"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"使用する周波数帯域を指定する"</string>
@@ -597,6 +640,7 @@
     <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,7 +648,10 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"切断すると、<xliff:g id="PEER_NAME">%1$s</xliff:g>と他の<xliff:g id="PEER_COUNT">%2$s</xliff:g>個のデバイスの接続が停止します。"</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"招待状のキャンセル"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>との接続への招待をキャンセルしますか？"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"このグループとの接続を切断しますか？"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"ポータブル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>
@@ -673,15 +720,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>
@@ -718,6 +766,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>
@@ -750,6 +799,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>
@@ -758,6 +808,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>
@@ -772,7 +823,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 +848,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>
@@ -919,6 +973,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>
@@ -968,6 +1023,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="activity_not_found" msgid="5551664692991605325">"アプリは端末にインストールされていません。"</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>
@@ -983,6 +1039,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 +1061,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>
@@ -1032,6 +1092,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USBストレージ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SDカード上"</string>
     <string name="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 +1117,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,6 +1142,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"ストレージ使用状況"</string>
@@ -1096,6 +1161,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>
@@ -1201,6 +1268,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"アプリ開発オプションを設定する"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USBデバッグ"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"USB接続時はデバッグモードにする"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"電源メニューのバグレポート"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"電源メニューにバグレポートを取得するオプションを含める"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"スリープモードにしない"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充電中に画面をスリープにしない"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"擬似ロケーションを許可"</string>
@@ -1209,6 +1278,8 @@
     <string name="adb_warning_message" msgid="7316799925425402244">"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>
@@ -1236,14 +1307,23 @@
     <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_toggle_script_injection_preference_title" msgid="7950932054266694403">"ウェブアクセシビリティの拡張"</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_feature_state_on" msgid="2864292320042673806">"ON"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"OFF"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"許可"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"許可していません"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"許可"</string>
@@ -1326,6 +1406,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>
@@ -1382,6 +1463,24 @@
     <string name="gadget_title" msgid="5519037532720577836">"電源管理"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Wi-Fi設定の更新"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth設定の更新"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"ON"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"OFF"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"ONにしています"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"OFFにしています"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1418,9 +1517,6 @@
     <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>
@@ -1489,7 +1585,7 @@
     <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>
@@ -1550,6 +1646,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"GPUオーバードローを表示"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"良好な状態から順に: 青、緑、薄い赤、赤"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HWオーバーレイを無効"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"画面合成に常にGPUを使用する"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"トレースを有効にする"</string>
@@ -1557,17 +1657,21 @@
     <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="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>
@@ -1626,9 +1730,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"モバイルデータ接続は指定の制限に達した場合無効になります。"\n\n"データ利用は携帯端末で記録されますが、携帯通信会社の利用明細は異なる可能性があるため、制限にできるだけ余裕をみておくことをおすすめします。"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"バックグラウンドデータを制限しますか？"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"バックグラウンドのモバイルデータを制限すると、アプリやサービスによっては、Wi-Fiネットワーク未接続時に機能しない場合があります。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"バックグラウンドのモバイルデータを制限すると、アプリやサービスによっては、Wi-Fiネットワーク未接続時に機能しない場合があります。"\n\n"この設定はこのタブレット上のすべてのユーザーに影響します。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"バックグラウンドのモバイルデータを制限すると、アプリやサービスによっては、Wi-Fiネットワーク未接続時に機能しない場合があります。"\n\n"この設定はこの端末上のすべてのユーザーに影響します。"</string>
     <string name="data_usage_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>
@@ -1669,6 +1776,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 +1798,46 @@
     <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="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_you_section" msgid="6247838798859425408">"自分"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"その他のユーザー"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ユーザーを追加"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"有効"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"無効"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"セットアップしていません"</string>
+    <string name="user_owner" msgid="3879126011135546571">"所有者"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"ニックネーム"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"新しいユーザーを追加する"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"追加ユーザーを作成して、この端末を他のユーザーと共有できます。各ユーザーは各自のスペースを所有でき、アプリや壁紙などを使用してカスタマイズできます。Wi-Fiなど、すべてのユーザーに影響するタブレット設定を変更することもできます。"\n\n"新しいユーザーを作成したら、そのユーザーはセットアップ処理を完了する必要があります。"\n\n"すべてのユーザーは他のユーザーの代わりに更新されたアプリの許可を承認できます。"</string>
+    <string name="user_add_user_message_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_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 571d522..0c4828f 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"표준 제한"</item>
     <item msgid="4071574792028999443">"백그라운드 프로세스 없음"</item>
@@ -277,4 +290,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..b69dbc6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"아니요"</string>
     <string name="create" msgid="3578857613172647409">"만들기"</string>
     <string name="device_info_default" msgid="7847265875578739287">"알 수 없음"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"개발자가 되려면 <xliff:g id="STEP_COUNT">%1$d</xliff:g>단계가 남았습니다."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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 +305,8 @@
     <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="location_settings_title" msgid="4483843407328665068">"위치 정보 액세스"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"보안"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"내 위치, 화면 잠금해제, SIM 카드 잠금, 자격증명 저장소 잠금 설정"</string>
@@ -306,7 +316,7 @@
     <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>
@@ -362,7 +372,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>
@@ -480,8 +490,29 @@
     <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="7363832031876872257">"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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"설정을 변경하는 중 문제가 발생했습니다."</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi 최적화"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Wi-Fi가 사용 중일 때 배터리 사용량 최소화"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"네트워크 추가"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"검색"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"다른 네트워크…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"더보기"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"자동 설정(WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"설정을 완료하려면 태블릿이 Wi-Fi에 액세스해야 합니다. 설정 후 모바일 데이터와 Wi-Fi 간에 전환할 수 있습니다."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"고급 옵션 표시"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"WPS(Wi-Fi 간편 설정)"</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_pin" msgid="8067502591043979939">"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_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>
@@ -571,6 +606,14 @@
     <string name="wifi_save" msgid="3331121567988522826">"저장"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"네트워크 저장 실패"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"취소"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"건너뛰기"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"건너뛰지 않음"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"경고: 추가 이동통신 데이터 요금이 발생할 수 있습니다."\n\n"태블릿 설정은 상당한 네트워크 활동을 요구할 수 있습니다."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"경고: 추가 이동통신 데이터 요금이 발생할 수 있습니다."\n\n"휴대전화 설정은 상당한 네트워크 활동을 요구할 수 있습니다."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"경고: 태블릿으로 소프트웨어가 최신인지 여부를 확인할 수 없습니다."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"경고: 휴대전화로 소프트웨어가 최신인지 여부를 확인할 수 없습니다."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"해당 태블릿으로 이 Wi-Fi 네트워크에 연결할 수 없습니다."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"해당 휴대전화로 이 Wi-Fi 네트워크에 연결할 수 없습니다."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"고급 Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi 주파수 대역"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"작업에 대한 주파수 범위 지정"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"연결을 중단하면 <xliff:g id="PEER_NAME">%1$s</xliff:g> 외 다른 <xliff:g id="PEER_COUNT">%2$s</xliff:g>개 기기와의 연결이 끊어집니다."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"초대를 취소하시겠습니까?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>와(과) 연결하려는 초대를 취소하시겠습니까?"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"이 그룹을 삭제할까요?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"휴대용 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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -890,8 +944,8 @@
     <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>
@@ -899,7 +953,7 @@
     <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" msgid="5626515380188353712">"사용자의 위치를 빠르게 예측하도록 앱에서 Google의 위치 서비스를 사용합니다. 익명의 위치 데이터가 수집되어 Google로 전송됩니다."</string>
     <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Wi-Fi에서 측정된 위치"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS 위성"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"앱이 사용자 태블릿의 GPS를 사용하여 사용자 위치를 파악하도록 함"</string>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"휴대전화에 설치되어 있지 않은 애플리케이션입니다."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 저장소"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD 카드"</string>
     <string name="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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"저장공간 사용량"</string>
@@ -1094,6 +1159,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>
@@ -1198,7 +1265,9 @@
     <string name="development_settings_title" msgid="215179176067683667">"개발자 옵션"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"앱 개발 옵션 설정"</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="bugreport_in_power" msgid="4548816486587403971">"전원 메뉴 버그 신고"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"전원 메뉴에 버그 신고 옵션 포함"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"켜진 상태로 유지"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"충전하는 동안 화면이 꺼지지 않음"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"모의 위치 허용"</string>
@@ -1207,12 +1276,14 @@
     <string name="adb_warning_message" msgid="7316799925425402244">"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_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="gadget_picker_title" msgid="98374951396755811">"가젯 선택"</string>
@@ -1234,14 +1305,23 @@
     <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\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_toggle_script_injection_preference_title" msgid="7950932054266694403">"웹 접근성 향상"</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_feature_state_on" msgid="2864292320042673806">"사용"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"사용 안함"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"허용됨"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"허용되지 않음"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"허용"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <string name="gadget_title" msgid="5519037532720577836">"전원 컨트롤"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Wi-Fi 설정 업데이트"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"블루투스 설정 업데이트"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"켜짐"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"꺼짐"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"켜는 중"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"끄는 중"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,11 +1511,8 @@
     <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>
@@ -1548,24 +1640,32 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"GPU 오버드로 표시"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"오버드로가 적은 순으로: 파란색, 녹색, 옅은 빨간색, 빨간색"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW 오버레이 사용 안함"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"화면 합성 목적으로 항상 GPU 사용"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"추적 사용"</string>
     <string name="enable_traces_dialog_title" msgid="5026490474669452929">"추적 사용 선택"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"현재 사용하도록 설정된 추적이 없습니다."</string>
+    <string name="enable_traces_summary_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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"지정된 한도에 도달하면 모바일 데이터 연결 사용이 중지됩니다."\n\n"휴대전화를 기준으로 데이터 사용량이 측정되며 이동통신사에서는 사용량을 다르게 계산할 수 있으므로 한도를 최대한 낮춰 사용하세요."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"백그라운드 데이터 사용을 제한하시겠습니까?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"백그라운드 모바일 데이터를 제한하는 경우 Wi-Fi 네트워크에 연결되지 않으면 일부 앱 및 서비스가 작동하지 않습니다."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"백그라운드 모바일 데이터를 제한하는 경우 Wi-Fi 네트워크에 연결되지 않으면 일부 앱 및 서비스가 작동하지 않습니다."\n\n"이 설정은 태블릿의 모든 사용자에게 영향을 줍니다."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"백그라운드 모바일 데이터를 제한하는 경우 Wi-Fi 네트워크에 연결되지 않으면 일부 앱 및 서비스가 작동하지 않습니다."\n\n"이 설정은 휴대전화의 모든 사용자에게 영향을 줍니다."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"나"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"다른 사용자"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"사용자 추가"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"활성"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"비활성"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"설정되지 않음"</string>
+    <string name="user_owner" msgid="3879126011135546571">"소유자"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"닉네임"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"새 사용자 추가"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"새로운 사용자를 추가로 만들어서 이 기기를 공유할 수 있습니다. 각 사용자는 별도의 공간을 갖게 되며 내 앱, 배경화면 등을 맞춤설정할 수 있습니다. 사용자는 또한 모두에게 영향을 주는 Wi-Fi와 같은 태블릿 설정을 조정할 수 있습니다."\n\n"새로운 사용자를 만든 후에 해당 사용자는 설정 과정을 진행해야 합니다."\n\n"모든 사용자는 다른 사용자들을 대신하여 업데이트된 앱 권한을 승인할 수 있습니다."</string>
+    <string name="user_add_user_message_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_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 2ced533..498aa4d 100755
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -17,4 +17,9 @@
 <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>
 </resources>
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
new file mode 100644
index 0000000..0903167
--- /dev/null
+++ b/res/values-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">16sp</item>
+    </style>
+</resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 39d788a..f58bca0 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standartinis apribojimas"</item>
     <item msgid="4071574792028999443">"Nėra fono procesų"</item>
@@ -277,4 +290,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..76424ea 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Ne"</string>
     <string name="create" msgid="3578857613172647409">"Kurti"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nežinomas"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Liko atlikti <xliff:g id="STEP_COUNT">%1$d</xliff:g> veiksm. ir būsite kūrėjas."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"Belaidis rodymas neleidžiamas, 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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Keičiant nustatymą kilo problemų"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"„Wi-Fi“ optimizavimas"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Sumažinti akumuliatoriaus naudojimą, kai „Wi-Fi“ įjungta"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Pridėti tinklą"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"„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_scan" msgid="1470911530412095868">"Nuskaityti"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Kitas tinklas…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Daugiau"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatinė sąranka (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Kad užbaigtumėte sąranką, planšetiniam kompiuteriui reikalinga prieiga prie „Wi-Fi“. Baigę sąranką galėsite perjungti iš mobiliojo ryšio duomenų į „Wi-Fi“ ir atvirkščiai."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Įveskite „Wi-Fi“ maršruto parinktuvo PIN kodą <xliff:g id="NUMBER">%1$s</xliff:g>. Sąranka gali užtrukti iki dviejų minučių."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Nustatant planšetinį kompiuterį gali reikėti daug naudoti tinklą."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ĮSPĖJIMAS: gali būti taikomi papildomi operatoriaus duomenų mokesčiai."\n\n"Nustatant telefoną gali reikėti daug naudoti tinklą."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ĮSPĖJIMAS: planšetinis kompiuteris negalės patvirtinti, kad programinė įranga yra atnaujinta."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ĮSPĖJIMAS: telefonas negalės patvirtinti, kad programinė įranga yra atnaujinta."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Planšetiniam kompiuteriui nepavyko prisijungti prie šio „Wi-Fi“ tinklo."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefonui nepavyko prisijungti prie šio „Wi-Fi“ tinklo."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Išplėstinis „Wi-Fi“"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"„Wi-Fi“ dažnių juosta"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Nurodyti veikimo dažnumą"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Pamiršti šią grupę?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Perkeliama „Wi-Fi“ aktyvioji sritis"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Programa jūsų telefone neįdiegta."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Atmintinės naudojimas"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Nustatyti programos kūrimo parinktis"</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="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="allow_mock_location" msgid="2787962564578664888">"Leisti imituoti vietas"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Kai 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\n"Pastaba: 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\n"1 veiksmas: paspauskite ir laikykite paspaudę maitinimo mygtuką, kol išgirsite garsą ar pajusite vibraciją."\n\n"2 veiksmas: palieskite ir laikykite palietę dviem pirštais, kol išgirsite patvirtinamąjį garso pranešimą"\n\n"Jei į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. baigiamas skambutis"</string>
+    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Sakyti slaptažodžius"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"„Paliesti ir laikyti“ delsa"</string>
+    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Žiniat. pritaik. neįgal. išplėtimas"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Nustatymai"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Įjungta"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Išjungta"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Įjungta"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Išjungta"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Leidžiama"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Neleidžiama"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Leisti"</string>
@@ -1277,7 +1357,7 @@
     <string name="wifi_on_time" msgid="6310209835617490616">"„Wi-Fi“ laiku"</string>
     <string name="bluetooth_on_time" msgid="6157799524996162271">"„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>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Atnaujinamas „Bluetooth“ nustatymas"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"įjungta"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"išjungta"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"įjungiama"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"išjungiama"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Rodyti graf. proc. virš."</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Nuo ger. iki blog.: mėl., žalia, šv. raud., raud."</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Neleisti HW perdangų"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Komponuojant ekraną visada naudoti GPU"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Įgalinti pėdsakus"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobiliųjų duomenų ryšys bus neleidžiamas, kai bus pasiektas nurodytas apribojimas."\n\n"Kadangi sunaudoti duomenys skaičiuojami telefonu, o operatorius gali apskaičiuoti kitaip, apsvarstykite galimybę naudoti mažesnį apribojimą."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Apriboti foninius duomenis?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Jei apribosite fono duomenis mobiliesiems, neveiks kai kurios programos ir paslaugos, nebent būsite prisijungę prie „Wi-Fi“ tinklo."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Jei apribosite foninius mobiliojo ryšio duomenis, kai kurios programos ir paslaugos neveiks, nebent prisijungsite prie „Wi-Fi“ tinklo."\n\n"Šis nustatymas turi įtakos visiems šio planšetinio kompiuterio naudotojams."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Jei apribosite foninius mobiliojo ryšio duomenis, kai kurios programos ir paslaugos neveiks, nebent prisijungsite prie „Wi-Fi“ tinklo."\n\n"Šis nustatymas turi įtakos visiems šio telefono naudotojams."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Jūs"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Kiti naudotojai"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Pridėti naudotoją"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Aktyvus"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Neaktyvus"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nenustatyta"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Savininkas"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Slapyvardis"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Pridėti naują naudotoją"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Galite bendrinti šį įrenginį su kitais žmonėmis kurdami papildomų naudotojų. Kiekvienam naudotojui suteikiama atskira vieta, kurią jie gali tinkinti savo programomis, ekrano fonu ir pan. Be to, naudotojai gali koreguoti planšetinio kompiuterio nustatymus, pvz., „Wi-Fi“, kurie turi įtakos visiems."\n\n"Sukūrus naują naudotoją, tas asmuo turi įvykdyti sąrankos procesą."\n\n"Bet kuris naudotojas gali priimti atnaujintų programų leidimus visų kitų naudotojų vardu."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Sukūrus naują naudotoją, tas asmuo turi įvykdyti sąrankos procesą."\n\n"Bet kuris naudotojas gali priimti atnaujintų programų leidimus visų kitų naudotojų vardu."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Nustatyti naudotoją dabar?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Įsitikinkite, kad asmuo gali naudoti planšetinį kompiuterį ir nustatyti savo vietą"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index de78636..f5e50a8 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standarta ierobežojums"</item>
     <item msgid="4071574792028999443">"Nav fona procesu"</item>
@@ -277,4 +290,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..cc15ce6 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Nē"</string>
     <string name="create" msgid="3578857613172647409">"Izveidot"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nezināms"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Atlikušas <xliff:g id="STEP_COUNT">%1$d</xliff:g> darbības, lai jūs kļūtu par izstrādātāju."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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>
@@ -297,6 +305,8 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Inf. 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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"Bezvadu attēlošana ir atspējota, 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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Mainot iestatījumu, radās kļūda"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi optimizācija"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Samazināt akumulatora lietojumu, kad Wi-Fi savienojums ir ieslēgts"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Pievienot tīklu"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Skenēt"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Cits tīkls..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Vairāk"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. iestatīšana (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Lai pabeigtu iestatīšanu, planšetdatoram ir nepieciešams Wi-Fi savienojums. Pēc iestatīšanas varat pārslēgties starp mobilo tīklu un Wi-Fi tīklu."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Ievadiet uz Wi-Fi maršrutētāja norādīto PIN numuru <xliff:g id="NUMBER">%1$s</xliff:g>. Iestatīšana var ilgt līdz pat divām minūtēm."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Iestatot planšetdatoru, var ievērojami palielināties tīkla darbības apjoms."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"BRĪDINĀJUMS! Mobilo sakaru operators var piemērot papildu maksu par datu pārraidi."\n\n"Iestatot tālruni, var ievērojami palielināties tīkla darbības apjoms."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"BRĪDINĀJUMS! Planšetdatorā nevarēs pārbaudīt, vai jūsu programmatūra ir atjaunināta."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"BRĪDINĀJUMS! Tālrunī nevarēs pārbaudīt, vai jūsu programmatūra ir atjaunināta."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Planšetdatorā nevarēja izveidot savienojumu ar Wi-Fi tīklu."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Tālrunī nevarēja izveidot savienojumu ar Wi-Fi tīklu."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi papildu iestatījumi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi frekvences josla"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Norādiet darbības frekvences diapazonu"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Vai aizmirst šo grupu?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Pārnēsājams Wi-Fi tīklājs"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Lietojumprogramma jūsu tālrunī nav instalēta."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Krātuves lietojums"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Iestatīt lietotņu izstrādes 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="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="allow_mock_location" msgid="2787962564578664888">"Atļaut neīstas vietas"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Ja 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\n"Piezī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\n"1. darbība: nospiediet barošanas pogu un turiet to, līdz izdzirdat kādu skaņu vai sajūtat vibrāciju."\n\n"2. darbība: pieskarieties ar diviem pirkstiem un uzgaidiet, līdz izdzirdat audio apstiprinājumu."\n\n"Ja 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">"Zvana beigšana, nosp. baroš. pogu"</string>
+    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Paroļu izrunāšana"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Aizkave, pieskaroties un turot"</string>
+    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Tīmekļa pieejamības uzlabošana"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Iestatījumi"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Ieslēgts"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Izslēgts"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Ieslēgta"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Izslēgta"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Atļauts"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nav atļauta"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Atļaut"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Bluetooth iestatījumu atjaunināšana"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"ieslēgts"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"izslēgts"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"notiek ieslēgšana"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"notiek izslēgšana"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Rādīt GPU pārsn. apjomu"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Kārtība: zils, zaļš, gaiši sarkans, sarkans"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Atspējot HW pārklājumus"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Vienmēr izmantot GPU atveidi ekrāna salikšanai"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Iespējot trases"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobilais datu savienojums tiks atspējots, tiklīdz būs sasniegts noteiktais ierobežojums."\n\n"Tā kā datu lietojuma apjoms tiek aprēķināts tālrunī un mobilo sakaru operatoru aprēķini par datu lietojumu var atšķirties, ierobežojumu izvēlieties apdomīgi."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vai ierobežot fona datus?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ja tiks ierobežoti fona mobilie dati, dažas lietotnes un pakalpojumi nedarbosies, ja vien netiks izveidots savienojums ar Wi-Fi tīklu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Ja ierobežosiet fona mobilos datus, dažas lietotnes un pakalpojumi nedarbosies, ja nebūsiet izveidojis savienojumu ar Wi-Fi tīklu."\n\n"Šis iestatījums ietekmē visus šī planšetdatora lietotājus."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Ja ierobežosiet fona mobilos datus, dažas lietotnes un pakalpojumi nedarbosies, ja nebūsiet izveidojis savienojumu ar Wi-Fi tīklu."\n\n"Šis iestatījums ietekmē visus šī tālruņa lietotājus."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Informācija par jums"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Citi lietotāji"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Pievienot lietotāju"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Aktīvs"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Neaktīvs"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nav iestatīts"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Īpašnieks"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Segvārds"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Lietotāja pievienošana"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Varat koplietot šo ierīci ar citām personām, pievienojot papildu lietotājus. Katram lietotājam ir sava vide, kas ir pielāgojama, izmantojot savas lietotnes, fona tapetes u. c. Lietotāji var arī pielāgot planšetdatora iestatījumus, kuri attiecas uz visiem lietotājiem, piemēram, Wi-Fi."\n\n"Kad ir pievienots jauns lietotājs, viņam ir jāveic iestatīšanas process."\n\n"Ikviens lietotājs var atļaut lietotņu atjaunināšanu citu lietotāju vietā."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Kad ir pievienots jauns lietotājs, viņam ir jāveic iestatīšanas process."\n\n"Ikviens lietotājs var atļaut lietotņu atjaunināšanu citu lietotāju vietā."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Iestatīt kontu tūlīt?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Lietotājam ir jābūt iespējai iestatīt savu telpu, izmantojot planšetdatoru"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 257c0b8..d1ab68d 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Had standard"</item>
     <item msgid="4071574792028999443">"Tiada proses latar belakang"</item>
@@ -277,4 +290,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..4fa6275 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Tidak"</string>
     <string name="create" msgid="3578857613172647409">"Buat"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Tidak diketahui"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Anda kini <xliff:g id="STEP_COUNT">%1$d</xliff:g> langkah daripada menjadi pemaju."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Tetapan 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\n"Tetapan 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 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Terdapat masalah menukar tetapan"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Pengoptimuman Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimumkan penggunaan bateri apabila Wi-Fi dihidupkan"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Tambah rangkaian"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Imbas"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Rangkaian lain..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lagi"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Persediaan automatik (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Untuk melengkapkan persediaan, tablet anda memerlukan akses ke Wi-Fi. Sesudah persediaan, anda boleh beralih antara data mudah alih dan Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Masukkan pin <xliff:g id="NUMBER">%1$s</xliff:g> pada penghala Wi-Fi anda. Persediaan ini boleh mengambil masa sehingga dua minit untuk selesai."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Persediaan tablet berpotensi menggunakan aktiviti rangkaian yang besar."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AMARAN: Anda mungkin dikenakan caj data pembawa tambahan."\n\n"Persediaan telefon berpotensi menggunakan aktiviti rangkaian yang banyak."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"AMARAN: Tablet tidak akan dapat mengesahkan bahawa perisian anda terkini."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"AMARAN: Telefon tidak akan dapat mengesahkan bahawa perisian anda terkini."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tablet tidak dapat menyambung ke rangkaian Wi-Fi ini."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefon tidak dapat menyambung ke rangkaian Wi-Fi ini."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi Lanjutan"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Jalur frekuensi Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Tentukan julat frekuensi operasi"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Lupakan kumpulan ini?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Titik panas Wi-Fi mudah alih"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Aplikasi tidak dipasang pada telefon anda."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Penggunaan storan"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Tetapkan pilihan untuk pembangunan aplikasi"</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="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="allow_mock_location" msgid="2787962564578664888">"Benarkan lokasi olokan"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Semasa 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\n"Nota: 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\n"Langkah 1: Tekan dan tahan butang kuasa sehingga anda mendengar bunyi atau merasai getaran."\n\n"Langkah 2: Sentuh terus menggunakan dua jari sehingga anda mendengar pengesahan audio."\n\n"Jika 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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Tingkatkan kebolehaksesan web"</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_feature_state_on" msgid="2864292320042673806">"Hidup"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Mati"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Dibenarkan"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Tidak dibenarkan"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Benarkan"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Mengemas kini tetapan Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"hidup"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"mati"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"menghidupkan"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"mematikan"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Tunjukkan had lebih GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Terbaik -&gt; terburuk: biru, hijau, merah muda, merah"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Lumpuhkan tindihan atas HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Sentiasa gunakan GPU untuk komposit skrin"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Dayakan kesan"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Sambungan data mudah alih anda akan dilumpuhkan apabila mencapai had tertentu."\n\n"Memandangkan telefon anda yang mengukur penggunaan data anda dan pembawa anda mungkin mengira penggunaan secara berbeza, pertimbangkan menggunakan had konservatif."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Hadkan data latar belakang?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Jika anda menghadkan data mudah alih latar belakang, beberapa aplikasi dan perkhidmatan tidak akan berfungsi kecuali anda mendapat sambungan kepada rangkaian Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Jika anda mengehadkan data mudah alih latar belakang, sesetengah apl dan perkhidmatan tidak akan berfungsi melainkan anda bersambung ke rangkaian Wi-Fi."\n\n"Tetapan ini melibatkan semua pengguna pada tablet ini."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Jika anda mengehadkan data mudah alih latar belakang, sesetengah apl dan perkhidmatan tidak akan berfungsi melainkan anda bersambung ke rangkaian Wi-Fi."\n\n"Tetapan ini melibatkan semua pengguna pada telefon ini."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Anda"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Pengguna lain"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Tambah pengguna"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Aktif"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Tidak aktif"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Tidak disediakan"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Pemilik"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Nama samaran"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Tambah pengguna baharu"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Anda boleh berkongsi peranti ini dengan orang lain dengan membuat pengguna tambahan. Setiap pengguna mempunyai ruang mereka sendiri, yang mereka boleh peribadikan dengan apl mereka sendiri, kertas dinding dan sebagainya. Pengguna juga boleh melaraskan tetapan tablet seperti Wi-Fi yang melibatkan semua orang."\n\n"Selepas anda membuat pengguna baharu, orang itu perlu melalui proses persediaan."\n\n"Mana-mana pengguna boleh meluluskan kebenaran kemas kini apl bagi pihak pengguna lain."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Selepas anda membuat pengguna baharu, orang itu perlu melalui proses persediaan."\n\n"Mana-mana pengguna boleh meluluskan kebenaran kemas kini apl bagi pihak pengguna lain."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Sediakan pengguna sekarang?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Pastikan orang itu tersedia untuk mengambil tablet dan menyediakan ruangnya"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 85cba56..8a0bc5b 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -133,8 +133,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>
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standard grense"</item>
     <item msgid="4071574792028999443">"Ingen bakgrunnsprosesser"</item>
@@ -277,4 +290,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..fac7f41 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Nei"</string>
     <string name="create" msgid="3578857613172647409">"Opprett"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Ukjent"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Du er nå <xliff:g id="STEP_COUNT">%1$d</xliff:g> trinn fra å bli en utvikler."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Du har mistet datatilkobling fordi du forlot hjemmenettet med dataroaming av."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Slå på"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Hvis du du tillater datastreifing, kan det påløpe høye kostnader."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Når du tillater datastreifing, kan dette føre til høye kostnader."\n\n"Denne innstillingen påvirker alle brukerne på dette nettbrettet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Når du tillater datastreifing, kan dette føre til høye kostnader."\n\n"Denne innstillingen påvirker alle brukerne på denne telefonen."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Vil du tillate datastreifing?"</string>
     <string name="networks" msgid="6333316876545927039">"Operatør"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Velg en nettverksoperatør"</string>
@@ -297,6 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Det oppstod et problem under endring av innstillingen"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimalisering av Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimer batteribruk når Wi-Fi er på"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Legg til nettverk"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Trådløse 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_scan" msgid="1470911530412095868">"Skann"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Annet nettverk"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Se mer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk konfig. (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"For å fullføre konfigurasjonen, må nettbrettet være tilkoblet Wi-Fi. Etter konfigurasjonen kan du bytte mellom mobildata og Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Skriv inn koden <xliff:g id="NUMBER">%1$s</xliff:g> på Wi-Fi-ruteren din. Det kan ta inntil to minutter å fullføre konfigurasjonen."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Nettbrettkonfigureringen kan kreve betydelig nettverksaktivitet."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ADVARSEL: Du kan pådra deg ekstra datakostnader fra operatøren."\n\n"Telefonkonfigureringen kan kreve betydelig nettverksaktivitet."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ADVARSEL: Nettbrettet kommer ikke til å kunne bekrefte at programvaren din er oppdatert."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ADVARSEL: Telefonen kommer ikke til å kunne bekrefte at programvaren din er oppdatert."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Nettbrettet kunne ikke koble til Wi-Fi-nettverket."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefonen kunne ikke koble til Wi-Fi-nettverket."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Avansert Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi-frekvensbånd"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Angi operasjonens frekvensområde"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Vil du glemme denne gruppen?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Flyttbar trådløs sone"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,7 @@
     <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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Appen er ikke installert på telefonen din."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Bruk av lagringsplass"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Angi alternativer for apputvikling"</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="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="allow_mock_location" msgid="2787962564578664888">"Tillat simulert posisjon"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Nå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\n"Merk: Å 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\n"Trinn 1: Trykk og hold inne av/på-knappen til du hører en lyd eller føler en vibrasjon."\n\n"Trinn 2: Trykk og hold to fingre på skjermen til du hører en bekreftelse."\n\n"Hvis 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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Forbedre nettilgjengelighet"</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_feature_state_on" msgid="2864292320042673806">"På"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Av"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Tillatt"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Ikke tillatt"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Tillat"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Oppdatere Bluetooth-innstilling"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"på"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"av"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"slår på"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"slår av"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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="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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Se GPU-overforbruk"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Fra best til verst: blå, grønn, lyserød, rød"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Deaktiver HW-overlegg"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Bruk alltid GPU for skjermsammensetting"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Aktiver spor"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobildatatilkoblingen din blir deaktivert når angitt grense nås."\n\n"Ettersom databruken måles av telefonen din, som muligens bruker andre metoder for registrering av forbruk enn operatøren din, bør du angi en moderat grense."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vil du begrense bruken av bakgrunnsdata?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Hvis du begrenser bakgrunnsmobildata, kan det hende at enkelte apper og tjenester ikke fungerer med mindre du er koblet til et Wi-Fi-nettverk."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Hvis du begrenser mobildatabruk i bakgrunnen, fungerer ikke enkelte apper og tjenester med mindre du er tilkoblet et Wi-Fi-nettverk."\n\n"Denne innstillingen påvirker alle brukerne på dette nettbrettet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Hvis du begrenser mobildatabruk i bakgrunnen, fungerer ikke enkelte apper og tjenester med mindre du er tilkoblet et Wi-Fi-nettverk."\n\n"Denne innstillingen påvirker alle brukerne på denne telefonen."</string>
     <string name="data_usage_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_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Deg"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Andre brukere"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Legg til bruker"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Aktiv"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Ikke aktiv"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Ikke konfigurert"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Eier"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Kallenavn"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Legg til ny bruker"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Du kan dele denne enheten med andre personer ved å opprette flere brukere. Hver bruker får sitt eget område som de kan tilpasse med egne apper, bakgrunner osv. Brukere kan også tilpasse innstillinger på nettbrettet som påvirker alle, for eksempel for Wi-Fi."\n\n"Når du oppretter nye brukere, må de gå gjennom en konfigureringsprosess."\n\n"Alle brukere kan godta oppdaterte apptillatelser på vegne av de andre brukerne."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Når du oppretter nye brukere, må de gå gjennom en konfigureringsprosess."\n\n"Alle brukere kan godta oppdaterte apptillatelser på vegne av de andre brukerne."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Konfigurere brukeren nå?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Sørg for at personen er tilgjengelig for å bruke nettbrettet og konfigurere området sitt"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index efda2d6..04fc1a8 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standaardlimiet"</item>
     <item msgid="4071574792028999443">"Geen achtergrondprocessen"</item>
@@ -277,4 +290,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..3bfe192 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Nee"</string>
     <string name="create" msgid="3578857613172647409">"Aanmaken"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Onbekend"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"U moet nog <xliff:g id="STEP_COUNT">%1$d</xliff:g> stappen uitvoeren om ontwikkelaar te worden."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Deze 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\n"Deze 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,6 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Er is een probleem opgetreden bij het wijzigen van de instelling"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wifi-optimalisatie"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Accugebruik minimaliseren wanneer wifi is ingeschakeld"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Netwerk toevoegen"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-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_scan" msgid="1470911530412095868">"Scannen"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Ander netwerk..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Meer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. config. (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Om de configuratie te voltooien, heeft uw tablet toegang tot wifi nodig. Na de configuratie kunt u schakelen tussen mobiele gegevens en wifi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Geef de pincode <xliff:g id="NUMBER">%1$s</xliff:g> op uw wifi-router op. De configuratie kan twee minuten duren."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Het instellen van de tablet kan aanzienlijke netwerkactiviteit vereisen."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"WAARSCHUWING: er worden mogelijk extra kosten voor dataverkeer in rekening gebracht."\n\n"Het instellen van de telefoon kan aanzienlijke netwerkactiviteit vereisen."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"WAARSCHUWING: de tablet kan niet controleren of uw software is bijgewerkt."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"WAARSCHUWING: de telefoon kan niet verifiëren of uw software is bijgewerkt."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"De tablet kan geen verbinding maken met dit wifi-netwerk."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"De telefoon kan geen verbinding maken met dit wifi-netwerk."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Geavanceerde Wi-Fi-instellingen"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi-frequentieband"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Het frequentiebereik voor gebruik opgeven"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Deze groep vergeten?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Draagbare Wi-Fi-hotspot"</string>
+    <string name="wifi_tether_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>
@@ -634,11 +681,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 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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>
@@ -793,6 +846,7 @@
     <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="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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Deze app is niet geïnstalleerd op uw telefoon."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Opslaggebruik"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Opties instellen voor appontwikkeling"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-foutopsporing"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Foutopsporingsmodus bij USB-verbinding"</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="allow_mock_location" msgid="2787962564578664888">"Neplocaties toestaan"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Wanneer 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\n"Opmerking: 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\n"Stap 1: Houd de aan/uit-knop ingedrukt totdat u een geluid hoort of een trilling voelt."\n\n"Stap 2: Blijf het scherm met twee vingers aanraken totdat u een audiobevestiging hoort."\n\n"Als 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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Webtoegankelijkheid verbeteren"</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_feature_state_on" msgid="2864292320042673806">"Aan"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Uit"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Toegestaan"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Niet toegestaan"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Toestaan"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <string name="gadget_title" msgid="5519037532720577836">"Energiebeheer"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Wi-Fi-instelling bijwerken"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth-instelling bijwerken"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"aan"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"uit"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"inschakelen"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"uitschakelen"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wifi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Overbelasting GPU tonen"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Best naar slechtst: blauw, groen, lichtrood, rood"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW-overlays uitschakelen"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"GPU altijd gebruiken voor schermcompositing"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Sporen inschakelen"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Uw mobiele gegevensverbinding wordt uitgeschakeld wanneer de gespecificeerde limiet is bereikt."\n\n"Aangezien dit gegevensverbruik wordt gemeten door uw telefoon en uw provider tot een ander totaal kan komen, kunt u het beste een voorzichtige grens instellen."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Achtergrondgegevens beperken?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Als u het gebruik van mobiele achtergrondgegevens beperkt, werken sommige apps en services niet, tenzij u bent verbonden met een wifi-netwerk."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Als u mobiel gegevensgebruik op de achtergrond beperkt, werken sommige apps en services niet, tenzij u verbonden bent met een wifi-netwerk."\n\n"Deze instelling is van invloed op alle gebruikers van deze tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Als u mobiel gegevensgebruik op de achtergrond beperkt, werken sommige apps en services niet, tenzij u verbonden bent met een wifi-netwerk."\n\n"Deze instelling is van invloed op alle gebruikers van deze telefoon."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"U"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Andere gebruikers"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Gebruiker toevoegen"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Actief"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Niet actief"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Niet ingesteld"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Eigenaar"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Bijnaam"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Nieuwe gebruiker toevoegen"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"U kunt dit apparaat met andere mensen delen door extra gebruikers te maken. Elke gebruiker heeft een eigen ruimte die kan worden aangepast met eigen apps, een achtergrond, enzovoort. Gebruikers kunnen ook tabletinstellingen aanpassen, zoals wifi, die effect hebben op alle gebruikers."\n\n"Nadat u een nieuwe gebruiker heeft gemaakt, moet die persoon een configuratieproces volgen."\n\n"Elke gebruiker kan namens alle andere gebruikers bijgewerkte app-machtigingen accepteren."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Nadat u een nieuwe gebruiker heeft gemaakt, moet die persoon een configuratieproces volgen."\n\n"Elke gebruiker kan namens alle andere gebruikers bijgewerkte app-machtigingen accepteren."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Gebruiker nu instellen?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Zorg ervoor dat de persoon de tablet kan overnemen om zijn of haar eigen gedeelte te configureren"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 6de5d4a..3584b5f 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardowy limit"</item>
     <item msgid="4071574792028999443">"Brak procesów w tle"</item>
@@ -277,4 +290,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..3d1ceb1 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Nie"</string>
     <string name="create" msgid="3578857613172647409">"Utwórz"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Nieznany"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Od zostania programistą dzieli Cię już tylko tyle kroków: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"To 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\n"To 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 +305,8 @@
     <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="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>
@@ -334,12 +344,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 +360,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 +372,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>
@@ -480,11 +490,32 @@
     <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="7363832031876872257">"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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Wystąpił problem ze zmianą ustawienia"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optymalizacja Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimalizuj zużycie baterii po włączeniu Wi-Fi"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Dodaj sieć"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Skanuj"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Inna sieć…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Więcej"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autokonfiguracja (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Do ukończenia konfiguracji tablet potrzebuje połączenia z Wi-Fi. Potem będziesz mieć możliwość przełączania między przesyłaniem danych przez sieć komórkową i Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Wpisz PIN <xliff:g id="NUMBER">%1$s</xliff:g> na routerze Wi-Fi. Konfiguracja może potrwać do dwóch minut."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_skip_anyway" msgid="6965361454438011190">"Pomiń mimo to"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"Nie pomijaj"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"OSTRZEŻENIE: operator może naliczyć dodatkowe opłaty za transmisję danych."\n\n"Konfiguracja tabletu może wymagać częstego korzystania z sieci."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"OSTRZEŻENIE: operator może naliczyć dodatkowe opłaty za transmisję danych."\n\n"Konfiguracja telefonu może wymagać częstego korzystania z sieci."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"OSTRZEŻENIE: tablet nie będzie mógł sprawdzić, czy oprogramowanie jest aktualne."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"OSTRZEŻENIE: telefon nie będzie mógł sprawdzić, czy oprogramowanie jest aktualne."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tablet nie może nawiązać połączenia z tą siecią Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefon nie może nawiązać połączenia z tą siecią Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Zaawansowane opcje Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Pasmo częstotliwości sieci Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Określ używany zakres częstotliwości"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Zapomnieć o tej grupie?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Przenośny punkt Wi-Fi"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -898,15 +952,15 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoc"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Sieci komórkowe"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokalizacja"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"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_network_based" msgid="7472814266821714527">"Wi-Fi i sieć komórkowa"</string>
+    <string name="location_neighborhood_level" msgid="5626515380188353712">"Zezwalaj aplikacjom na używanie usługi lokalizacji Google do szybszego określania Twojego położenia. Anonimowe dane o lokalizacji będą zbierane i przesyłane do Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Lokalizacja określona na podstawie sieci Wi-Fi"</string>
     <string name="location_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 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Aplikacja nie jest zainstalowana na telefonie."</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>
@@ -981,6 +1037,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,6 +1059,8 @@
     <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="uninstall_all_users_text" msgid="851857393177950340">"Odinstaluj dla wszystkich użytkowników"</string>
+    <string name="install_text" msgid="884360662922471113">"Zainstaluj"</string>
     <string name="disable_text" msgid="6544054052049395202">"Dezaktywuj"</string>
     <string name="enable_text" msgid="9217362512327828987">"Włącz"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Wyczyść dane"</string>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Użycie pamięci"</string>
@@ -1094,6 +1159,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>
@@ -1168,7 +1235,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Ustaw opcje związane z programowaniem aplikacji."</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="bugreport_in_power" msgid="4548816486587403971">"Błędy w menu zasilania"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Dodaj w menu zasilania opcję zgłaszania błędów"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Zostaw włączony"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekran nie będzie gaszony podczas ładowania telefonu"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Pozorowanie lokalizacji"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"W 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\n"Uwaga: 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\n"Krok 1: naciśnij i przytrzymaj przycisk zasilania, aż usłyszysz sygnał lub poczujesz wibracje."\n\n"Krok 2: naciśnij i przytrzymaj ekran dwoma palcami, aż usłyszysz potwierdzenie dźwiękowe."\n\n"Jeś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 kończy połączenie"</string>
+    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Wypowiadaj hasła na głos"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Czas dotknięcia i przytrzymania"</string>
+    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Zwiększenie dostępności stron"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Ustawienia"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Włączone"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Wyłączone"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Wł."</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Wył."</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Dozwolone"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Niedozwolone"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Zezwalaj"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Aktualizowanie ustawień Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"wł."</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"wył."</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"włączanie"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"wyłączanie"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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_change" msgid="2731163425081172638">"Wybierz, aby zmienić lub usunąć hasło pełnych kopii zapasowych na komputerze stacjonarnym."</string>
@@ -1482,7 +1574,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">"Autosynch. dane aplikacji"</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>
@@ -1535,19 +1627,23 @@
     <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="debug_input_category" msgid="1811069939601180246">"Ekran dotykowy"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Rysowanie"</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="show_hw_overdraw" msgid="1136884304711318251">"Pokaż przeciągnięcie GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Najlepszy-najg.: nieb., ziel., jasnoczerw., czerw."</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Wyłącz nakładki HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Zawsze używaj GPU do komponowania ekranu"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Włącz ślady"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Komórkowe połączenie transmisji danych zostanie wyłączone po wyczerpaniu limitu."\n\n"Ilość przesyłanych danych może być różnie rozliczana przez telefon i operatora, więc warto ustawić nieco niższy limit."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Ograniczyć dane w tle?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Jeśli ograniczysz transmisję danych w tle, niektóre aplikacje i usługi będą działać tylko po nawiązaniu połączenia z siecią Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Jeśli ograniczysz komórkową transmisję danych w tle, niektóre aplikacje i usługi będą działały wyłącznie po połączeniu z siecią Wi-Fi."\n\n"To ustawienie obowiązuje wszystkich użytkowników tego tabletu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Jeśli ograniczysz komórkową transmisję danych w tle, niektóre aplikacje i usługi będą działały wyłącznie po połączeniu z siecią Wi-Fi."\n\n"To ustawienie obowiązuje wszystkich użytkowników tego telefonu."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Ty"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Inni użytkownicy"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj użytkownika"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Aktywny"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Nieaktywny"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nieskonfigurowany"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Właściciel"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Pseudonim"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Dodaj nowego użytkownika"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Możesz użytkować to urządzenie wspólnie z innymi osobami, tworząc dodatkowych użytkowników. Każdy użytkownik ma swoje własne miejsce, które może spersonalizować własnymi aplikacjami, tapetą itd. Użytkownicy mogą także zmieniać ustawienia tabletu, które dotyczą wszystkich, np. Wi-Fi."\n\n"Po utworzeniu nowego użytkownika musi on przejść przez proces konfiguracji."\n\n"Każdy użytkownik może akceptować zaktualizowane uprawnienia aplikacji w imieniu wszystkich pozostałych użytkowników."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Po utworzeniu nowego użytkownika musi on przejść przez proces konfiguracji."\n\n"Każdy użytkownik może akceptować zaktualizowane uprawnienia aplikacji w imieniu wszystkich pozostałych użytkowników."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Skonfigurować ustawienia dla użytkownika?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Upewnij się, że ta osoba jest w pobliżu i może skonfigurować swój profil na tablecie"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 5a41861..7d82635 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite padrão"</item>
     <item msgid="4071574792028999443">"Sem processos em segundo plano"</item>
@@ -277,4 +290,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..480df40 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Não"</string>
     <string name="create" msgid="3578857613172647409">"Criar"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Está agora a <xliff:g id="STEP_COUNT">%1$d</xliff:g> passos de se tornar um programador."</string>
+    <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 +87,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>
@@ -190,6 +195,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 +221,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>
@@ -267,6 +273,8 @@
     <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\n"Esta 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\n"Esta 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 +305,8 @@
     <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="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>
@@ -362,7 +372,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 +407,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 +415,7 @@
     <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="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 +490,27 @@
     <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="7363832031876872257">"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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Ocorreu um problema ao alterar a definição"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Otimização de Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimizar a utilização da bateria quando o Wi-Fi está ligado"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Adicionar rede"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Procurar"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Outra rede..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mais"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automática (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Para concluir a configuração, o tablet necessita de acesso à rede Wi-Fi. Após a configuração, poderá alternar entre dados móveis e Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Introduza o PIN <xliff:g id="NUMBER">%1$s</xliff:g> do router Wi-Fi. A configuração pode demorar até dois minutos a ser concluída."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"A configuração do tablet poderá necessitar de uma atividade de rede considerável."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AVISO: poderão ser cobradas taxas de dados adicionais pelo operador."\n\n"A configuração do telemóvel poderá necessitar de uma atividade de rede considerável."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"AVISO: o tablet não conseguirá confirmar se o seu software está atualizado."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"AVISO: o telemóvel não conseguirá confirmar se o seu software está atualizado."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"O tablet não conseguiu estabelecer ligação a esta rede Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"O telemóvel não conseguiu estabelecer ligação a esta rede Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi Avançada"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda de frequência Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Especifique o intervalo de frequência de operação"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Esquecer este grupo?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portátil"</string>
+    <string name="wifi_tether_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>
@@ -659,7 +706,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 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -898,7 +952,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móveis"</string>
     <string name="location_title" msgid="1029961368397484576">"A minha localização"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Wi-Fi e localização de rede de telemóvel"</string>
+    <string name="location_network_based" msgid="7472814266821714527">"Wi-Fi e localização de rede móvel"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permita que aplic. usem o serv. localiz. Google para calcular mais rapidamente a sua local. Rec. dados anónimos e env. à Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Localização determinada por Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satélites GPS"</string>
@@ -917,6 +971,7 @@
     <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 +990,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>
@@ -960,12 +1015,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="activity_not_found" msgid="5551664692991605325">"A aplicação não está instalada no telemóvel."</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>
@@ -981,6 +1037,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 +1059,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="uninstall_all_users_text" msgid="851857393177950340">"Desinstalar para todos os utilizadores"</string>
+    <string name="install_text" msgid="884360662922471113">"Instalar"</string>
     <string name="disable_text" msgid="6544054052049395202">"Desactivar"</string>
-    <string name="enable_text" msgid="9217362512327828987">"Activar"</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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Utilização do armazenam."</string>
@@ -1094,6 +1159,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>
@@ -1199,7 +1266,9 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Definir opções de desenvolvimento da aplicação"</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="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="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Enquanto 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\n"Nota: 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\n"Passo 1: prima sem soltar o botão \"ligar/desligar\" até ouvir um som ou sentir uma vibração."\n\n"Passo 2: toque sem soltar com dois dedos até ouvir uma confirmação."\n\n"Se 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. termina chamada"</string>
+    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Dizer palavras-passe"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Atraso ao manter premida a tecla"</string>
+    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Melhorar a acessibilidade da Web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configurações"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Em"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Desligado"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Ativado"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desativado"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"permitido"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Não permitido"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Permitir"</string>
@@ -1324,10 +1404,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>
@@ -1378,8 +1459,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="2382963973155082629">"Atualizar definição de Wi-Fi"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Atualizar a definição do Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"ativado"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"desativado"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"a ligar"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"a desligar"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1432,8 +1524,8 @@
     <string name="remove_device_admin" msgid="3596845261596451437">"Desactivar"</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>
@@ -1449,7 +1541,7 @@
     <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>
@@ -1548,6 +1640,10 @@
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Destacar todas as superf. janelas quando atualizam"</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="show_hw_overdraw" msgid="1136884304711318251">"Mostrar GPU excedente"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Melhor para pior: azul, verde, verm. claro, verm."</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Desativ. sobreposições HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Utilizar sempre GPU para a composição do ecrã"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Ativar rastreios"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"A ligação móvel de dados será desativada quando for atingido o limite especificado."\n\n"Uma vez que a utilização dos dados é medida pelo telemóvel e o seu operador pode calcular a utilização de forma diferente, considere utilizar um limite de precaução."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Restringir dados em segundo plano?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Se restringir os dados móveis de segundo plano, algumas aplicações e serviços não funcionarão a não ser que esteja ligado a uma rede Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Se restringir os dados móveis em segundo plano, algumas aplicações e serviços não funcionarão exceto se estiver ligado a uma rede Wi-Fi."\n\n"Esta definição afeta todos os utilizadores deste tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Se restringir os dados móveis em segundo plano, algumas aplicações e serviços não funcionarão exceto se estiver ligado a uma rede Wi-Fi."\n\n"Esta definição afeta todos os utilizadores deste telemóvel."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"O utilizador"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Outros utilizadores"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Adicionar utilizador"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Ativo"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Não ativo"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Não configurado"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Proprietário"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Pseudónimo"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Adicionar novo utilizador"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Pode partilhar este dispositivo com outras pessoas criando utilizadores adicionais. Cada utilizador tem o seu próprio espaço, que pode personalizar com as suas próprias aplicações, imagem de fundo, etc. Os utilizadores também podem ajustar as definições do tablet, como por exemplo o Wi-Fi, que afetam toda as pessoas."\n\n"Depois de criar um novo utilizador, essa pessoa precisa de passar por um processo de configuração."\n\n"Qualquer utilizador pode aceitar as permissões de aplicações atualizadas em nome de todos os outros utilizadores."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Depois de criar um novo utilizador, essa pessoa necessita de passar por um processo de configuração."\n\n"Qualquer utilizador pode aceitar as permissões de aplicações atualizadas em nome de todos os outros utilizadores."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurar o utilizador agora?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Certifique-se de que a pessoa está disponível para pegar no tablet e configurar o respetivo espaço"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 0a137c4..ea55f7b 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite padrão"</item>
     <item msgid="4071574792028999443">"Sem processos em segundo plano"</item>
@@ -277,4 +290,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..fc42ee9 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Não"</string>
     <string name="create" msgid="3578857613172647409">"Criar"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Faltam <xliff:g id="STEP_COUNT">%1$d</xliff:g> etapas para você se tornar um desenvolvedor."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Esta 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\n"Esta 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 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"O Display sem fio está desativado, 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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Ocorreu um problema com a mudança de configuração"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Otimização de Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimizar o uso da bateria quando o Wi-Fi estiver ligado"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Adicionar rede"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Verificar"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Outra rede..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mais"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuração automática (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Para concluir a configuração, o tablet precisa de acesso à rede Wi-Fi. Após a instalação, você poderá alternar entre os dados móveis e o Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Insira o pin <xliff:g id="NUMBER">%1$s</xliff:g> em seu roteador Wi-Fi. A configuração pode levar até dois minutos para ser concluída."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"A configuração do tablet pode exigir atividade de rede significativa."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AVISO: você poderá receber cobranças significativas de dados da operadora."\n\n"A configuração do telefone pode exigir atividade de rede significativa."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"AVISO: o tablet não será capaz de verificar a atualização do software."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"AVISO: o telefone não será capaz de verificar a atualização do software."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"O tablet não foi capaz de conectar à rede Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"O telefone não foi capaz de conectar à rede Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi avançado"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda de frequência Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Especifique a faixa de frequência da operação"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Esquecer este grupo?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Wi-Fi portátil"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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">"Ou"</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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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>
@@ -793,6 +846,7 @@
     <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>
@@ -917,6 +971,7 @@
     <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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"O aplicativo não está instalado no telefone."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Uso do armazenamento"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Define as opções para o desenvolvimento do aplicativo"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Depuração USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Modo de depuração quando o USB estiver conectado"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"Relatórios de bugs no menu do botão de ligar"</string>
+    <string name="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="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Quando 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\n"Observaçã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\n"Etapa 1: pressione e segure o botão liga/desliga até ouvir um som ou sentir uma vibração."\n\n"Etapa 2: toque e segure com dois dedos até ouvir a confirmação de áudio."\n\n"Caso 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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Melhorar a acessibilidade na Web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configurações"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Ativado"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Desativado"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Ativado"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desativado"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Permitido"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Não permitido"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Permitir"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Atualizando configuração Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"ativado"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"desativado"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"ativando"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"desativando"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1435,7 +1527,7 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Mostrar overdraw da CPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Melhor p/ pior: azul, verde, verm. claro, vermelho"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Desativar sobreposição HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Sempre usar a GPU para composição de tela"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Ativar traços"</string>
@@ -1555,23 +1651,27 @@
     <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="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="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>
@@ -1605,7 +1705,7 @@
     <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_restrict_denied_dialog" msgid="7086969103661420799">"Restringir dados de segundo plano só é possível quando você define um limite de dados móveis."</string>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Sua conexão de dados móveis será desativada quando o limite especificado for atingido."\n\n"Como o uso de dados é calculado por seu telefone, e sua operadora pode entender o uso de forma diferente, use um limite moderado."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Restringir dados de segundo plano?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Se você restringir os dados móveis de segundo plano, alguns aplicativos e serviços não funcionarão, a menos que você esteja conectado a uma rede Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Ao restringir os dados móveis em plano de fundo, alguns aplicativos e serviços não funcionarão a menos que você esteja conectado a uma rede Wi-Fi."\n\n"Esta configuração afeta todos os usuários do tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Ao restringir os dados móveis em plano de fundo, alguns aplicativos e serviços não funcionarão a menos que você esteja conectado a uma rede Wi-Fi."\n\n"Esta configuração afeta todos os usuários do telefone."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Você"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Outros usuários"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Adicionar usuário"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Ativo"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Inativo"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Não configurado"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Proprietário"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Apelido"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Adicionar novo usuário"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Compartilhe este dispositivo com outras pessoas criando usuários adicionais. Cada usuário terá seu próprio espaço, que poderá personalizar com seus próprios aplicativos, plano de fundo, etc. Os usuários também poderão ajustar configurações do tablet que afetam a todos, como o Wi-Fi."\n\n"Depois que você cria um novo usuário, essa pessoa deve concluir o processo de configuração."\n\n"Qualquer usuário poderá aceitar permissões atualizadas de aplicativos em nome de todos os demais."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Depois que você cria um novo usuário, essa pessoa deve concluir o processo de configuração."\n\n"Qualquer usuário poderá aceitar permissões atualizadas de aplicativos em nome de todos os demais."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurar o usuário agora?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Certifique-se de que a pessoa está disponível para assumir o tablet e configurar seu espaço"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-rm/arrays.xml b/res/values-rm/arrays.xml
index 2aec04b..dbfebfc 100644
--- a/res/values-rm/arrays.xml
+++ b/res/values-rm/arrays.xml
@@ -177,6 +177,15 @@
     <!-- 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 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 +204,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..d1ffffc 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -21,6 +21,12 @@
     <!-- no translation found for create (3578857613172647409) -->
     <skip />
     <string name="device_info_default" msgid="7847265875578739287">"Nunenconuschent"</string>
+    <!-- no translation found for show_dev_countdown (5521163114237004821) -->
+    <skip />
+    <!-- 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 +105,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>
@@ -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>
@@ -359,6 +372,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 +428,10 @@
     <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 location_settings_title (4483843407328665068) -->
     <skip />
     <!-- no translation found for security_settings_title (7945465324818485460) -->
@@ -525,7 +546,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) -->
@@ -688,6 +710,48 @@
     <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 (7363832031876872257) -->
+    <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_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) -->
@@ -739,11 +803,17 @@
     <skip />
     <!-- no translation found for wifi_setting_sleep_policy_error (8174902072673071961) -->
     <skip />
+    <!-- no translation found for wifi_suspend_optimizations (387215679583759376) -->
+    <skip />
+    <!-- no translation found for wifi_suspend_optimizations_summary (7774946457510541054) -->
+    <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_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) -->
@@ -763,6 +833,8 @@
     <skip />
     <!-- no translation found for wifi_setup_wps (8128702488486283957) -->
     <skip />
+    <!-- no translation found for wifi_required_info_text (9014073093293520112) -->
+    <skip />
     <!-- no translation found for wifi_show_advanced (1793703023711426246) -->
     <skip />
     <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
@@ -771,13 +843,13 @@
     <skip />
     <!-- no translation found for wifi_wps_onstart_pbc (7204827509934892103) -->
     <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8116564886303972764) -->
+    <!-- no translation found for wifi_wps_onstart_pin (8067502591043979939) -->
     <skip />
     <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
     <skip />
     <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
     <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 />
@@ -837,6 +909,29 @@
     <!-- no translation found for wifi_failed_save_message (6650004874143815692) -->
     <skip />
     <string name="wifi_cancel" msgid="6763568902542968964">"Interrumper"</string>
+    <!-- no translation found for wifi_skip_anyway (6965361454438011190) -->
+    <!-- no translation found for wifi_skip_anyway (5205612884736051138) -->
+    <skip />
+    <!-- no translation found for wifi_dont_skip (7350341524881124808) -->
+    <skip />
+    <!-- no translation found for wifi_skipped_message (3335132188969450252) -->
+    <!-- no translation found for wifi_skipped_message (6518433975501257341) -->
+    <skip />
+    <!-- no translation found for wifi_skipped_message (1192848364146401759) -->
+    <!-- no translation found for wifi_skipped_message (4376150150678208848) -->
+    <skip />
+    <!-- no translation found for wifi_and_mobile_skipped_message (7682836089429990118) -->
+    <!-- no translation found for wifi_and_mobile_skipped_message (5647058314212144925) -->
+    <skip />
+    <!-- no translation found for wifi_and_mobile_skipped_message (3324261421359832263) -->
+    <!-- no translation found for wifi_and_mobile_skipped_message (1288483646141987070) -->
+    <skip />
+    <!-- no translation found for wifi_connect_failed_message (6904081070290941807) -->
+    <!-- no translation found for wifi_connect_failed_message (2006689630582761529) -->
+    <skip />
+    <!-- no translation found for wifi_connect_failed_message (3894921379368046855) -->
+    <!-- no translation found for wifi_connect_failed_message (8220901976514642385) -->
+    <skip />
     <!-- no translation found for wifi_advanced_titlebar (1627063574532930090) -->
     <skip />
     <!-- no translation found for wifi_setting_frequency_band_title (7493768705046080060) -->
@@ -878,6 +973,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,7 +989,13 @@
     <skip />
     <!-- no translation found for wifi_p2p_cancel_connect_message (7477756213423749402) -->
     <skip />
+    <!-- no translation found for wifi_p2p_delete_group_message (834559380069647086) -->
+    <skip />
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Punct d\'access WLAN mobil"</string>
+    <!-- no translation found for wifi_tether_starting (1322237938998639724) -->
+    <skip />
+    <!-- no translation found for wifi_tether_stopping (4835852171686388107) -->
+    <skip />
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Punct d\'access WLAN mobil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activ"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Errur en connex cun il punct d\'access WLAN mobil"</string>
     <!-- no translation found for wifi_tether_configure_ap_text (61237027772641155) -->
@@ -994,23 +1097,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 +1163,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>
@@ -1100,6 +1207,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 +1224,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 +1249,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 +1295,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>
@@ -1365,6 +1483,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>
@@ -1424,6 +1544,8 @@
     <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>
+    <!-- no translation found for activity_not_found (5551664692991605325) -->
+    <skip />
     <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) -->
@@ -1450,6 +1572,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 +1605,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>
@@ -1521,6 +1651,8 @@
     <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 +1696,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,6 +1738,10 @@
     <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) -->
@@ -1627,6 +1767,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>
@@ -1793,6 +1937,10 @@
     <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 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>
     <string name="allow_mock_location" msgid="2787962564578664888">"Posiziuns faussas"</string>
@@ -1804,6 +1952,10 @@
     <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) -->
@@ -1845,21 +1997,39 @@
     <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_toggle_script_injection_preference_title (7950932054266694403) -->
     <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) -->
     <skip />
@@ -1984,6 +2154,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>
@@ -2054,6 +2226,34 @@
     <skip />
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Actualisar ils parameters WLAN"</string>
     <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 (5960290421313061434) -->
+    <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) -->
@@ -2117,12 +2317,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) -->
@@ -2365,6 +2559,14 @@
     <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 show_hw_overdraw (1136884304711318251) -->
+    <skip />
+    <!-- no translation found for show_hw_overdraw_summary (4295714000923082647) -->
+    <skip />
     <!-- no translation found for disable_overlays (2074488440505934665) -->
     <skip />
     <!-- no translation found for disable_overlays_summary (3578941133710758592) -->
@@ -2379,6 +2581,8 @@
     <skip />
     <!-- no translation found for enable_traces_summary_all (3950139649125158247) -->
     <skip />
+    <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
+    <skip />
     <!-- no translation found for debug_layout (5981361776594526155) -->
     <skip />
     <!-- no translation found for debug_layout_summary (2001775315258637682) -->
@@ -2391,6 +2595,10 @@
     <skip />
     <!-- no translation found for force_hw_ui_summary (5535991166074861515) -->
     <skip />
+    <!-- no translation found for force_msaa (7920323238677284387) -->
+    <skip />
+    <!-- no translation found for force_msaa_summary (9123553203895817537) -->
+    <skip />
     <!-- no translation found for track_frame_time (6146354853663863443) -->
     <skip />
     <!-- no translation found for track_frame_time_summary (447577515813970287) -->
@@ -2401,6 +2609,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) -->
@@ -2517,12 +2727,18 @@
     <skip />
     <!-- no translation found for data_usage_restrict_background (6387252645350792955) -->
     <skip />
+    <!-- no translation found for data_usage_restrict_background_multiuser (2609163428726042269) -->
+    <skip />
+    <!-- no translation found for data_usage_restrict_background_multiuser (8025473178302056174) -->
+    <skip />
     <!-- no translation found for data_usage_sweep_warning (6387081852568846982) -->
     <skip />
     <!-- no translation found for data_usage_sweep_limit (860566507375933039) -->
     <skip />
     <!-- no translation found for data_usage_uninstalled_apps (614263770923231598) -->
     <skip />
+    <!-- no translation found for data_usage_uninstalled_apps_users (7986294489899813194) -->
+    <skip />
     <!-- no translation found for data_usage_received_sent (5039699009276621757) -->
     <skip />
     <!-- no translation found for data_usage_total_during_range (4091294280619255237) -->
@@ -2602,6 +2818,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,42 +2862,86 @@
     <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 selinux_status_enforcing (2252703756208463329) -->
+    <skip />
+    <!-- no translation found for user_settings_title (6151874007858148344) -->
+    <skip />
+    <!-- no translation found for user_you_section (6247838798859425408) -->
+    <skip />
+    <!-- no translation found for user_list_title (8866161687358773982) -->
     <skip />
     <!-- no translation found for user_add_user_menu (1675956975014862382) -->
     <skip />
-    <!-- no translation found for user_details_title (3037625632127241370) -->
+    <!-- no translation found for user_summary_active (4740649452346004418) -->
     <skip />
-    <!-- no translation found for user_information_heading (8728151075759863162) -->
+    <!-- no translation found for user_summary_inactive (3758296246095054572) -->
     <skip />
-    <!-- no translation found for user_name_title (7563724675699398319) -->
+    <!-- no translation found for user_summary_not_set_up (8778205026866794909) -->
     <skip />
-    <!-- no translation found for user_restrictions_heading (4426403050397418553) -->
+    <!-- no translation found for user_owner (3879126011135546571) -->
     <skip />
-    <!-- no translation found for user_market_requires_pin (3260702297207279414) -->
+    <!-- no translation found for user_nickname (5148818000228994488) -->
     <skip />
-    <!-- no translation found for user_max_content_rating (8297759970216482772) -->
+    <!-- no translation found for user_add_user_title (3961861593718285403) -->
     <skip />
-    <!-- no translation found for user_system_apps_heading (2408331798732183682) -->
+    <!-- no translation found for user_add_user_message_long (2278524063301283723) -->
     <skip />
-    <!-- no translation found for user_market_apps_heading (4657387297168308251) -->
+    <!-- no translation found for user_add_user_message_short (3310933423737035428) -->
     <skip />
-    <!-- no translation found for user_discard_user_menu (6638388031088461242) -->
+    <!-- no translation found for user_setup_dialog_title (1765794166801864563) -->
     <skip />
-    <!-- no translation found for user_remove_user_menu (3210146886949340574) -->
+    <!-- no translation found for user_setup_dialog_message (614037943337008555) -->
     <skip />
-    <!-- no translation found for user_new_user_name (7603010274765911161) -->
+    <!-- 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_remove_user_menu (6897150520686691355) -->
+    <skip />
+    <!-- no translation found for user_new_user_name (369856859816028856) -->
+    <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_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_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 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 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) -->
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index b9ea10f..f208e5e 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limita standard"</item>
     <item msgid="4071574792028999443">"Nu există procese de fundal"</item>
@@ -277,4 +290,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..3b501f4 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Nu"</string>
     <string name="create" msgid="3578857613172647409">"Creaţi"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Necunoscută"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Mai aveţi de parcurs <xliff:g id="STEP_COUNT">%1$d</xliff:g> paşi pentru a deveni dezvoltator."</string>
+    <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>
@@ -84,12 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Această 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\n"Această 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 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"A apărut o problemă la modificarea setării"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimizare Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Reduceţi la minimum utilizarea bateriei când reţeaua Wi-Fi este pornită"</string>
     <string name="wifi_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_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_scan" msgid="1470911530412095868">"Scanaţi"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Altă reţea…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mai multe"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automată (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Pentru a finaliza configurarea, este necesar ca tableta să aibă acces la Wi-Fi. După configurare, puteţi opta să utilizaţi datele mobile sau Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Introduceţi codul PIN <xliff:g id="NUMBER">%1$s</xliff:g> pe routerul Wi-Fi. Finalizarea configurării poate dura până la două minute."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Configurarea tabletei poate presupune o activitate semnificativă în reţea."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AVERTISMENT: puteţi acumula costuri suplimentare pentru date de la operator."\n\n"Configurarea telefonului poate presupune o activitate semnificativă în reţea."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"AVERTISMENT: tableta nu va putea să verifice dacă software-ul este actualizat."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"AVERTISMENT: telefonul nu va putea să verifice dacă software-ul este actualizat."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tableta nu s-a putut conecta la această reţea Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefonul nu s-a putut conecta la această reţea Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Setări Wi-Fi avansate"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Bandă de frecvenţă Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Indicaţi intervalul de frecvenţă al operaţiei"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Dacă vă deconectaţi, conexiunea cu <xliff:g id="PEER_NAME">%1$s</xliff:g> şi cu alte <xliff:g id="PEER_COUNT">%2$s</xliff:g> dispozitive se va încheia."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Anulaţi invitaţia?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Doriţi să anulaţi invitaţia de conectare cu <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Eliminaţi acest grup?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"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>
@@ -671,15 +718,16 @@
     <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="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>
@@ -716,6 +764,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>
@@ -748,6 +797,7 @@
     <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>
@@ -756,6 +806,7 @@
     <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>
@@ -770,7 +821,9 @@
     <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="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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Aplicaţia nu este instalată pe telefonul dvs."</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>
@@ -981,6 +1037,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,6 +1059,8 @@
     <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>
@@ -1030,6 +1090,7 @@
     <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>
@@ -1054,6 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Utilizare stocare"</string>
@@ -1094,6 +1159,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>
@@ -1200,6 +1267,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Setaţi opţiuni pentru dezvoltarea aplicaţiei"</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="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="allow_mock_location" msgid="2787962564578664888">"Permiteţi locaţiile fictive"</string>
@@ -1208,6 +1277,8 @@
     <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="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>
@@ -1235,14 +1306,23 @@
     <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\n"Notă: 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\n"Pasul 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\n"Pasul 2: atingeţi ecranul cu două degete şi menţineţi degetele pe ecran până când auziţi o confirmare audio."\n\n"Dacă 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 încheie apelul"</string>
+    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Rostiţi parolele"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Întârziere la atingere continuă"</string>
+    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Sporiţi accesibilitatea web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Setări"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Activat"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Dezactivat"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activată"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Dezactivată"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Permis"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nepermis"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Permiteţi"</string>
@@ -1325,6 +1405,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>
@@ -1381,6 +1462,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Se actualizează setarea pentru Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"activat"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"dezactivat"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"se activează"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"se dezactivează"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1417,9 +1512,6 @@
     <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>
@@ -1549,6 +1641,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Nivel suprapunere GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Max. – min.: albastru, verde, roşu deschis, roşu."</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Dezactivaţi suprapun. HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Utilizaţi mereu GPU pentru compunerea ecranului"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Activaţi monitorizările"</string>
@@ -1556,17 +1652,21 @@
     <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="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>
@@ -1625,9 +1725,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Conexiunea de date mobile va fi dezactivată la atingerea limitei specificate."\n\n"Din moment ce utilizarea de date este măsurată de telefonul dvs., iar operatorul poate contabiliza în mod diferit utilizarea, vă recomandăm să utilizaţi o limită estimativă."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Restricţionaţi datele de fundal?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Dacă limitaţi datele mobile de fundal, unele aplicaţii şi servicii nu vor funcţiona decât dacă sunteţi conectat(ă) la o reţea Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Dacă limitaţi transferul de date mobile în fundal, unele aplicaţii şi servicii nu vor funcţiona decât dacă sunteţi conectat(ă) la o reţea Wi-Fi."\n\n"Această setare afectează toţi utilizatorii de pe această tabletă."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Dacă limitaţi transferul de date mobile în fundal, unele aplicaţii şi servicii nu vor funcţiona decât dacă sunteţi conectat(ă) la o reţea Wi-Fi."\n\n"Această setare afectează toţi utilizatorii de pe acest telefon."</string>
     <string name="data_usage_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>
@@ -1668,6 +1771,10 @@
     <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_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 +1793,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Dvs."</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Alţi utilizatori"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Adăugaţi utilizator"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Activ"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Inactiv"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Neconfigurat"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Proprietar"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Pseudonim"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Adăugaţi un utilizator nou"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Puteţi să permiteţi accesul la acest gadget altor persoane, prin crearea unor utilizatori suplimentari. Fiecare utilizator are propriul spaţiu, pe care îl poate personaliza cu propriile sale aplicaţii, imagini de fundal şi aşa mai departe. De asemenea, utilizatorii pot ajusta setările tabletei, cum ar fi setările pentru Wi-Fi, care afectează pe toţi ceilalţi utilizatori."\n\n"După ce creaţi un utilizator nou, respectiva persoană trebuie să parcurgă un proces de configurare."\n\n"Oricare utilizator poate accepta permisiunile aplicaţiilor actualizate în numele tuturor celorlalţi utilizatori."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"După ce creaţi un utilizator nou, respectiva persoană trebuie să parcurgă un proces de configurare."\n\n"Oricare utilizator poate accepta permisiunile aplicaţiilor actualizate în numele tuturor celorlalţi utilizatori."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configuraţi utilizatorul acum?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Asiguraţi-vă că respectiva persoană poate să preia tableta şi să îşi configureze propriul spaţiu"</string>
+    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configuraţi acum"</string>
+    <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Nu acum"</string>
+    <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Numai proprietarul tabletei poate gestiona utilizatorii."</string>
+    <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Numai proprietarul telefonului poate gestiona utilizatorii."</string>
+    <string name="user_remove_user_menu" msgid="6897150520686691355">"Ştergeţi <xliff:g id="USER_NAME">%1$s</xliff:g> de pe gadget"</string>
+    <string name="user_new_user_name" msgid="369856859816028856">"Utilizator 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_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_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="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="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>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index da052fd..c025ed0 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>
@@ -145,14 +145,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>
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартное ограничение"</item>
     <item msgid="4071574792028999443">"Без фоновых процессов"</item>
@@ -277,4 +290,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..7aa507e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Нет"</string>
     <string name="create" msgid="3578857613172647409">"Создать"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Неизвестно"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Вы почти у цели. Осталось несколько шагов: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</string>
+    <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 +87,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>
@@ -104,7 +109,7 @@
     <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_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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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 +300,14 @@
     <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="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>
@@ -337,19 +347,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 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"Беспроводной проектор отключен, так как не работает 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_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,7 +519,7 @@
     <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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Не удалось изменить этот параметр"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Оптимизация Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Экономить заряд батареи, когда используется Wi-Fi"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Добавить сеть"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Сети 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_scan" msgid="1470911530412095868">"Поиск"</string>
@@ -524,21 +558,22 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Другие сети…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Ещё"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Автонастройка (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Для завершения настройки необходимо подключение к сети Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Дополнительно"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Безопасная настройка 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_pin" msgid="8067502591043979939">"Введите 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_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_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>
@@ -571,6 +606,14 @@
     <string name="wifi_save" msgid="3331121567988522826">"Сохранить"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Не удалось сохранить сеть."</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Отмена"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"Все равно пропустить"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"Не пропускать"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ВНИМАНИЕ! Возможны дополнительные расходы на услуги оператора связи."\n\n"Настройка устройства может потребовать передачи большого объема данных по сети."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ВНИМАНИЕ! Возможны дополнительные расходы на услуги оператора связи."\n\n"Настройка устройства может потребовать передачи большого объема данных по сети."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ВНИМАНИЕ! Поиск обновлений для программного обеспечения не поддерживается."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ВНИМАНИЕ! Поиск обновлений для программного обеспечения не поддерживается."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Не удалось подключиться к сети Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Не удалось подключиться к сети Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Дополнительные функции"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Полоса частот Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Укажите рабочий диапазон частот"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"После отключения соединение с \"<xliff:g id="PEER_NAME">%1$s</xliff:g>\" и другими устройствами (<xliff:g id="PEER_COUNT">%2$s</xliff:g>) будет прервано."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Отмена приглашения"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Вы собираетесь отменить приглашение на подключение к устройству \"<xliff:g id="PEER_NAME">%1$s</xliff:g>\". Продолжить?"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Удалить эту группу?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Точка доступа 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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -899,7 +953,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Мобильная сеть"</string>
     <string name="location_title" msgid="1029961368397484576">"Мое местоположение"</string>
     <string name="location_network_based" msgid="7472814266821714527">"По координатам сети"</string>
-    <string name="location_neighborhood_level" msgid="5626515380188353712">"Разрешить отправлять анонимные данные о местоположении и позволить приложениям использовать службу геопозиционирования Google, чтобы быстрее определять его"</string>
+    <string name="location_neighborhood_level" msgid="5626515380188353712">"Разрешить отправлять анонимные геоданные и позволить приложениям определять ваше местоположение с помощью Wi-Fi и мобильных сетей"</string>
     <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Местоположение определяется с помощью Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"По спутникам GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Разрешить приложениям использовать GPS для точного определения вашего местоположения"</string>
@@ -909,14 +963,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="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 +985,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 +996,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="308287052221942814">"Начертите ключ разблокировки"</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,12 +1015,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="activity_not_found" msgid="5551664692991605325">"Приложение не установлено на телефоне."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-накопитель"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На SD-карте"</string>
     <string name="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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Использование памяти"</string>
@@ -1094,6 +1159,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,7 +1194,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" 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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Настройка параметров для разработчиков"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Отладка по USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Включить режим отладки при подключении к компьютеру по USB"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"Отчеты об ошибках"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Показывать в меню опцию отправки отчета об ошибке"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Не выключать экран"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Во время зарядки экран будет всегда включен"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Фиктивные местоположения"</string>
@@ -1207,6 +1276,8 @@
     <string name="adb_warning_message" msgid="7316799925425402244">"Отладка по 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>
@@ -1216,7 +1287,7 @@
     <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="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,14 +1305,23 @@
     <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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Специальные веб-скрипты"</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_feature_state_on" msgid="2864292320042673806">"Включено"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Выключено"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Разрешена"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Запрещена"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Разрешить"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <string name="gadget_title" msgid="5519037532720577836">"Упр. питанием"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Обновление настроек Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Обновление настроек Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"включено"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"отключено"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"включение…"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"выключение…"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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,7 +1483,7 @@
     <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="credentials_install_gesture_prompt" msgid="2207390278112395082">"Начертите графический ключ"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Чтобы подтвердить установку учетных данных, начертите графический ключ."</string>
@@ -1410,15 +1505,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_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_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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Показывать наложения"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Порядок: синий, зеленый, светло-красный, красный"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Откл. аппарат. наложения"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Всегда использовать GPU при компоновке экрана"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Включить трассировки"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"По достижении лимита трафика передача данных по мобильной сети будет отключена."\n\n"Во избежание дополнительных расходов старайтесь не достигать этого лимита, так как оператор и ваше устройство могут по-разному учитывать трафик."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Ограничение фонового режима"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Если ограничить передачу данных в фоновом режиме, некоторые приложения и службы не будут работать без подключения к сети Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Если ограничить передачу данных в фоновом режиме, некоторые приложения и службы не будут работать без подключения к сети Wi-Fi."\n\n"Настройки будут изменены для всех пользователей устройства."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Если ограничить передачу данных в фоновом режиме, некоторые приложения и службы не будут работать без подключения к сети Wi-Fi."\n\n"Настройки будут изменены для всех пользователей устройства."</string>
     <string name="data_usage_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_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> (трафик, определенный устройством). Данные оператора могут отличаться."</string>
@@ -1667,6 +1770,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 +1794,46 @@
     <!-- 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="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_you_section" msgid="6247838798859425408">"Вы"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Другие пользователи"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Добавить пользователя"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Активен"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Неактивен"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не настроено"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Владелец"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Псевдоним"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Добавить пользователя"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Если устройством пользуется несколько человек, заведите для них отдельные учетные записи. В результате у каждого пользователя появится свое пространство, где можно будет установить собственные приложения или обои. При этом некоторые параметры, например настройки Wi-Fi, останутся общими для всех."\n\n"Обновление приложений будет происходить для всех учетных записей одновременно. Установить обновление сможет любой пользователь."\n\n</string>
+    <string name="user_add_user_message_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_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 6b04bed..0a5865c 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Štandardný limit"</item>
     <item msgid="4071574792028999443">"Žiadne procesy na pozadí"</item>
@@ -277,4 +290,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..a2d4e76 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Nie"</string>
     <string name="create" msgid="3578857613172647409">"Vytvoriť"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Neznáme"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Počet krokov do získania stavu vývojára: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Toto 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\n"Toto 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 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"Bezdrôtový displej je zakázaný, pretože sieť je Wi-Fi vypnutá."</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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Pri zmene nastavení sa vyskytol problém"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimalizácia Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimalizovať spotrebu batérie pri zapnutej sieti Wi-Fi"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Pridať sieť"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Vyhľadávanie"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Iná sieť..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Viac"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatické nastavenie (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Tablet potrebuje na dokončenie nastavení prístup k sieti Wi-Fi. Po nastavení môžete prepínať medzi mobilným dátovým pripojením a sieťou Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Zadajte na svojom smerovači siete Wi-Fi kód PIN <xliff:g id="NUMBER">%1$s</xliff:g>. Proces nastavenia môže trvať až dve minúty."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Nastavenie tabletu môže vyžadovať prenos významného množstva dát."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"UPOZORNENIE: Operátor môže účtovať ďalšie poplatky za dáta."\n\n"Nastavenie telefónu môže vyžadovať prenos významného množstva dát."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"UPOZORNENIE: Tablet nebude môcť overiť, či je váš softvér aktuálny."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"UPOZORNENIE: Telefón nebude môcť overiť, či je váš softvér aktuálny."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tablet sa k tejto sieti Wi-Fi nedokázal pripojiť."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefón sa k tejto sieti Wi-Fi nedokázal pripojiť."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Rozšírené nastavenia Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Frekvenčné pásmo Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Uveďte prevádzkový frekvenčný rozsah"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Odstrániť túto skupinu?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prenosný prístupový bod Wi-Fi"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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č obrazovky"</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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Aplikácia nie je v telefóne nainštalovaná."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Využitie ukl. priestoru"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Možnosti nastavenia vývoja aplikácií"</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="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="allow_mock_location" msgid="2787962564578664888">"Povoliť simulované polohy"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Poč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\n"Pozná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\n"Krok 1: Stlačte tlačidlo zapnutia a podržte ho, dokým nezaznie zvukový signál alebo nezacítite vibrácie."\n\n"Krok 2: Dotknite sa obrazovky dvoma prstami a podržte ju, dokým nezaznie zvuk potvrdenia."\n\n"Ak 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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Zjednodušenie prístupu k webu"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Nastavenia"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Zapnuté"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Vypnuté"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Zapnuté"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Vypnuté"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Povolené"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nie je povolené"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Povoliť"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Prebieha aktualizácia nastavenia Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"zapnuté"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"vypnuté"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"zapínanie"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"vypínanie"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Zobraziť prekreslenie GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Od najlepš. k najhorš.: modr., zel., sv. červ., červ."</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Zakázať hardvér. prekrytia"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Vždy používať jednotku GPU na skladanie obrazovky"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Povoliť sledovania"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Po dosiahnutí stanoveného limitu bude vaše mobilné dátové pripojenie zakázané."\n\n"Keďže sa využitie dát meria pomocou vášho telefónu a operátor môže využitie dát účtovať inak, zvážte nastavenie nižšieho limitu."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Obmedziť údaje na pozadí?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ak obmedzíte mobilné údaje na pozadí, niektoré aplikácie a služby nebudú fungovať, pokiaľ nebudete mať pripojenie k sieti Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Ak obmedzíte mobilné údaje na pozadí, niektoré aplikácie a služby nebudú fungovať, pokiaľ nebudete mať pripojenie k sieti Wi-Fi."\n\n"Toto nastavenie ovplyvní všetkých používateľov tohto tabletu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Ak obmedzíte mobilné údaje na pozadí, niektoré aplikácie a služby nebudú fungovať, pokiaľ nebudete mať pripojenie k sieti Wi-Fi."\n\n"Toto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Vy"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Ďalší používatelia"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Pridať používateľa"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Aktívne"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Neaktívne"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nenastavené"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Vlastník"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Prezývka"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Pridať nového používateľa"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Toto zariadenie môžete zdieľať aj s inými ľuďmi. Stačí vytvoriť ďalších používateľov. Každý používateľ má svoj vlastný priestor, ktorý si môže prispôsobiť pomocou aplikácií, tapety a pod. Používatelia si môžu prispôsobiť aj nastavenia tabletu, ktoré majú vplyv na ostatných (napr. nastavenia siete Wi-Fi)."\n\n"Keď vytvoríte nového používateľa, táto osoba musí prejsť procesom nastavenia."\n\n"Ktorýkoľvek používateľ môže akceptovať aktualizované povolenia aplikácií v mene všetkých ostatných používateľov."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Keď vytvoríte nového používateľa, táto osoba musí prejsť procesom nastavenia."\n\n"Ktorýkoľvek používateľ môže akceptovať aktualizované povolenia aplikácií v mene všetkých ostatných používateľov."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Chcete teraz nastaviť používateľa?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Uistite sa, že je príslušná osoba k dispozícii, aby mohla na tablete nastaviť svoj priestor"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 0e358f6..f229d76 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardna omejitev"</item>
     <item msgid="4071574792028999443">"Ni postopkov v ozadju"</item>
@@ -277,4 +290,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..899c482 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Ne"</string>
     <string name="create" msgid="3578857613172647409">"Ustvari"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Neznano"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Št. korakov, ki vas loči od tega, da postanete razvijalec: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Nastavitev 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\n"Nastavitev 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 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"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_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>
@@ -497,7 +528,7 @@
     <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_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_setup_wizard_title" msgid="70277346338812325">"Izberite Wi-Fi"</string>
     <string name="wifi_starting" msgid="6716593470710880000">"Vklop omrežja Wi-Fi…"</string>
     <string name="wifi_stopping" msgid="244864762599017659">"Izklapljanje vmesnika za Wi-Fi ..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Napaka"</string>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Težava pri spreminjanju nastavitve"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimizacija Wi-Fi-ja"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Zmanjšanje porabe akumulatorja, ko je Wi-Fi vklopljen"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Dodaj omrežje"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Brezžična omrežja"</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_scan" msgid="1470911530412095868">"Išči"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Drugo omrežje ..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Več"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Samodej. nastavitev (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Če želite končati namestitev, mora imeti tablični računalnik dostop do povezave Wi-Fi. Po namestitvi lahko preklopite med mobilnim podatkovnim omrežjem in omrežjem Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Vnesite PIN <xliff:g id="NUMBER">%1$s</xliff:g> za usmerjevalnik Wi-Fi. Nastavitev lahko traja največ dve minuti."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Nastavitev tabličnega računalnika lahko zahteva znatno omrežno dejavnost."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"OPOZORILO: Operater vam lahko zaračuna dodatne stroške."\n\n"Nastavitev telefona lahko zahteva znatno omrežno dejavnost."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"OPOZORILO: Tablični računalnik ne bo mogel preveriti, ali je vaša programska oprema posodobljena."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"OPOZORILO: Telefon ne bo mogel preveriti, ali je vaša programska oprema posodobljena."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tablični računalnik se ni mogel povezati v to omrežje Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefon se ni mogel povezati v to omrežje Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Napredno za Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Frekvenčni pas za Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Določite frekvenčni obseg delovanja"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Želite pozabiti to skupino?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prenosna brezžična dostopna točka"</string>
+    <string name="wifi_tether_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>
@@ -660,7 +707,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 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Aplikacija ni nameščena v telefonu."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Uporaba pomnilnika"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Nastavi možnosti za razvoj programov"</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="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="allow_mock_location" msgid="2787962564578664888">"Dovoli lažne lokacije"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Pri 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\n"Opomba: 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\n"1. korak: Pritisnite in pridržite gumb za vklop, dokler ne zaslišite zvoka ali začutite vibracije."\n\n"2. 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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Izbol. dostop. spleta za os. s pos. pot."</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Nastavitve"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Vklopljeno"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Izklopljeno"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Vklopljeno"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Izkloplj."</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Dovoljeno"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Ni dovoljeno"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Dovoli"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Posodabljanje nastavitev Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"vklopljeno"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"izklopljeno"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"vklapljanje"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"izklapljanje"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Prikaži prepisovanje GPE"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Od najboljšega do najslabšega: modra, zelena, svetlo rdeča, rdeča"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Onem. strojni medp."</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Za sestavljanje slike vedno uporabi graf. procesor"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Omogoči sledi"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Vaša mobilna podatkovna povezava bo onemogočena, ko dosežete omejitev."\n\n"Ker uporabo podatkov meri telefon, operater pa jo lahko obračunava drugače, priporočamo, da uporabite nekoliko manjšo omejitev."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Želite omejiti podatke v ozadju?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Če omejite prenos mobilnih podatkov v ozadju, nekateri programi in storitve ne bodo delovali, kadar niste povezani v omrežje Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Če omejite mobilne podatke v ozadju, bodo nekatere aplikacije in storitve delovale samo ob vzpostavljeni povezavi z omrežjem Wi-Fi."\n\n"Nastavitev vpliva na vse uporabnike v tem tabličnem računalniku."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Če omejite mobilne podatke v ozadju, bodo nekatere aplikacije in storitve delovale samo ob vzpostavljeni povezavi z omrežjem Wi-Fi."\n\n"Nastavitev vpliva na vse uporabnike v tem telefonu."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Vi"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Drugi uporabniki"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj uporabnika"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Aktiven"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Neaktiven"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Uporabnik ni nastavljen"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Lastnik"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Vzdevek"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Dodaj novega uporabnika"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"To napravo lahko delite z drugimi, pred tem pa morate ustvariti dodatne uporabnike. Vsak uporabnik ima svoj prostor, v katerega lahko dodaja aplikacije, ozadja in drugo. Uporabniki lahko poleg tega prilagajajo nastavitve tabličnega računalnika, ki vplivajo tudi na druge uporabnike, na primer Wi-Fi."\n\n"Ko ustvarite novega uporabnika, mora slednji opraviti postopek namestitve."\n\n"Vsak uporabnik lahko sprejme nova dovoljenja za aplikacije v imenu vseh ostalih uporabnikov."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Ko ustvarite novega uporabnika, mora slednji opraviti postopek namestitve."\n\n"Vsak uporabnik lahko sprejme nova dovoljenja za aplikacije v imenu vseh ostalih uporabnikov."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Želite uporabnika nastaviti zdaj?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Prepričajte se, da ima oseba čas za nastavitev svojega prostora v tabličnem računalniku"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 6652d97..36a9cfb 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандардно ограничење"</item>
     <item msgid="4071574792028999443">"Без позадинских процеса"</item>
@@ -277,4 +290,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..e272c8f 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Не"</string>
     <string name="create" msgid="3578857613172647409">"Направи"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Непознато"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Треба да обавите још <xliff:g id="STEP_COUNT">%1$d</xliff:g> корака да бисте постали програмер."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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 +305,8 @@
     <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="location_settings_title" msgid="4483843407328665068">"Приступ локацији"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Безбедност"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Подешавање Моје локације, откључавања екрана, закључавања SIM картице и закључавања акредитива складишта"</string>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"Бежични екран је онемогућен јер је 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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Дошло је до проблема приликом промене подешавања"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi оптимизација"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Смањи коришћење батерије када је Wi-Fi укључен"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Додај мрежу"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Скенирај"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Друга мрежа..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Још"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Аутоматско подешавање (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Да бисте довршили подешавање, таблет треба да има приступ Wi-Fi мрежи. Након подешавања, можете да прелазите са мобилне мреже на Wi-Fi и обратно."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Прикажи напредне опције"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Заштићено подешавање 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_pin" msgid="8067502591043979939">"Унесите 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_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>
@@ -571,6 +606,14 @@
     <string name="wifi_save" msgid="3331121567988522826">"Сачувај"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Чување мреже није успело"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Откажи"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"Ипак прескочи"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"Не прескачи"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"УПОЗОРЕЊЕ: Можете да изазовете додатне трошкове оператера за пренос података."\n\n"Подешавање таблета може да захтева значајну активност на мрежи."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"УПОЗОРЕЊЕ: Можете да изазовете додатне трошкове оператера за пренос података."\n\n"Подешавање телефона може да захтева значајну активност на мрежи."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"УПОЗОРЕЊЕ: Таблет неће моћи да верификује да је софтвер ажуриран."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"УПОЗОРЕЊЕ: Телефон неће моћи да верификује да је софтвер ажуриран."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Таблет није могао да се повеже са овом Wi-Fi мрежом."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Телефон није могао да се повеже са овом Wi-Fi мрежом."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Напредна Wi-Fi подешавања"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi опсег фреквенција"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Наведите опсег фреквенција за операцију"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Ако прекинете везу, окончаћете везу са уређајем <xliff:g id="PEER_NAME">%1$s</xliff:g> и другим уређајима (<xliff:g id="PEER_COUNT">%2$s</xliff:g>)."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Желите ли да откажете позивницу?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Желите ли да откажете позивницу за повезивање са уређајем <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Желите ли да заборавите ову групу?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Преносна 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>
@@ -617,7 +664,7 @@
     <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_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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Апликација није инсталирана на телефону."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB меморија"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На SD картици"</string>
     <string name="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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Коришћење меморије"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Подешавање опција за програмирање апликације"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Отклањање USB грешака"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Режим отклањања грешака када је USB повезан"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"Извештаји о грешкама у менију напајања"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Омогућите опцију за прављење извештаја о грешкама у менију напајања"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Не закључавај"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Екран неће бити у режиму спавања током пуњења"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Дозволи лажне локације"</string>
@@ -1207,6 +1276,8 @@
     <string name="adb_warning_message" msgid="7316799925425402244">"Отклањање 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>
@@ -1234,14 +1305,23 @@
     <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\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">"Одлагање додира и задржавањa"</string>
+    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Побољшај веб приступачност"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Подешавања"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Укључено"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Искључено"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Укључено"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Искључено"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Дозвољено"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Није дозвољено"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Дозволи"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <string name="gadget_title" msgid="5519037532720577836">"Контрола напајања"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Ажурирање Wi-Fi подешавања"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ажурирање Bluetooth подешавања"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"укључено"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"искључено"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"укључивање"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"искључивање"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Прикажи прекорачење GPU-а"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Од најбољег ка најгорем: плаво, зелено, светлоцрвено, црвено"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Онемог. HW пост. елементе"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Увек користи GPU за компоновање екрана"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Омогући трагове"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Мобилна веза за пренос података биће онемогућена када се достигне назначено ограничење."\n\n"Пошто телефон мери потрошњу података, а оператер може да обрачунава потрошњу на други начин, размотрите коришћење нижег ограничења."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Желите ли да ограничите позадинске податке?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ако ограничите позадинске податке за мобилне уређаје, неке апликације и услуге неће функционисати осим ако нисте повезани са Wi-Fi мрежом."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Ако ограничите позадинске податке за мобилне уређаје, неке апликације и услуге неће функционисати осим ако нисте повезани са Wi-Fi мрежом."\n\n"Ово подешавање утиче на све кориснике овог таблета."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Ако ограничите позадинске податке за мобилне уређаје, неке апликације и услуге неће функционисати ако нисте повезани са Wi-Fi мрежом."\n\n"Ово подешавање утиче на све кориснике овог телефона."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"упозорење"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"Ограничење"\n"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font><font size="12"></font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Уклоњене апликације"</string>
+    <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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Ви"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Остали корисници"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Додај корисника"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Активан"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Није активан"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Није подешено"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Власник"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Надимак"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Додавање новог корисника"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Можете да делите овај уређај са другим људима тако што ћете направити додатне кориснике. Сваки корисник има сопствени простор, који може да прилагођава помоћу својих апликација, позадина итд. Корисници могу да прилагођавају и подешавања таблета као што је Wi-Fi, а која утичу на свакога."\n\n"Када направите новог корисника, та особа треба да обави подешавање."\n\n"Сваки корисник може да прихвата ажуриране дозволе апликација у име свих осталих корисника."</string>
+    <string name="user_add_user_message_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_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index c6afcbf..44ce64c 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardgräns"</item>
     <item msgid="4071574792028999443">"Inga bakgrundsprocesser"</item>
@@ -277,4 +290,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..0ad015d 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Nej"</string>
     <string name="create" msgid="3578857613172647409">"Skapa"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Okänd"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Du är nu <xliff:g id="STEP_COUNT">%1$d</xliff:g> steg från att bli utvecklare."</string>
+    <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 +87,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>
@@ -142,13 +147,13 @@
     <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="tablet" msgid="4420151924834278808">"En app på surfplattan vill göra den 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="tablet" msgid="8737516188038252313">"En app på surfplattan vill att surfplattan 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="tablet" msgid="8504403125440086020">"En app på surfplattan vill aktivera Bluetooth och göra surfplattan 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="tablet" msgid="7254712987802497615">"En app på surfplattan vill aktivera Bluetooth och göra surfplattan 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_turning_on" msgid="4850574877288036646">"Bluetooth aktiveras"</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Vill du stänga av Bluetooth…"</string>
@@ -190,6 +195,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 +254,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>
@@ -267,6 +273,8 @@
     <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_turn_it_on_button" msgid="4387601818162120589">"Aktivera"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"När du tillåter roaming kan det tillkomma vissa avgifter!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Om du tillåter dataroaming kan det leda till höga kostnader."\n\n"Den här inställningen påverkar samtliga användare."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Om du tillåter dataroaming kan det leda till höga kostnader."\n\n"Den här inställningen påverkar samtliga användare."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Vill du tillåta roaming?"</string>
     <string name="networks" msgid="6333316876545927039">"Val av operatör"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Välj en nätverksoperatör"</string>
@@ -297,35 +305,37 @@
     <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="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="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\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_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="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\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_switch_input_method" msgid="4168332125223483198">"Växla inmatningsmetod"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Välj skärmlås"</string>
@@ -362,7 +372,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>
@@ -480,8 +490,29 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som högtalartelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"För musik och media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kom ihåg inställningarna"</string>
+    <string name="wifi_display_settings_title" msgid="564299108014609382">"Visningsalternativ för trådlös skärm"</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Om du vill visa enheter aktiverar du funktionen så att trådlösa skärmar visas."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Trådlösa skärmar visas inte eftersom Wi-Fi är inaktiverat."</string>
+    <string name="wifi_display_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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Ett problem inträffade när inställningen ändrades"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi-optimering"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimera batterianvändningen när Wi-Fi är aktiverat"</string>
     <string name="wifi_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_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_scan" msgid="1470911530412095868">"Skanna"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Annat nätverk …"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk installation (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Surfplattan måste vara ansluten till Wi-Fi för att du ska kunna slutföra konfigurationen. När du är färdig med konfigurationen kan du välja mellan mobildataanslutning och Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Ange pinkoden <xliff:g id="NUMBER">%1$s</xliff:g> på din Wi-Fi-router. Det kan ta upp till två minuter att slutföra installationen."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Konfigurationen kan kräva betydande nätverksaktivitet."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"VARNING! Eventuella operatörsavgifter för datatrafik kan tillkomma."\n\n"Konfigurationen kan kräva betydande nätverksaktivitet."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"VARNING! Surfplattan kommer inte att kunna kontrollera om programvaran är uppdaterad."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"VARNING! Mobilen kommer inte att kunna kontrollera om programvaran är uppdaterad."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Surfplattan kunde inte anslutas till Wi-Fi-nätverket."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Mobilen kunde inte anslutas till Wi-Fi-nätverket."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Avancerat för Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi-frekvensband"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Ange driftområde för frekvens"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Vill du glömma den här gruppen?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Mobil Wi-Fi-surfpunkt"</string>
+    <string name="wifi_tether_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>
@@ -645,25 +692,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="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 +718,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">"Under laddning"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Medan enheten dockas"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Av"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Om du vill styra vad som händer när mobilen är dockad eller i viloläge aktiverar du dagdrömsläget."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Då ska dagdrömmar aktiveras"</string>
+    <string name="screensaver_settings_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 +735,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>
@@ -716,6 +764,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>
@@ -748,6 +797,7 @@
     <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>
@@ -756,6 +806,7 @@
     <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 +821,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 +846,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>
@@ -835,7 +889,7 @@
     <string name="menu_restore" msgid="8260067415075573273">"Återställ standardinst."</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"Återställning av standardinställningar för APN har slutförts."</string>
     <string name="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>
@@ -847,7 +901,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>
@@ -912,11 +966,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>
@@ -966,11 +1021,12 @@
     <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="activity_not_found" msgid="5551664692991605325">"Appen är inte installerad på mobilen."</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="tablet" msgid="8616353869251700776">"Skydda surfplattan 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="manageapplications_settings_title" msgid="7041951105633616745">"Hantera appar"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Hantera och ta bort installerade appar"</string>
@@ -979,8 +1035,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1107,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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Använt utrymme"</string>
@@ -1094,6 +1159,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 +1179,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>
@@ -1164,7 +1231,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Ange alternativ för apputveckling"</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="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="allow_mock_location" msgid="2787962564578664888">"Tillåt skenplatser"</string>
@@ -1207,8 +1276,10 @@
     <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="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_title" product="default" msgid="2226662853797940829">"Skydda SD-kortet"</string>
@@ -1234,14 +1305,23 @@
     <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\n"Nä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\n"Obs! 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\n"Steg 1: Tryck länge på strömbrytaren tills du hör ett ljud eller känner en vibration."\n\n"Steg 2: Tryck länge med två fingrar tills en bekräftelse läses upp."\n\n"Om 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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Ökad webbtillgänglighet"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Inställningar"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"På"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Av"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"På"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Av"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Tillåtet"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Inte tillåtet"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Tillåt"</string>
@@ -1287,7 +1367,7 @@
     <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>
@@ -1309,7 +1389,7 @@
     <string name="battery_action_wifi" msgid="2272741639606146903">"WiFi-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>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Uppdatera Bluetooth-inställningar"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"på"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"av"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"aktiverar"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"inaktiverar"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1506,10 +1598,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 />
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Visa GPU-flerlagerritning"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Från bäst till sämst: blå, grön, ljusröd, röd"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Inaktivera HW-överlagringar"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Använd alltid GPU för skärmsammansättning"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Aktivera spår"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1610,7 +1710,7 @@
     <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_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="tablet" msgid="7312283529426636845">"Alla kontoändringar som görs på webben kopieras automatiskt till surfplattan."\n\n"För vissa konton kopieras även alla ändringar som görs på surfplattan 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_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>
@@ -1620,13 +1720,16 @@
     <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="tablet" msgid="3893348029612821262">"Mobildataanslutningen inaktiveras när den angivna gränsen är nådd."\n\n" Eftersom dataanvändningen mäts med hjälp av surfplattan, och det kan hända att din operatör beräknar användningen annorlunda, kan det vara bra att använda en lågt beräknad gräns."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobildataanslutningen inaktiveras när den angivna gränsen är nådd."\n\n" Eftersom dataanvändningen mäts med hjälp av mobilen, och det kan hända att din operatör beräknar användningen annorlunda, kan det vara bra att använda en lågt beräknad gräns."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vill du begränsa bakgrundsdata?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Om du begränsar mobildata i bakgrunden kanske vissa appar och tjänster inte fungerar såvida du inte är ansluten till ett Wi-Fi-nätverk."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Om du begränsar användningen av mobildata i bakgrunden kommer vissa appar och tjänster bara att fungera när du är ansluten till ett Wi-Fi-nätverk."\n\n"Den här inställningen påverkar samtliga användare."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Om du begränsar användningen av mobildata i bakgrunden kommer vissa appar och tjänster bara att fungera när du är ansluten till ett Wi-Fi-nätverk."\n\n"Den här inställningen påverkar samtliga användare."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Du"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Andra användare"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Lägg till användare"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Aktiv"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Ej aktiv"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Inte konfigurerad"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Ägare"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Smeknamn"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Lägg till en ny användare"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Du kan dela den här enheten med andra genom att skapa fler användare. Alla användare har sitt eget utrymme som de kan anpassa med appar, bakgrunder med mera. Användarna kan även justera inställningar för surfplattan som påverkar alla andra, till exempel Wi-Fi."\n\n"När du skapar en ny användare måste han eller hon genomgå en konfigureringsprocess."\n\n"Alla användare kan godkänna uppdaterade appbehörigheter för alla andra användare."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"När du skapar en ny användare måste han eller hon genomgå en konfigureriringsprocess."\n\n"Alla användare kan godkänna uppdaterade appbehörigheter för alla andra användare."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Konfigurera användare nu?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Se till att personen har möjlighet att använda surfplattan och konfigurera sitt utrymme"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 04623b3..3af195a 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -162,7 +162,7 @@
   <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>
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Kiwango cha wastani"</item>
     <item msgid="4071574792028999443">"Hakuna mchakato wa mandari nyuma"</item>
@@ -277,4 +290,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..b3f8d0a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Hapana"</string>
     <string name="create" msgid="3578857613172647409">"Unda"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Haijulikani"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Sasa uko katika hatua ya <xliff:g id="STEP_COUNT">%1$d</xliff:g> kuwa msanidi programu."</string>
+    <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>
@@ -84,12 +87,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>
@@ -113,7 +118,7 @@
     <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>
@@ -121,7 +126,7 @@
     <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 +146,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="5279027758886569301">"Programu inataka kuwasha Bluetooth. Kubali?"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="4420151924834278808">"Programu 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">"Programu 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">"Programu 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">"Programu 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">"Programu 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">"Programu 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">"Programu 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">"Programu katika simu yako inataka kuwasha Bluetooth na kufanya simu yako igundulike na vifaa vingine. Kubali?"</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>
@@ -192,6 +197,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>
@@ -269,6 +275,8 @@
     <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="roaming_turn_it_on_button" msgid="4387601818162120589">"Iwashe"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Ukiruhusu data kupitia mitandao mingine, unaweza kupata gharama kubwa ya kupitia mitandao mingine!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Unaporuhusu data kupitia mitandao mingine, huenda ukatozwa gharama kubwa za matumizi ya nje!"\n\n"Mpangilio huu unaathiri watumiaji wote kwenye kompyuta hii ndogo."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Unaporuhusu data kupitia mitandao mingine, huenda ukatozwa gharama kubwa za matumizi ya nje!"\n\n"Mpangilio 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>
@@ -299,6 +307,8 @@
     <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="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Onyesha maelezo ya mtumiaji kwenye skrini ya kufunga"</string>
+    <string name="user_info_settings_title" msgid="1195015434996724736">"Maelezo ya mtumiaji"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Ufikivu wa eneo"</string>
     <string name="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>
@@ -364,7 +374,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>
@@ -470,15 +482,36 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kama simu ya spika"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Kwa muziki na midia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kumbuka mipangilio"</string>
+    <string name="wifi_display_settings_title" msgid="564299108014609382">"Uonyeshaji bila kutumia waya"</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Ili kuona vifaa, washa uonyeshaji bila kutumia waya."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Uonyeshaji bila kutumia waya umezimwa kwa sababu Wi-Fi imezima."</string>
+    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Tafuta maonyesho"</string>
+    <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Inatafuta…"</string>
+    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Hakuna maonyesho ya karibu ya pasiwaya yalipatikana."</string>
+    <string name="wifi_display_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_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 ni kimewashwa, unaweza boriti maudhui ya programu kwa kifaa kingine cha NFC chenye uwezo kwa kusikilia vifaa karibu pamoja. Kwa mfano, unaweza boriti  kurasa za Kivinjari, videos za YouTube, Anwani za Watu, na zaidi. "\n" "\n" Leta tu vifaa pamoja (kawaida nyuma kwa nyuma) na kisha gusa kioo chako. Programu huamua nini inapata mwale."</string>
     <string name="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>
@@ -499,9 +532,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Kulikuwa na hitilafu wakati wa kubadilisha mipangilio"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Uboreshaji wa Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Punguza matumizi ya betri wakati Wi-Fi inapowaka"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Ongeza mtandao"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"Mitandao-hewa"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Kitufe cha kusukuma cha WSP"</string>
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"Chaguo zaidi"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Kiingilio cha Pin ya WPS"</string>
     <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Moja kwa moja"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tafuta"</string>
@@ -514,14 +550,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Mtandao mwingine..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Zaidi"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Usanidi otomatiki (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Ili kukamilisha usanidi, kompyuta yako ndogo inahitaji ufikiaji katika Wi-Fi. Baada usanidi,  unaweza kubadili kati ya data ya simu na Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Ingiza pin <xliff:g id="NUMBER">%1$s</xliff:g> kwenye kipanga njia chako cha Wi-Fi. Usanidi unaweza kuchukua hadi dakika mbili ili kukamilika."</string>
     <string name="wifi_wps_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_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>
@@ -561,6 +598,14 @@
     <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_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\n"Usanidi wa kompyuta ndogo unaweza kuhitaji huduma muhimu ya mtandao."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ILANI: Huenda ukatozwa gharama ya ziada ya data ya mtoa huduma."\n\n"Usanidi wa simu unaweza kuhitaji huduma muhimu ya mtandao."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ILANI: Kompyuta ndogo haitaweza kuthibitisha kuwa programu yako imesasishwa."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ILANI: Simu haitaweza kuthibitisha kuwa programu yako imesasishwa."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Kompyuta ndogo haikuweza kuunganika kwenye mtandao huu wa Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Simu haikuweza kuunganika kwenye mtandao huu wa Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Mtandao hewa mahiri"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Bendi ya masafa ya mtandao-hewa"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Bainisha masafa ya mazoea ya shughuli"</string>
@@ -585,6 +630,7 @@
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Inatafuta…"</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Pea kifaa jina jipya"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Vifaa shiriki"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Vikundi vilivyokumbukwa"</string>
     <string name="wifi_p2p_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,7 +638,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Sahau kikundi hiki?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Ubebezi wa Mipangilo ya ubebezi wa eneo maalum la Wi-Fi"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Inawezesha mtandao-hewa…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Inalemaza mtandao-hewa…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot bebezi<xliff:g id="NETWORK_SSID">%1$s</xliff:g> amilifu"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Wi-Fi hotspot bebezi ina hitilafu"</string>
     <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Sanidi mtandao-hewa wa Wi-Fi"</string>
@@ -661,15 +710,16 @@
     <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="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">"Ndoto ya mchana"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Wakati inapogatiwa au kulala na inachaji"</string>
+    <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Yoyote kati ya hizi mbili"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Inapochaji"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Inapogatiwa"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Imezimwa"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Ili kudhibiti kinachotendeka simu inapogatiwa na/au inapolala, washa Kuota Mchana."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Wakati wa kuingia katika hali tulivu"</string>
+    <string name="screensaver_settings_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>
@@ -698,7 +748,7 @@
     <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="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 +756,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>
@@ -738,6 +789,7 @@
     <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_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>
@@ -746,6 +798,7 @@
     <string name="memory_dcim_usage" msgid="558887013613822577">"Picha, video"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Sauti (muziki, toni milio, podikasti n.k)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Mengineyo."</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Data ya kache"</string>
     <string name="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 +813,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">"Futa data ya kache?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Hii itafuta data yote ya kache kwa programu zote."</string>
+    <string name="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>
@@ -783,6 +838,7 @@
     <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_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>
@@ -827,8 +883,8 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Rejesha kwa 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_desc" product="tablet" msgid="8317211882509025841">"Hii itafuta data zote kutoka kes hifadhi yako "<b>" ndani ya kompyuta ndogo"</b>", pamoja  na: "\n" "\n" "<li>" Google Account yako "</li>" "\n" "<li>" Mfumo na programu ya data na mipangilio "</li>" "\n" "<li>"programu Zilizopakuliwa "</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Hii itafuta data zote kutoka kes hifadhi yako "<b>" ndani ya kompyuta ndogo"</b>", pamoja na: "\n" "\n" "<li>" Google Account yako "</li>" "\n" "<li>" Mfumo na programu ya data na mipangilio "</li>" "\n" "<li>"programu Zilizopakuliwa "</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kwa sasa umeingia kwenye akaunti zinazofuata:"\n</string>
     <string name="master_clear_desc_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>
@@ -885,7 +941,7 @@
     <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="location_title" msgid="1029961368397484576">"Mahali pangu"</string>
     <string name="location_network_based" msgid="7472814266821714527">"Eneo la mtandao wa Wi-Fi na wa simu"</string>
@@ -907,6 +963,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>
@@ -956,21 +1013,24 @@
     <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="activity_not_found" msgid="5551664692991605325">"Programu haijasakinishwa kwenye simu yako."</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="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="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 mahiri"</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>
@@ -985,23 +1045,25 @@
     <string name="controls_label" msgid="7611113077086853799">"Vidhibiti"</string>
     <string name="force_stop" msgid="7435006169872876756">"Lazimisha komesha"</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="uninstall_all_users_text" msgid="851857393177950340">"Sakinusha kwa watumiaji wote"</string>
+    <string name="install_text" msgid="884360662922471113">"Sakinisha"</string>
     <string name="disable_text" msgid="6544054052049395202">"Lemaza"</string>
     <string name="enable_text" msgid="9217362512327828987">"Wezesha"</string>
     <string name="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="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>
@@ -1020,20 +1082,21 @@
     <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="clear_data_failed" msgid="1907582169616856698">"Haikuweza kufuta data ya programu."</string>
     <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"Sanidua visasisho?"</string>
-    <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Usasisho zote kwa mfumo wa prog ya Android zitasakinishuliwa."</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>
@@ -1044,6 +1107,8 @@
     <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>
@@ -1055,28 +1120,30 @@
     <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="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="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>
@@ -1084,19 +1151,21 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Mtumiaji: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Mtumiaji aliyeondolewa"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> shughulika na <xliff:g id="NUMSERVICES">%2$d</xliff:g> huduma"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> shughulika na <xliff:g id="NUMSERVICES">%2$d</xliff:g> huduma"</string>
     <string name="running_processes_item_description_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="runningservicedetails_settings_title" msgid="3224004818524731568">"Programu inayoendeshwa"</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 inaweza kusababisha programu kushindwa."</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>
@@ -1120,7 +1189,7 @@
     <string name="show_password" msgid="3001113966880559611">"Fanya manenosiri kuonekana"</string>
     <string name="show_password_summary" msgid="7345931695292850058"></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>
@@ -1159,14 +1228,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,9 +1255,11 @@
     <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="enable_adb" msgid="7982306934419797485">"Utatuzi wa USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Muundo wa kurekebisha wakati USB imeunganishwa"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"Ripoti za hitilafu za menyu ya nguvu"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Jumuisha chaguo katika menyu ya nguvu kwa kupeleka ripoti ya hitilafu"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Kaa ange"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skrini haitawahi kuzima wakati unachaji"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Ruhusu maeneo ya jaribio"</string>
@@ -1197,6 +1268,8 @@
     <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="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>
@@ -1217,21 +1290,30 @@
     <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\n"Unapokuwa umekuza, unaweza:"\n<ul><li>"Kupindua: Vuta vidole viwili au zaidi kwenye skrini."</li>\n<li>"Rekebisha kiwango cha ukuzaji: Bana vidole mbiwili au zaidi pamoja au uzitawanye."</li></ul>\n\n"Pia unaweza kukuza hali, unaweza kuvuta kidole chako ili kuchunguza sehemu mbalimbali za skrini. Inua kidole chako ili kurejea kwenye hali yako ya awali."\n\n"Dokezo: Mgongo wa mara tatu wa ukuzaji unafanya kazi kila mahali isipokuwa kwenye kibodi na upau wa kuabiri."</string>
+    <string name="accessibility_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\n"Hatua ya 1: Bonyeza na ushikilie kitufe cha kuwasha/kuzima mpaka utakaposikia sauti au kuhisi mtetemo."\n\n"Hatua ya 2: Gusa na ushikilie vidole viwili mpaka utakaposikia uthibitishaji wa sauti."\n\n"Ikiwa 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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Boresha ufikiaji wavuti"</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_feature_state_on" msgid="2864292320042673806">"Imewashwa"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Imezimwa"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Imeruhusiwa"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Hairuhusiwi"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Ruhusu"</string>
@@ -1244,7 +1326,7 @@
     <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_script_injection_security_warning_summary" msgid="7706858873495386310">"Je, unataka programu kusakinisha hati kutoka kwa Google ambazo zinafanya maudhui ya wavuti yao ipatikane?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Hakuna maelezo yaliyotolewa."</string>
     <string name="settings_button" msgid="3006713718908152930">"Mipangilio"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Betri"</string>
@@ -1314,6 +1396,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>
@@ -1370,6 +1453,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Inasasisha mpangilio wa Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"Imewashawa"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"Imezimwa"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"Inawasha"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"Inazima"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
+    <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
+    <string name="gadget_sync" msgid="858895763714222152">"Landanisha"</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>
@@ -1402,13 +1499,10 @@
     <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_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="auto_restore_summary" msgid="4235615056371993807">"Wakati kusanidi upya programu, rejeza mipangilio iliyohifadhiwa na data"</string>
     <string name="local_backup_password_title" msgid="3860471654439418822">"Nenosiri la chelezo ya eneo kazi"</string>
     <string name="local_backup_password_summary_none" msgid="393503434408227110">"Chelezo kamili za eneo kazi hazijalindwa kwa sasa"</string>
     <string name="local_backup_password_summary_change" msgid="2731163425081172638">"Gusa ili kubadilisha au kuondoa nenosiri la chelezo kamili za eneo kazi"</string>
@@ -1478,7 +1572,7 @@
     <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>
@@ -1496,10 +1590,10 @@
     <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 />
@@ -1538,6 +1632,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Onyesha utoaji zaidi wa GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Kutoka kwa bora hadi mbovu zaidi: samawati, kijani, nyekundu hafifu, nyekundu"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Lemaza miekeleo ya HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Daima tumia GPU kwa mchanganyiko wa skrini"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Wezesha ufuatiliaji"</string>
@@ -1545,18 +1643,22 @@
     <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="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="track_frame_time" msgid="6146354853663863443">"Utungilizaji wa GPU ya wasifu"</string>
     <string name="track_frame_time_summary" msgid="447577515813970287">"Pima muda wa kutungiliza katika adp shell dumpys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Kipimo cha uhiani wa Window"</string>
     <string name="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>
@@ -1592,10 +1694,10 @@
     <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_restrict_denied_dialog" msgid="7086969103661420799">"Kuzuia data za usuli inawezekana tu wakati umeweka kikomo cha data ya simu ya mkono."</string>
@@ -1614,9 +1716,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Muunganisho wako wa data ya simu utalemazwa wakati kiwango kilichobainishwa kitafikiwa. "\n\n" Kwa kuwa matumizi ya data yanapimwa na simu yako, na mtoa huduma wako anaweza kuhesabu matumizi kwa njia tofauti, zingatia kutumia kiwango cha kutunza."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Zuia data ya mandhari nyuma?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ukizuia data ya usuli ya rununu, baadhi ya programu na huduma hazitafanya kazi mpaka uunganishe mtandao wa Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Ukizuia data ya maandharinyuma ya simu, baadhi ya programu na huduma hazitafanya kazi isipokuwa uunganishwe kwenye mtandao wa Wi-Fi."\n\n"Mpangilio huu unaathiri watumiaji wote kwenye kompyuta hii ndogo."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Ukizuia data ya maandharinyuma ya simu, baadhi ya programu na huduma hazitafanya kazi isipokuwa uunganishwe kwenye mtandao wa Wi-Fi."\n\n"Mpangilio huu unaathiri watumiaji wote kwenye simu hii."</string>
     <string name="data_usage_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>
@@ -1651,12 +1756,16 @@
     <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>
@@ -1675,24 +1784,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Wewe"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Watumiaji wengine"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Ongeza mtumiaji"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Amilifu"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Sio amilifu"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Haijasanidiwa"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Mmiliki"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Jina la utani"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Ongeza mtumiaji mpya"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Unaweza kushiriki kifaa hiki na watu wengine kwa kuweka watumiaji wa ziada. Kila mtumiaji ana nafasi yake binafsi, ambazo wanaweza kugeuza kukufaa kwa programu zao binafsi, pazia, na kadhalika. watumia pia wanaweza kurekebisha mipangilio ya kompyuta ndogo kama Wi-Fi ambayo inaathiri kila mtu."\n\n"Baada ya kuweka mtumiaji mpya, mtu huyo anahitaji kupitia mchakato wa usanidi."\n\n"Mtumiaji yeyote anaweza kukubali ruhusa zilizosasishwa za programu kwa niaba ya watumiaji wengine wote."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Baada ya kuweka mtumiaji mpya, mtu huyo anahitaji kupitia mchakato wa usanidi."\n\n"Mtumiaji yeyote anaweza kukubali ruhusa zilizosasishwa za programu kwa niaba ya watumiaji wengine wote."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Sandi mtumiaji sasa?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Hakikisha kuwa mtu wa kuchukua kompyuta ndogo na kusanidi nafasi yake yupo"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </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..1374efd 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -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..9f02164 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>
@@ -57,4 +57,8 @@
         <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/dimens.xml b/res/values-sw720dp/dimens.xml
new file mode 100644
index 0000000..d6d9184
--- /dev/null
+++ b/res/values-sw720dp/dimens.xml
@@ -0,0 +1,22 @@
+<?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="pager_tabs_padding">@*android:dimen/preference_fragment_padding_side</dimen>
+    <dimen name="appwidget_preview_height">80dip</dimen>
+    <integer name="keyguard_appwidget_picker_cols">2</integer>
+    <dimen name="keyguard_appwidget_picker_width">720dip</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..16eb8e7 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"ขีดจำกัดมาตรฐาน"</item>
     <item msgid="4071574792028999443">"ไม่มีกระบวนการพื้นหลัง"</item>
@@ -277,4 +290,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..aac326c 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"ไม่"</string>
     <string name="create" msgid="3578857613172647409">"สร้าง"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ไม่ทราบ"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"คุณเหลืออีกเพียง <xliff:g id="STEP_COUNT">%1$d</xliff:g> ขั้นตอนเพื่อเป็นนักพัฒนาซอฟต์แวร์"</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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 +305,8 @@
     <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="location_settings_title" msgid="4483843407328665068">"การเข้าถึงตำแหน่ง"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"ความปลอดภัย"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"ตั้งค่าตำแหน่งของฉัน ปลดล็อกหน้าจอ ล็อกซิมการ์ด ล็อกที่จัดเก็บข้อมูลรับรอง"</string>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"จอแสดงผลระบบไร้สายถูกปิดการใช้งานเนื่องจาก 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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"มีปัญหาในการเปลี่ยนแปลงการตั้งค่า"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"การเพิ่มประสิทธิภาพ Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"ลดการใช้แบตเตอรี่เมื่อ Wi-Fi เปิดอยู่"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"เพิ่มเครือข่าย"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"เครือข่าย 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">"WiFi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"สแกน"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"เครือข่ายอื่น…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"เพิ่มเติม"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"การตั้งค่าอัตโนมัติ (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"เพื่อดำเนินการตั้งค่าให้เสร็จสิ้น แท็บเล็ตของคุณต้องเข้าถึง WiFi หลังจากการตั้งค่า คุณจะสามารถสลับระหว่างข้อมูลมือถือและ WiFi ได้"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"แสดงตัวเลือกขั้นสูง"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"การตั้งค่าการป้องกัน 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_pin" msgid="8067502591043979939">"ป้อน 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_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>
@@ -571,6 +606,14 @@
     <string name="wifi_save" msgid="3331121567988522826">"บันทึก"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"ไม่สามารถบันทึกเครือข่าย"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"ยกเลิก"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"ข้ามไปเลย"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"ไม่ข้าม"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"คำเตือน: การดำเนินการของคุณอาจมีค่าบริการเพิ่มเติมจากการใช้ข้อมูลของผู้ให้บริการ"\n\n"การตั้งค่าแท็บเล็ตอาจต้องใช้กิจกรรมเครือข่ายที่ใช้ปริมาณข้อมูลสูง"</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"คำเตือน: การดำเนินการของคุณอาจมีค่าบริการเพิ่มเติมจากการใช้ข้อมูลของผู้ให้บริการ"\n\n"การตั้งค่าโทรศัพท์อาจต้องใช้กิจกรรมเครือข่ายที่ใ้ช้ปริมาณข้อมูลสูง"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"คำเตือน: แท็บเล็ตจะไม่สามารถยืนยันว่าซอฟต์แวร์ของคุณเป็นรุ่นปัจจุบัน"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"คำเตือน: โทรศัพท์จะไม่สามารถยืนยันว่าซอฟต์แวร์ของคุณเป็นรุ่นปัจจุบัน"</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"แท็บเล็ตไม่สามารถเชื่อมต่อกับเครือข่าย WiFi นี้"</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"โทรศัพท์ไม่สามารถเชื่อมต่อกับเครือข่าย WiFi นี้"</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi ขั้นสูง"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"ย่านความถี่ Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"ระบุช่วงความถี่ของการดำเนินการ"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"หากคุณตัดการเชื่อมต่อ จะเป็นการสิ้นสุดการเชื่อมต่อของคุณกับ <xliff:g id="PEER_NAME">%1$s</xliff:g> และอุปกรณ์อื่นอีก <xliff:g id="PEER_COUNT">%2$s</xliff:g> รายการ"</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ยกเลิกข้อความเชิญหรือไม่"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"คุณต้องการยกเลิกข้อความเชิญเพื่อเชื่อมต่อกับ <xliff:g id="PEER_NAME">%1$s</xliff:g> หรือไม่"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ไม่จำกลุ่มนี้ใช่หรือไม่"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"ไม่ได้ติดตั้งแอปพลิเคชันบนโทรศัพท์ของคุณ"</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"ที่เก็บข้อมูล USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"บนการ์ด SD"</string>
     <string name="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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"การใช้ที่เก็บข้อมูล"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"ตั้งค่าตัวเลือกสำหรับการพัฒนาแอปพลิเคชัน"</string>
     <string name="enable_adb" msgid="7982306934419797485">"การแก้ไขข้อบกพร่อง USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"โหมดแก้ไขข้อบกพร่องเมื่อเชื่อมต่อ USB"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"รายงานข้อบกพร่องเกี่ยวกับเมนูเปิดปิด"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"เพิ่มตัวเลือกในเมนูเปิดปิดสำหรับการใช้รายงานข้อบกพร่อง"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"เปิดหน้าจอค้าง"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"หน้าจอจะไม่เข้าสู่โหมดสลีปขณะชาร์จ"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"อนุญาตให้จำลองตำแหน่ง"</string>
@@ -1207,6 +1276,8 @@
     <string name="adb_warning_message" msgid="7316799925425402244">"การแก้ไขข้อบกพร่อง 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>
@@ -1234,14 +1305,23 @@
     <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_toggle_script_injection_preference_title" msgid="7950932054266694403">"การปรับปรุงการเข้าถึงเว็บให้ดีขึ้น"</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_feature_state_on" msgid="2864292320042673806">"เปิด"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"ปิด"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"อนุญาต"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"ไม่อนุญาต"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"อนุญาต"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <string name="gadget_title" msgid="5519037532720577836">"การควบคุมพลังงาน"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"กำลังอัปเดตการตั้งค่า Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"กำลังอัปเดตการตั้งค่าบลูทูธ"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"เปิด"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"ปิด"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"กำลังเปิด"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"กำลังปิด"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"WiFi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"แสดงการใช้ GPU มากเกินไป"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"จากดีที่สุดไปหาแย่ที่สุด: ฟ้า เขียว แดงอ่อน แดง"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"ปิดใช้งานการวางซ้อน HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"ใช้ GPU ในการจัดวางองค์ประกอบหน้าจอเสมอ"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"เปิดใช้งานร่องรอย"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"การเชื่อมต่อข้อมูลผ่านมือถือของคุณจะถูกปิดใช้งานเมื่อครบจำนวนจำกัดที่ระบุไว้"\n\n"เนื่องจากการใช้งานข้อมูลถูกวัดปริมาณด้วยโทรศัพท์ของคุณ และผู้ให้บริการของคุณอาจมีการบันทึกปริมาณการใช้งานที่แตกต่างออกไป ดังนั้น โปรดเลือกวิธีที่ปลอดภัย"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"ต้องการจำกัดข้อมูลแบ็กกราวด์หรือไม่"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"หากคุณจำกัดข้อมูลแบ็กกราวด์บนมือถือ แอปพลิเคชันและบริการบางอย่างจะไม่ทำงานจนกว่าคุณจะเชื่อมต่อกับเครือข่าย WiFi"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"หากคุณจำกัดข้อมูลพื้นหลังของมือถือ แอปพลิเคชันและบริการบางอย่างจะไม่ทำงานเว้นแต่คุณจะเชื่อมต่อกับเครือข่าย WiFi"\n\n"การตั้งค่านี้ส่งผลต่อผู้ใช้แท็บเล็ตนี้ทุกราย"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"หากคุณจำกัดข้อมูลพื้นหลังของมือถือ แอปพลิเคชันและบริการบางอย่างจะไม่ทำงานเว้นแต่คุณจะเชื่อมต่อกับเครือข่าย WiFi"\n\n"การตั้งค่านี้ส่งผลต่อผู้ใช้โทรศัพท์นี้ทุกราย"</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"คุณ"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"ผู้ใช้รายอื่นๆ"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"เพิ่มผู้ใช้"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"ใช้งานอยู่"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"ไม่ได้ใช้งาน"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"ไม่ได้ตั้งค่า"</string>
+    <string name="user_owner" msgid="3879126011135546571">"เจ้าของ"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"ชื่อเล่น"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"เพิ่มผู้ใช้ใหม่"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"คุณสามารถใช้อุปกรณ์นี้ร่วมกับคนอื่นๆ ได้ด้วยการสร้างผู้ใช้เพิ่มเติม ผู้ใช้แต่ละคนมีพื้นที่ของตัวเอง ซึ่งพวกเขาสามารถกำหนดค่าด้วยแอปพลิเคชัน วอลเปเปอร์ของตนเอง และอื่นๆ นอกจากนี้ ผู้ใช้ยังสามารถปรับการตั้งค่าแท็บเล็ต เช่น WiFi ซึ่งจะส่งผลกระทบต่อทุกคน"\n\n"หลังจากที่คุณสร้างผู้ใช้ใหม่แล้ว ผู้ใช้รายนั้นๆ ต้องทำตามขั้นตอนในการตั้งค่า"\n\n"ผู้ใช้ทั้งหมดสามารถยอมรับการอนุญาตแอปพลิเคชันที่มีการอัปเดตในนามของผู้ใช้รายอื่นๆ ได้"</string>
+    <string name="user_add_user_message_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_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index d305b78..18568fd 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Karaniwang limitasyon"</item>
     <item msgid="4071574792028999443">"Walang mga proseso sa background"</item>
@@ -277,4 +290,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..3c3b4df 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Hindi"</string>
     <string name="create" msgid="3578857613172647409">"Likhain"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Hindi Kilala"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"<xliff:g id="STEP_COUNT">%1$d</xliff:g> (na) hakbang na lang ang layo mo mula sa pagiging isang developer."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Nakakaapekto 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\n"Nakakaapekto 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>
@@ -297,6 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Nagkaproblema sa pagbabago ng setting"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Pag-optimize sa Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Bawasan ang paggamit ng baterya kapag naka-on ang Wi-Fi"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Magdagdag ng network"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"I-scan"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Iba pang network..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Higit pa"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Awtomatikong setup (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Upang makumpleto ang pag-setup, kailangan ng iyong tablet ng access sa Wi-Fi. Pagkatapos ng pag-setup, maaari kang magpalipat-lipat sa pagitan ng mobile data at Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Ilagay ang pin na <xliff:g id="NUMBER">%1$s</xliff:g> sa iyong router ng Wi-Fi. Maaaring tumagal nang hanggang dalawang minuto upang makumpleto ang pag-setup."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Maaaring mangailangan ng malaking aktibidad ng network ang pag-setup ng tablet."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"BABALA: Maaari kang makaipon ng karagdagang mga singil sa data ng carrier."\n\n"Maaaring mangailangan ng malaking aktibidad ng network ang pag-setup ng telepono."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"BABALA: Hindi mabe-verify ng tablet na napapanahon ang iyong software."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"BABALA: Hindi mabe-verify ng telepono na napapanahon ang iyong software."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Hindi nakakonekta sa Wi-Fi network na ito ang tablet."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Hindi nakakonekta sa Wi-Fi network na ito ang telepono."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Advanced na Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Frequency band ng Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Tukuyin ang sakop ng frequency ng pagpapatakbo"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Kalimutan ang pangkat na ito?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Portable na Wi-Fi hotspot"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -875,7 +929,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>
@@ -899,7 +953,7 @@
     <string name="network_settings_title" msgid="7967552516440151852">"Mga mobile network"</string>
     <string name="location_title" msgid="1029961368397484576">"Aking Lokasyon"</string>
     <string name="location_network_based" msgid="7472814266821714527">"Lok. ng Wi-Fi, mobile network"</string>
-    <string name="location_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" msgid="5626515380188353712">"Ipagamit sa apps ang serbisyo ng lok. ng Google para mabilis na itantya ang iyong lok.  Kokolektahin at ipapadala sa Google ang mga di alam na data ng lok."</string>
     <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Natukoy ang lokasyon ng Wi-Fi"</string>
     <string name="location_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>
@@ -917,6 +971,7 @@
     <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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Hindi naka-install ang application sa iyong telepono."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Imbakan na USB"</string>
@@ -1054,6 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Paggamit ng imbakan"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Magtakda ng mga pagpipilian para sa pagbuo ng app"</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="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="allow_mock_location" msgid="2787962564578664888">"Payagan ang mga kunwaring lokasyon"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Habang 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\n"Tandaan: 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\n"Hakbang 1: Pindutin nang matagal ang power button hanggang sa may marinig kang tunog o maramdamang vibration."\n\n"Hakbang 2: Pindutin nang matagal gamit ang dalawang daliri hanggang sa makarinig ka ng kumpirmasyong audio."\n\n"Kung 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">"Tinatapos ng power button ang tawag"</string>
+    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Sabihin ang mga password"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Pindutin nang matagal ang pagkaantala"</string>
+    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Pahusayin ang accessibility sa web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Mga Setting"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Naka-on"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Naka-off"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Naka-on"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Naka-off"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Pinapayagan"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Hindi pinapayagan"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Payagan"</string>
@@ -1313,7 +1393,7 @@
     <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>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Pag-update ng setting ng Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"naka-on"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"naka-off"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"pag-on"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"pag-off"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Ipakita overdraw ng GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Maganda-di maganda: asul, berde, light red, pula"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Wag paganahin HW overlay"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Laging gamitin ang GPU para sa screen compositing"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Paganahin ang mga trace"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Hindi pagaganahin ang koneksyon ng iyong data ng mobile kapag naabot na ang tinukoy na limitasyon."\n\n"Dahil sinusukat ng iyong telepono ang paggamit ng data, at maaaring kuwentahin ang iyong carrier para sa paggamit sa ibang paraan, isaalang-alang ang paggamit ng konserbatibong limitasyon."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Paghigpitan ang data ng background?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Kung paghihigpitan mo ang background na data sa mobile, hindi gagana ang ilang app at serbisyo maliban kung nakakonekta ka sa isang Wi-Fi network."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Kung pagihihgpitan mo ang background na mobile data, hindi gagana ang ilang apps at serbisyo hanggang sa makakonekta ka sa isang Wi-Fi network."\n\n"Nakakaapekto ang setting na ito sa lahat ng user sa tablet na ito."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Kung paghihigpitan mo ang background na mobile data, hindi gagana ang ilang apps at serbisyo hanggang sa makakonekta ka sa isang Wi-Fi network."\n\n"Nakakaapekto ang setting na ito sa lahat ng user sa teleponong ito."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Ikaw"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Iba pang mga user"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Idagdag ang user"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Aktibo"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Hindi aktibo"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Hindi naka-set up"</string>
+    <string name="user_owner" msgid="3879126011135546571">"May-ari"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Palayaw"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Idagdag ang bagong user"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Maibabahagi mo ang device na ito sa iba pang mga tao sa pamamagitan ng paglikha ng mga karagdagang user. May sariling espasyo ang bawat user, na maaari nilang i-customize gamit ang kanilang sariling apps, wallpaper, at marami pa. Maaari ring ayusin ng mga user ang mga setting ng tablet tulad ng Wi-Fi na makakaapekto sa lahat."\n\n"Pagkatapos mong lumikha ng bagong user, kailangang sumailalim ng taong iyon sa proseso ng pag-setup."\n\n"Ang sinumang user ay maaaring tumanggap ng na-update na mga pagpapahintulot sa app sa ngalan ng lahat ng iba pang user."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Pagkatapos mong lumikha ng bagong user, kailangang sumailalim ng taong iyon sa proseso ng pag-setup."\n\n"Ang sinumang user ay maaaring tumanggap ng na-update na mga pagpapahintulot sa app sa ngalan ng lahat ng iba pang user."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"I-set up ang user ngayon?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Tiyaking available ang tao na kunin ang tablet at i-set up ang kanyang espasyo"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 29978e7..c76985c 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standart sınır"</item>
     <item msgid="4071574792028999443">"Arka planda işlem yok"</item>
@@ -277,4 +290,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..752361a 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Hayır"</string>
     <string name="create" msgid="3578857613172647409">"Oluştur"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Bilinmiyor"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Geliştirici olmanıza <xliff:g id="STEP_COUNT">%1$d</xliff:g> adım kaldı."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Bu 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\n"Bu 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 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Ayarı değiştirirken bir sorun oluştu"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Kablosuz optimizasyonu"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Kablosuz açıkken pil kullanımını en aza indir"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Ağ ekle"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Tara"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Diğer ağ…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Diğer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Otomatik kurulum (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Kurulumun tamamlanabilmesi için tabletinizin Kablosuz bağlantıya erişmesi gerekecektir. Kurulumdan sonra, mobil veri ile Kablosuz arasında geçiş yapabilirsiniz."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Kablosuz yönlendiricinizde <xliff:g id="NUMBER">%1$s</xliff:g> pin kodunu girin. Kurulum işleminin tamamlanması iki dakika kadar sürebilir."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Tabletin kurulumu önemli miktarda ağ etkinliği gerektirebilir."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"UYARI: Ek operatör veri ücretleri alınabilir."\n\n"Telefonun kurulumu önemli miktarda ağ etkinliği gerektirebilir."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"UYARI: Tablet, yazılımınızın güncel olduğunu doğrulayamayacaktır."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"UYARI: Telefon, yazılımınızın güncel olduğunu doğrulayamayacaktır."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tablet bu Kablosuz ağa bağlanamadı."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefon bu Kablosuz ağa bağlanamadı."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Gelişmiş Kablosuz"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Kablosuz frekans bandı"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"İşlemin sıklık aralığını belirtin"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Bu grup unutulsun mu?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Taşınabilir kablosuz ortak erişim noktası"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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">"Hafif uykuya geçilecek zaman"</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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"Uygulama, telefonunuzda yüklü değil."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Depolama kullanımı"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Uygulama geliştirme için seçenekleri ayarla"</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="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="allow_mock_location" msgid="2787962564578664888">"Sahte konumlara izin ver"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Yakı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\n"Not: Üç 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\n"1. Adım: Bir ses duyana veya titreşim hissedene kadar güç düğmesini basılı tutun."\n\n"2. Adım: İki parmağınızla dokunup sesli bir onay duyana kadar parmaklarınızı basılı tutun."\n\n"Cihazda 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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Web erişilebilirliğini geliştir"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Ayarlar"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Açık"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Kapalı"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Açık"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Kapalı"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"İzin Verildi"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"İzin verilmiyor"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"İzin ver"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Bluetooth ayarları güncelleniyor"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"açık"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"kapalı"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"açılıyor"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"kapatılıyor"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Kablosuz"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"GPU fazla çizimini göster"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"En iyiden en kötüye: mavi, yeşil, açık kırmızı, kırmızı"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW katmanlarını devre dışı bırak"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Ekran oluştururken her zaman GPU\'yu kullan"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"İzleri etkinleştir"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Belirtilen limite ulaşıldığında mobil veri bağlantınız kesilecektir."\n\n"Veri kullanımı telefonunuz tarafından ölçüldüğünden operatörünüzün kullanım hesaplaması farklı olabilir. Bu nedenle, risk almadan güvenli bir limit belirleyin."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Arka plan verileri kısıtlansın mı?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Arka plan mobil verilerini kısıtlarsanız, Kablosuz bir ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmaz."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Arka planda işlenen mobil verileri kısıtlarsanız, Kablosuz ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmayacaktır."\n\n"Bu ayar, bu tabletteki tüm kullanıcıları etkiler."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Arka planda işlenen mobil verileri kısıtlarsanız, Kablosuz ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmayacaktır."\n\n"Bu ayar, bu telefondaki tüm kullanıcıları etkiler."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Siz"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Diğer kullanıcılar"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Kullanıcı ekle"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Etkin"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Etkin değil"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Yapılandırılmadı"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Sahibi"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Takma Ad"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Yeni kullanıcı ekle"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Ek kullanıcılar yaratarak bu cihazı başka kişilerle paylaşabilirsiniz. Her kullanıcının kendine ait alanı olur ve bu alanı kendi uygulamaları, duvar kâğıdı vb. ile özelleştirebilir. Kullanıcılar, Kablosuz bağlantı gibi herkesi etkileyebilecek tablet ayarlarını da yapabilirler."\n\n"Yeni bir kullanıcı oluşturduktan sonra, o kişinin bir kurulum işlemini tamamlaması gerekir."\n\n"Herhangi bir kullanıcı, güncellenen uygulama izinlerini diğer kullanıcıların adına kabul edebilir."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Yeni bir kullanıcı oluşturduktan sonra, o kişinin bir kurulum işlemini tamamlaması gerekir."\n\n"Herhangi bir kullanıcı, güncellenen uygulama izinlerini diğer kullanıcıların adına kabul edebilir."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Kullanıcı şimdi yapılandırılsın mı?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"İlgili kişinin tableti almak ve kendi alanının kurulumunu yapmak için müsait olduğundan emin olun"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 016975c..5a47d0d 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартне обмеження"</item>
     <item msgid="4071574792028999443">"Без фонових процесів"</item>
@@ -277,4 +290,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..fff12a8 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Ні"</string>
     <string name="create" msgid="3578857613172647409">"Створити"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Невідомо"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Щоб стати розробником, залишилося лише стільки кроків: <xliff:g id="STEP_COUNT">%1$d</xliff:g>."</string>
+    <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 +87,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>
@@ -106,7 +111,7 @@
     <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" 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>
@@ -190,6 +195,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>
@@ -254,7 +260,7 @@
     <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>
@@ -267,13 +273,15 @@
     <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>
@@ -297,6 +305,8 @@
     <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="location_settings_title" msgid="4483843407328665068">"Доступ до місцезнаходження"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Безпека"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Устан. Моє місцезн., розблок. екрана, блок. SIM-карти, сховища обл. даних"</string>
@@ -312,7 +322,7 @@
     <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їх дані, медіа-файли й інші файли. Щойно ви зашифруєте свій телефон, потрібно буде вводити цифровий PIN-код чи пароль для розшифрування телефону щоразу під час його ввімкнення. Ви зможете скасувати шифрування, лише відновивши заводські налаштування, що призведе до видалення всіх ваших даних."\n\n"Шифрування триває не менше години. Перш ніж розпочати процес шифрування, переконайтеся, що акумулятор заряджено. Телефон має перебувати в підключеному стані до завершення шифрування. Переривання процесу шифрування призведе до втрати частини чи всіх ваших даних."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Шифрувати пристрій"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Шифрувати телефон"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Зарядіть акумулятор і повторіть спробу."</string>
+    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Зарядіть батарею й повторіть спробу."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Підключіть зарядний пристрій і повторіть спробу."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Потрібно ввести PIN-код або пароль для блокування екрана"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Щоб почати шифрування, потрібно встановити PIN-код або пароль для блокування екрана."</string>
@@ -362,7 +372,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 +415,7 @@
     <string name="lock_setup" msgid="3355847066343753943">"Налаштування завершено."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Адміністрація пристрою"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Адміністратори пристрою"</string>
-    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Переглянути чи дезактив. адмін-ів пристрою"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Переглянути чи відключити адміністраторів пристрою"</string>
     <string name="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 +490,27 @@
     <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="7363832031876872257">"Бездротовий екран вимкнено, оскільки вимкнено 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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Виникла проблема зі зміною налаштувань"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Оптимізація Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Мінімізувати використання заряду акумулятора, коли ввімкнено Wi-Fi"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Додати мережу"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Сканув."</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Інша мережа…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Більше"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Авто-налаштування (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Щоб завершити налаштування, вашому планшетному ПК потрібен доступ до Wi-Fi. Після налаштування можна переключатися між мобільним передаванням даних і Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Показати розширені параметри"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Налаштування захищеної мережі 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_pin" msgid="8067502591043979939">"Введіть 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_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>
@@ -571,6 +606,14 @@
     <string name="wifi_save" msgid="3331121567988522826">"Зберег."</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Помилка збереження мережі"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Скасувати"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"Усе одно пропустити"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"Не пропускати"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ЗАСТЕРЕЖЕННЯ. Оператор може стягувати з вас додаткову плату."\n\n"Для налаштування планшетного ПК може знадобитися тривале користування мережею."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ЗАСТЕРЕЖЕННЯ. Оператор може стягувати з вас додаткову плату."\n\n"Для налаштування телефону може знадобитися тривале користування мережею."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ЗАСТЕРЕЖЕННЯ: планшетний ПК не зможе перевірити, чи оновлено ваше програмне забезпечення."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ЗАСТЕРЕЖЕННЯ: телефон не зможе перевірити, чи оновлено ваше програмне забезпечення."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Планшетний ПК не зміг під’єднатися до цієї мережі Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Телефон не зміг під’єднатися до цієї мережі Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Розширені налаштування Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Діапазон частот Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Укажіть діапазон частот операції"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"Якщо від’єднатися, це призведе до роз’єднання з пристроєм <xliff:g id="PEER_NAME">%1$s</xliff:g> і ще з <xliff:g id="PEER_COUNT">%2$s</xliff:g>."</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Скасувати запрошення?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Скасувати запрошення під’єднатися до пристрою <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Видалити цю групу?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Портат. точка дост. 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>
@@ -671,15 +718,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>
@@ -716,13 +764,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="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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -869,13 +923,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>
@@ -917,6 +971,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>
@@ -960,12 +1015,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="activity_not_found" msgid="5551664692991605325">"Програму не встановлено у вашому телефоні."</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Носій USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"На карті SD"</string>
     <string name="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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Використання пам\'яті"</string>
@@ -1094,6 +1159,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 +1170,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Установити параметри для розробки програми"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Налагодження USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Реж. налагодж., коли підкл. ч-з USB"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"Повідомлення про помилки в меню \"Живлення\""</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Внести в меню \"Живлення\" опцію створення повідомлень про помилку"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Залишати активним"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Екран не засинатиме під час заряджання"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Фіктивні місцезнаходження"</string>
@@ -1207,6 +1276,8 @@
     <string name="adb_warning_message" msgid="7316799925425402244">"Налагодження 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>
@@ -1234,14 +1305,23 @@
     <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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Покращувати веб-доступність"</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_feature_state_on" msgid="2864292320042673806">"Увімкнено"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Вимкнено"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Дозволено"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Не дозволено"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Дозволити"</string>
@@ -1257,7 +1337,7 @@
     <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Дозволити програмам установлювати сценарії від Google, які зроблять веб-вміст більш доступним?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Немає опису."</string>
     <string name="settings_button" msgid="3006713718908152930">"Налаштування"</string>
-    <string name="power_usage_summary_title" msgid="7190304207330319919">"Акумулятор"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Батарея"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"На що було використано батарею"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Статист. викор. батареї недост."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
@@ -1317,13 +1397,14 @@
     <string name="battery_sugg_display" msgid="3370202402045141760">"Зменште яскравість і/чи час очікування екрана"</string>
     <string name="battery_desc_wifi" msgid="1702486494565080431">"Викор. батареї Wi-Fi"</string>
     <string name="battery_sugg_wifi" msgid="2085605314976704287">"Вимкніть Wi-Fi, якщо з’єднання не використовується чи не доступне"</string>
-    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Як Bluetooth використовує акумулятор"</string>
+    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Як Bluetooth використовує батарею"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Вимкніть Bluetooth, якщо він не використовується"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Спробуйте з’єднатися з іншим пристроєм Bluetooth"</string>
-    <string name="battery_desc_apps" msgid="8530418792605735226">"Як програма використовує акумулятор"</string>
+    <string name="battery_desc_apps" msgid="8530418792605735226">"Як програма використовує батарею"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Зупиніть або видаліть цю програму"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Контролювати GPS вручну, щоб запобігти її використанню програмою"</string>
-    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Програма може пропонувати налаштування, щоб зменшити використання акумулятора"</string>
+    <string name="battery_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>
@@ -1380,6 +1461,20 @@
     <string name="gadget_title" msgid="5519037532720577836">"Контроль живлення"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Оновлення налашт. Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Оновлення налашт. Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"увімкнено"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"вимкнено"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"увімкнення"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"вимкнення"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1477,11 +1569,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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Показати накладання GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Від кращого до гіршого: синій, зелений, світло-червоний, червоний"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Вимк. апаратн. накладання"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Завжди використовувати GPU для компонування екрана"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Увімкнути трасування"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Мобільне передавання даних буде вимкнено в разі досягнення вказаного ліміту."\n\n"Оскільки методи обліку використання даних телефону й оператора можуть відрізнятися, радимо використовувати занижений ліміт."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Обмежити використання фонових даних?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Якщо обмежити фонові мобільні дані, деякі програми та служби не працюватимуть, якщо немає з’єднання з мережею Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Якщо обмежити мобільне передавання даних у фоновому режимі, деякі програми та служби працюватимуть лише під час з’єднання з мережею Wi-Fi."\n\n"Таке налаштування впливає на всіх користувачів цього планшетного ПК."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Якщо обмежити мобільне передавання даних у фоновому режимі, деякі програми та служби працюватимуть лише під час з’єднання з мережею Wi-Fi."\n\n"Таке налаштування впливає на всіх користувачів цього телефону."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Ви"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Інші користувачі"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Додати користувача"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Активний"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Неактивний"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не створено"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Власник"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Псевдонім"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Додати нового користувача"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Щоб користуватися цим пристроєм спільно, потрібно створити додаткових користувачів. Кожен користувач має власну пам’ять, яку може використовувати для зберігання програм, фонових малюнків тощо. Користувачі також можуть налаштовувати певні параметри планшетного ПК, як-от Wi-Fi, які застосовуватимуться до решти користувачів."\n\n"Особа, для якої ви створили нового користувача, має здійснити процес налаштування."\n\n"Будь-який користувач може схвалювати дозволи на оновлення програм від імені інших користувачів."</string>
+    <string name="user_add_user_message_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_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 479c5cc..9ed2783 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -253,6 +253,19 @@
     <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="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 +290,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..572ebd3 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Không"</string>
     <string name="create" msgid="3578857613172647409">"Tạo"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Không xác định"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"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."</string>
+    <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 +41,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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Cài đặt này ảnh hưởng đến tất cả người dùng trên máy tính bảng này."</string>
+    <string name="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\n"Cài đặt này ảnh hưởng đến tất cả người dùng trên điện thoại này."</string>
     <string name="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 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"Hiển thị không dây bị tắt do Wi-Fi 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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Đã xảy ra sự cố khi thay đổi cài đặt"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Tối ưu hóa Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Giảm thiểu sử dụng pin khi Wi-Fi bật"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Thêm mạng"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Dò"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Mạng khác…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Thêm"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Thiết lập tự động (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Để hoàn tất quá trình thiết lập, máy tính bảng của bạn cần quyền truy cập vào Wi-Fi. Sau khi thiết lập, bạn có thể chuyển giữa dữ liệu di động và Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Nhập mã pin <xliff:g id="NUMBER">%1$s</xliff:g> trên bộ định tuyến Wi-Fi của bạn. Thiết lập có thể mất tối đa hai phút để hoàn tất."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Thiết lập máy tính bảng có thể yêu cầu hoạt động mạng đáng kể."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"CẢNH BÁO: Bạn có thể phải trả thêm phí dữ liệu cho nhà cung cấp dịch vụ."\n\n"Thiết lập điện thoại có thể yêu cầu hoạt động mạng đáng kể."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"CẢNH BÁO: Máy tính bảng không thể xác minh rằng phần mềm của bạn được cập nhật."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"CẢNH BÁO: Điện thoại không thể xác minh rằng phần mềm của bạn được cập nhật."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Máy tính bảng không thể kết nối với mạng Wi-Fi này."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Điện thoại không thể kết nối với mạng Wi-Fi này."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi nâng cao"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Dải tần số Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Chỉ định dải tần số hoạt động"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Bỏ qua nhóm này?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Điểm phát sóng Wi-Fi di động"</string>
+    <string name="wifi_tether_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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -917,6 +971,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>
@@ -966,6 +1021,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="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="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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,6 +1090,7 @@
     <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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Sử dụng bộ nhớ"</string>
@@ -1094,6 +1159,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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Đặt tùy chọn cho phát triển ứng dụng"</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="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="allow_mock_location" msgid="2787962564578664888">"Cho phép vị trí mô phỏng"</string>
@@ -1207,6 +1276,8 @@
     <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="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>
@@ -1234,14 +1305,23 @@
     <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\n"Trong 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\n"Lư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\n"Bướ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\n"Bướ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\n"Nế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_toggle_script_injection_preference_title" msgid="7950932054266694403">"Nâng cao khả năng truy cập web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Cài đặt"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Bật"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Tắt"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Bật"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Tắt"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Được phép"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Không được phép"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Cho phép"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Đang cập nhật cài đặt Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"bật"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"tắt"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"đang bật"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"đang tắt"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1511,6 @@
     <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>
@@ -1548,6 +1640,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Hiển thị số tiền rút vượt quá bằng GPU"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Từ tốt nhất đến tồi nhất: lam, lục, đỏ tươi, đỏ"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Vô hiệu hóa các lớp phủ HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Luôn sử dụng GPU để tổng hợp màn hình"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Bật dấu vết"</string>
@@ -1555,17 +1651,21 @@
     <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="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>
@@ -1624,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Kết nối dữ liệu di động của bạn sẽ bị vô hiệu hóa khi đạt đến giới hạn được chỉ định."\n\n"Vì việc sử dụng dữ liệu được điện thoại của bạn tính và nhà cung cấp dịch vụ của bạn có thể tính mức sử dụng khác nhau, hãy xem xét việc sử dụng giới hạn vừa phải."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Giới hạn dữ liệu nền?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Nếu bạn giới hạn dữ liệu nền, một số ứng dụng và dịch vụ sẽ không hoạt động trừ khi bạn kết nối với mạng Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Nếu bạn giới hạn dữ liệu nền trên thiết bị di động, một số ứng dụng và dịch vụ sẽ không hoạt động trừ khi bạn kết nối với mạng Wi-Fi."\n\n"Cài đặt này ảnh hưởng đến tất cả người dùng trên máy tính bảng này."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Nếu bạn giới hạn dữ liệu nền trên thiết bị di động, một số ứng dụng và dịch vụ sẽ không hoạt động trừ khi bạn kết nối với mạng Wi-Fi."\n\n"Cài đặt này ảnh hưởng đến tất cả người dùng trên điện thoại này."</string>
     <string name="data_usage_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>
@@ -1667,6 +1770,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Bạn"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Người dùng khác"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Thêm người dùng"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Đang hoạt động"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Không hoạt động"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Chưa thiết lập"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Chủ sở hữu"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Biệt hiệu"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Thêm người dùng mới"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Bạn có thể chia sẻ thiết bị này với những người khác bằng cách tạo thêm người dùng. Mỗi người dùng có không gian riêng của họ mà họ có thể tùy chỉnh với các ứng dụng, hình nền riêng, v.v.. Người dùng cũng có thể điều chỉnh các cài đặt máy tính bảng ảnh hưởng tới mọi người, chẳng hạn như Wi-Fi."\n\n"Sau khi bạn tạo người dùng mới, người đó cần thực hiện quy trình thiết lập."\n\n"Bất kỳ người dùng nào cũng có thể chấp nhận các quyền của ứng dụng được cập nhật thay mặt tất cả những người dùng khác."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Sau khi bạn tạo người dùng mới, người đó cần thực hiện quy trình thiết lập."\n\n"Bất kỳ người dùng nào cũng có thể chấp nhận các quyền của ứng dụng được cập nhật thay mặt tất cả những người dùng khác."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Thiết lập người dùng ngay bây giờ?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Đảm bảo có người để nhận máy tính bảng và thiết lập bộ nhớ của họ"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 4940c23..3d38157 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"标准限制"</item>
     <item msgid="4071574792028999443">"不允许后台进程"</item>
@@ -277,4 +290,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..beb1373 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"无"</string>
     <string name="create" msgid="3578857613172647409">"创建"</string>
     <string name="device_info_default" msgid="7847265875578739287">"未知"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"只需执行 <xliff:g id="STEP_COUNT">%1$d</xliff:g> 步操作即可进入开发者模式。"</string>
+    <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 +41,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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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>
@@ -296,7 +304,9 @@
     <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="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"输入要在锁定屏幕上显示的文字"</string>
+    <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"在锁定屏幕上显示用户信息"</string>
+    <string name="user_info_settings_title" msgid="1195015434996724736">"用户信息"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"位置信息访问权限"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"安全"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM 卡锁定和凭据存储锁定"</string>
@@ -347,7 +357,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 +372,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>
@@ -480,6 +490,27 @@
     <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="7363832031876872257">"由于 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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"更改设置时出现问题"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi 优化"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"开启 Wi-Fi 时尽可能节约电池用量"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"添加网络"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"扫描"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"其他网络…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"更多"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自动设置 (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"要完成设置，您的平板电脑需要访问 Wi-Fi 网络。设置完毕后，您将可以在移动数据网络和 Wi-Fi 网络之间切换。"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"显示高级选项"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"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>。设置过程最多可能需要两分钟时间才能完成。"</string>
+    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"请在 Wi-Fi 路由器上输入 PIN <xliff:g id="NUMBER">%1$s</xliff:g>。设置过程最多可能需要两分钟时间才能完成。"</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <string name="wifi_save" msgid="3331121567988522826">"保存"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"无法保存网络"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"取消"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"还是跳过"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"不要跳过"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"警告：您可能需要额外支付运营商数据费。"\n\n"平板电脑设置过程可能会消耗大量网络流量。"</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告：您可能需要额外支付运营商数据费。"\n\n"手机设置过程可能会消耗大量网络流量。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"警告：平板电脑无法验证您的软件是否是最新版本。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"警告：手机无法验证您的软件是否是最新版本。"</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"平板电脑无法连接到此 Wi-Fi 网络。"</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"手机无法连接到此 Wi-Fi 网络。"</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"高级 Wi-Fi 设置"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi 频带"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"指定操作的频率范围"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"如果断开连接，您与<xliff:g id="PEER_NAME">%1$s</xliff:g>和另外 <xliff:g id="PEER_COUNT">%2$s</xliff:g> 台设备的连接将中断。"</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"取消邀请？"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"要取消连接<xliff:g id="PEER_NAME">%1$s</xliff:g>的邀请吗？"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"取消保存此群组？"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"便携式 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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,6 +797,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 +806,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 +821,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 +846,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>
@@ -910,7 +963,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,6 +971,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>
@@ -959,7 +1013,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,6 +1021,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="activity_not_found" msgid="5551664692991605325">"您的手机上未安装相应应用。"</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>
@@ -982,6 +1037,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 +1059,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>
@@ -1031,6 +1090,7 @@
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 存储设备"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD 卡中"</string>
     <string name="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 +1115,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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"存储空间使用情况"</string>
@@ -1095,6 +1159,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>
@@ -1200,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"设置应用开发选项"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB 调试"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"连接 USB 后启用调试模式"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"电源键菜单错误报告"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"在电源键菜单中添加提交错误报告的选项"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"不锁定屏幕"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充电时屏幕不会休眠"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"允许模拟位置"</string>
@@ -1208,6 +1276,8 @@
     <string name="adb_warning_message" msgid="7316799925425402244">"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>
@@ -1217,10 +1287,10 @@
     <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="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,14 +1305,23 @@
     <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_toggle_script_injection_preference_title" msgid="7950932054266694403">"增强网页辅助功能"</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_feature_state_on" msgid="2864292320042673806">"开启"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"关闭"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"允许"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"不允许"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"允许"</string>
@@ -1325,6 +1404,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>
@@ -1381,6 +1461,20 @@
     <string name="gadget_title" msgid="5519037532720577836">"电量控制"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"正在更新 Wi-Fi 设置"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"正在更新蓝牙设置"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g><xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"开启"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"关闭"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"正在开启"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"正在关闭"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1417,9 +1511,6 @@
     <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>
@@ -1549,24 +1640,32 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"显示 GPU 过度绘制"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"从最优到最差：蓝、绿、淡红、红"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"停用 HW 叠加层"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"始终使用 GPU 进行屏幕合成"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"启用跟踪"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"选择已启用的跟踪"</string>
+    <string name="enable_traces_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="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>
@@ -1625,9 +1724,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"达到指定的数据流量上限时，系统会停用您的移动数据连接。"\n\n"由于数据流量是由您的手机计算得出的，您的运营商对于流量的计算方法可能有所不同，因此请考虑设置一个较低的上限。"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"限制后台数据？"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"如果限制后台移动数据，那么除非您已连接到 Wi-Fi 网络，否则部分应用和服务会无法运行。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"如果您限制后台移动数据，则在未连接到 Wi-Fi 网络时，部分应用和服务将会无法运行。"\n\n"此设置会影响这台平板电脑上的所有用户。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"如果您限制后台移动数据，则在未连接到 Wi-Fi 网络时，部分应用和服务将会无法运行。"\n\n"此设置会影响这部手机上的所有用户。"</string>
     <string name="data_usage_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>
@@ -1662,12 +1764,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 +1792,46 @@
     <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="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_you_section" msgid="6247838798859425408">"您"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"其他用户"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"添加用户"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"活动"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"非活动"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"未设置"</string>
+    <string name="user_owner" msgid="3879126011135546571">"机主"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"昵称"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"添加新用户"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"您可以通过创建新用户来与其他人共享此设备。每个用户都会有自己的空间，其中可以容纳他们自己的应用、壁纸等内容。用户可以调整 Wi-Fi 等会影响到所有用户的平板电脑设置。"\n\n"您创建新用户后，该用户必须完成设置流程。"\n\n"任何用户均可代表其他所有用户接受应用的新权限。"</string>
+    <string name="user_add_user_message_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_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 7723ee9..8fb20b6 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -81,10 +81,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 +95,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>
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"標準限制"</item>
     <item msgid="4071574792028999443">"不執行背景處理程序"</item>
@@ -271,10 +284,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..7d36cb2 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"否"</string>
     <string name="create" msgid="3578857613172647409">"建立"</string>
     <string name="device_info_default" msgid="7847265875578739287">"不明"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"您只需完成剩餘的 <xliff:g id="STEP_COUNT">%1$d</xliff:g> 個步驟，即可成為開發人員。"</string>
+    <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 +87,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>
@@ -109,7 +114,7 @@
     <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 +133,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>
@@ -190,6 +195,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 +226,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>
@@ -237,8 +243,8 @@
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB 儲存裝置在使用期間遭到移除！"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD 卡仍在使用時便被移除！"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"使用容量 (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,7 +264,7 @@
     <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="roaming" msgid="3596055926335478572">"漫遊服務"</string>
@@ -267,6 +273,8 @@
     <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 +305,8 @@
     <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="location_settings_title" msgid="4483843407328665068">"位置資訊存取"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"安全性"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
@@ -362,7 +372,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>
@@ -431,7 +441,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 +450,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 +490,27 @@
     <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="7363832031876872257">"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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"變更設定時發生問題"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"WiFi 最佳化"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"開啟 WiFi 時盡可能節約電池用量"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"新增網路"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"掃描"</string>
@@ -520,18 +554,19 @@
     <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_on" msgid="3354911729026237372">"正在搜尋  Wi-Fi 網路…"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"其他網路…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"更多"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自動設定 (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"您的平板電腦必須連上 WiFi 網路才能完成設定。設定完成後，您可以在行動數據網路與 WiFi 網路之間切換。"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"顯示進階選項"</string>
     <string name="wifi_wps_setup_title" msgid="6034518116333042484">"WiFi 保護設定"</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_pin" msgid="8067502591043979939">"請在 WiFi 路由器上輸入 PIN 碼：<xliff:g id="NUMBER">%1$s</xliff:g>。最多需要兩分鐘才能完成設定。"</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS 成功，正在連線至網路…"</string>
     <string name="wifi_wps_connected" msgid="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_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>
@@ -571,6 +606,14 @@
     <string name="wifi_save" msgid="3331121567988522826">"儲存"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"無法儲存網路"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"取消"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"略過"</string>
+    <string name="wifi_dont_skip" msgid="7350341524881124808">"不要略過"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"警告：您可能需支付額外的數據傳輸費用。"\n\n"平板電腦設定程序可能需要佔用大量網路流量。"</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告：您可能需支付額外的數據傳輸費用。"\n\n"手機設定程序可能需要佔用大量網路流量。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"警告：無法透過您的平板電腦驗證軟體是否為最新版本。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"警告：無法透過您的手機驗證軟體是否為最新版本。"</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"您的平板電腦無法連線到這個 WiFi 網路。"</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"您的手機無法連線到這個 WiFi 網路。"</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"進階 Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi 頻帶"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"指定作業的頻率範圍"</string>
@@ -592,9 +635,10 @@
     <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,7 +646,10 @@
     <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"如果您中斷連線，即會結束您與「<xliff:g id="PEER_NAME">%1$s</xliff:g>」和其他 <xliff:g id="PEER_COUNT">%2$s</xliff:g> 個裝置的連線。"</string>
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"取消邀請？"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"您要取消 <xliff:g id="PEER_NAME">%1$s</xliff:g> 的連線邀請？"</string>
+    <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"刪除這個群組？"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"可攜式 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>
@@ -671,15 +718,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>
@@ -716,6 +764,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>
@@ -748,14 +797,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_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 +821,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 +846,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>
@@ -910,23 +964,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>
@@ -966,6 +1021,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="activity_not_found" msgid="5551664692991605325">"您未在手機上安裝應用程式。"</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>
@@ -981,6 +1037,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 +1059,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>
@@ -1030,11 +1090,12 @@
     <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>
@@ -1054,7 +1115,9 @@
     <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,6 +1140,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"儲存空間使用量"</string>
@@ -1094,6 +1159,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>
@@ -1162,7 +1229,7 @@
     <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>
@@ -1199,6 +1266,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"設定應用程式開發選項"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB 偵錯"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"連接 USB 時進入偵錯模式"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"電源選單錯誤報告"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"在電源選單中納入取得錯誤報告的選項"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"保持清醒"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充電時螢幕不會進入休眠"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"允許模擬位置"</string>
@@ -1207,6 +1276,8 @@
     <string name="adb_warning_message" msgid="7316799925425402244">"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>
@@ -1234,14 +1305,23 @@
     <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_toggle_script_injection_preference_title" msgid="7950932054266694403">"增強網頁協助工具"</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_feature_state_on" msgid="2864292320042673806">"開啟"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"關閉"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"允許"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"不允許"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"允許"</string>
@@ -1324,6 +1404,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>
@@ -1380,6 +1461,24 @@
     <string name="gadget_title" msgid="5519037532720577836">"電源控制"</string>
     <string name="gadget_toggle_wifi" msgid="2382963973155082629">"正在更新 Wi-Fi 設定"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"正在更新藍牙設定"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"開啟"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"關閉"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"開啟中"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"關閉中"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"WiFi"</string>
+    <string name="gadget_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>
@@ -1416,9 +1515,6 @@
     <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>
@@ -1444,7 +1540,7 @@
     <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_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_add_network" msgid="6932651000151032301">"新增網路"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"尚未連線"</string>
@@ -1458,7 +1554,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>
@@ -1468,7 +1564,7 @@
     <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_connecting" msgid="2793554932006756795">"連線中，請稍候幾分鐘…"</string>
     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"輕觸 [下一步]"<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>
@@ -1487,7 +1583,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>
@@ -1548,6 +1644,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"顯示 GPU 透支"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"從優到劣依序顯示：藍色、綠色、淺紅色、紅色"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"停用硬體重疊圖層"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"一律使用 GPU 進行畫面合成"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"啟用追蹤項目"</string>
@@ -1555,17 +1655,21 @@
     <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="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>
@@ -1581,7 +1685,7 @@
     <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>
@@ -1624,9 +1728,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"達到指定的流量上限時，系統會停用您的行動數據連線。"\n\n"由於資料用量需依您的手機來計算，而您的行動通訊業者計費方式可能有所不同，請考慮採用保守估計的上限值。"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"限制背景資料？"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"如果您限制背景行動數據傳輸，則必須連線至 Wi-Fi 網路，否則部分應用程式和服務無法運作。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"如果您限制背景行動數據傳輸量，則必須連線至 WiFi 網路，部分應用程式和服務才能運作。"\n\n"這項設定會影響這台平板電腦的所有使用者。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"如果您限制背景行動數據傳輸量，則必須連線至 WiFi 網路，部分應用程式和服務才能運作。"\n\n"這項設定會影響這支手機的所有使用者。"</string>
     <string name="data_usage_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>
@@ -1667,6 +1774,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 +1796,46 @@
     <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="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_you_section" msgid="6247838798859425408">"您"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"其他使用者"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"新增使用者"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"使用中"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"非使用中"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"尚未設定"</string>
+    <string name="user_owner" msgid="3879126011135546571">"擁有者"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"暱稱"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"新增使用者"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"您可以建立額外的使用者，藉此與其他人共用這個裝置。每位使用者都擁有個人空間，可使用自己的應用程式、桌布等等，並且自訂這些項目。此外，使用者可以調整平板電腦設定 (例如 WiFi 這類會使所有人受到影響的設定)。"\n\n"您建立新的使用者之後，對方必須完成設定程序。"\n\n"任何使用者都可以代表所有其他使用者接受更新的應用程式權限。"</string>
+    <string name="user_add_user_message_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_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index f929c73..642d647 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -253,6 +253,19 @@
     <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="app_process_limit_entries">
     <item msgid="3401625457385943795">"Isilanganiso esivamile"</item>
     <item msgid="4071574792028999443">"Azikho izinqubo zesizinda"</item>
@@ -277,4 +290,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..590c6af 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -20,6 +20,9 @@
     <string name="no" msgid="6731231425810196216">"Cha"</string>
     <string name="create" msgid="3578857613172647409">"Yakha"</string>
     <string name="device_info_default" msgid="7847265875578739287">"Akwaziwa"</string>
+    <string name="show_dev_countdown" msgid="5521163114237004821">"Manje usalelwe yizinyathelo ezingu-<xliff:g id="STEP_COUNT">%1$d</xliff:g> ukuthi ube ngunjiniyela."</string>
+    <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 +87,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>
@@ -190,6 +195,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>
@@ -267,6 +273,8 @@
     <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\n"Lesi 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\n"Lesi 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 +305,8 @@
     <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="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>
@@ -362,7 +372,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>
@@ -480,6 +490,27 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Njenge sipikhafoni"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Komculo nemidiya"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Khumbula izilungiselelo"</string>
+    <string name="wifi_display_settings_title" msgid="564299108014609382">"Ukubonisa okungenazintambo"</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Ukuze ubone amadivayisi, khanyisa ukubonisa okungenazintambo."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Ukubonisa okungenazintambo kukhutshaziwe ngoba i-Wi-Fi ivaliwe."</string>
+    <string name="wifi_display_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_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>
@@ -509,9 +540,12 @@
     <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_setting_sleep_policy_error" msgid="8174902072673071961">"Kube khona inkinga yokushintsha ilungiselelo"</string>
+    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Ukuthuthukiswa kwe-Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Nciphisa ukusetshenziswa kwebhethri uma i-Wi-Fi ivuliwe"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Yengeza inethiwekhi"</string>
     <string name="wifi_access_points" msgid="2664629396767022441">"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_scan" msgid="1470911530412095868">"Skena"</string>
@@ -524,14 +558,15 @@
     <string name="wifi_other_network" msgid="1048006316504242214">"Enye inethiwekhi…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Okunye"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Ukusetha okuzenzakalelayo (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="9014073093293520112">"Ukuze uqedele ukusetha, ithebulethi yakho idinga ukufinyelela ku-Wi-Fi. Ngemva kokusetha, ungashintsha phakathi kwedatha yeselula ne-Wi-Fi."</string>
     <string name="wifi_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_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_pin" msgid="8067502591043979939">"Faka iphinikhodi <xliff:g id="NUMBER">%1$s</xliff:g> kumzila wakho we-Wi-Fi. Ukusetha kungathatha kufika emaminithini amabili ukuqedela."</string>
     <string name="wifi_wps_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_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>
@@ -571,6 +606,14 @@
     <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_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\n"Ukusethwa kwethebulethi kungadinga umsebenzi wenethiwekhi omcane."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ISEXWAYISO: Ungahle uthole amashaji edatha enkampani yenethiwekhi angeziwe."\n\n"Ukusethwa kwefoni kungadinga umsebenzi wenethiwekhi omcane."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ISEXWAYISO: Ithebulethi ngeke ikwazi ukuqinisekisa ukuthi isofthiwe yakho isesikhathini samanje."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ISEXWAYISO: Ifoni ngeke ikwazi ukuqinisekisa ukuthi isofthiwe yakho isesikhathini samanje."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Ithebulethi ayikwazanga ukuxhuma kule nethiwekhi ye-Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Ifoni ayikwazanga ukuxhuma kule nethiwekhi ye-Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Ukuxhumana kungenazintambo okuphambili"</string>
     <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Ibhendi yokuvama kwe-Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Cacisa ibanga lokuvama komsebenzi"</string>
@@ -595,6 +638,7 @@
     <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,7 +646,10 @@
     <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_p2p_delete_group_message" msgid="834559380069647086">"Khohlwa leli qembu?"</string>
     <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Indawo ephathekayo ye-Wi-Fi"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Ikhanyisa indawo ekudonseka kuyo…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Icima ndawo ekudonseka kuyo…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Indawo ephathekayo <xliff:g id="NETWORK_SSID">%1$s</xliff:g> iyasebenza"</string>
     <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Iphutha lendawo le-Wi-Fi ephathekayo"</string>
     <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Setha i-Wi-Fi hotspot"</string>
@@ -671,15 +718,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">"Uma kuphupha 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>
@@ -716,6 +764,7 @@
     <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>
@@ -748,6 +797,7 @@
     <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>
@@ -756,6 +806,7 @@
     <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 +821,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 +846,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>
@@ -918,6 +972,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>
@@ -967,6 +1022,7 @@
     <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="activity_not_found" msgid="5551664692991605325">"Uhlelo lokusebenza alufakiwe efonini yakho."</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>
@@ -982,6 +1038,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 +1060,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>
@@ -1031,6 +1091,7 @@
     <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 +1122,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,6 +1147,8 @@
     <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="storageuse_settings_title" msgid="5657014373502630403">"Ukusetshensiswa kwesitoreji"</string>
@@ -1101,6 +1166,8 @@
     <string name="memory" msgid="6609961111091483458">"i-RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Umsebenzisi: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Umsebenzisi osusiwe"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> inqubo <xliff:g id="NUMSERVICES">%2$d</xliff:g> nensizakalo"</string>
     <string name="running_processes_item_description_s_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>
@@ -1206,6 +1273,8 @@
     <string name="development_settings_summary" msgid="1815795401632854041">"Setha okukhethwayo kwentuthuko yohlelo lokusebenza"</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="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="allow_mock_location" msgid="2787962564578664888">"Vumela izindawo mbumbulu"</string>
@@ -1214,6 +1283,8 @@
     <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="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>
@@ -1241,14 +1312,23 @@
     <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\n"Ngenkathi 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\n"Qaphela: 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\n"Isinyathelo 1: Cindezela futhi ubambe inkinobho vula/cisha uze uzwe umsindo noma uzwe ukudlidliza."\n\n"Isinyathelo 2: Cindezela futhi ubambe ngeminwe emibili uze uzwe ukuqinisekisa komsindo."\n\n"Uma 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 imisa ikholi"</string>
+    <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Memeza iphasiwedi"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Thinta futhi ukulibazisa"</string>
+    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Thuthukisa ukufinyelelwa kwewebhu"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Izilungiselelo"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Vuliwe"</string>
-    <string name="accessibility_service_state_off" msgid="2458594460762620776">"Valiwe"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Kuyakhanya"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Kucishile"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Kuvumelekile"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Akuvumelekile"</string>
     <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Vumela"</string>
@@ -1331,6 +1411,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>
@@ -1387,6 +1468,20 @@
     <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_bluetooth" msgid="7538903239807020826">"Ibuyekeza ilungiselelo le-Bluetooth"</string>
+    <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"vuliwe"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"valiwe"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"iyakhanyisa"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"Iyavala"</string>
+    <string name="gadget_wifi" msgid="5960290421313061434">"I-Wi-Fi"</string>
+    <string name="gadget_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>
@@ -1423,9 +1518,6 @@
     <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>
@@ -1555,6 +1647,10 @@
     <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="show_hw_overdraw" msgid="1136884304711318251">"Bonisa i-GPU overdraw"</string>
+    <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Kusuka kokuhle kuya kokubi kakhulu: okuluhlaza okwesibhakabhaka, okuluhlaza okotshani, okubomvu okukhanyayo, okubomvu"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Khubaza izimbondela ze-HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Njalo sebenzisa i-GPU ukwakha isikrini"</string>
     <string name="enable_traces_title" msgid="7448835465859512430">"Nika amandla ukuthola"</string>
@@ -1562,17 +1658,21 @@
     <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="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>
@@ -1631,9 +1731,12 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Uxhumo lwedatha yakho yeselula luzokhubazwa uma umkhawulo ocacisiwe usufinyelelwe."\n\n"Njengoba ukusetshenziswa kwedatha kukalwa ngefoni yakho, kanti nenkampani yakho yenethiwekhi ungabhekana nokusetshenziswa ngokwehlukile, naka ukusebenzisa umkhawulo olandelanayo."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Gwema ukusebenza kwedatha yangemuva?"</string>
     <string name="data_usage_restrict_background" msgid="6387252645350792955">"Uma ugwema ukusetshenziswa kwedatha yangemuva kuselula, ezinye izinhlelo zokusebenza kanye namasevisi ngeke kusebense ngaphandle uma uxhumaniseke enethiwekhini ye-Wifi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Uma ukhawulela idatha yokwangasemuva, ezinye izinhlelo zokusebenza namasevisi ngeke kusebenze ngaphandle nje kokuthi uxhumeke kunethiekhi ye-Wi-Fi."\n\n"Lesi silungiselelo sithinta bonke abasebenzisi kule thebulethi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Uma ukhawulela idatha yokwangasemuva, ezinye izinhlelo zokusebenza namasevisi ngeke kusebenze ngaphandle nje kokuthi uxhumeke kunethiekhi ye-Wi-Fi."\n\n"Lesi silungiselelo sithinta bonke abasebenzisi kule foni."</string>
     <string name="data_usage_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>
@@ -1674,6 +1777,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 +1799,46 @@
     <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="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_you_section" msgid="6247838798859425408">"Wena"</string>
+    <string name="user_list_title" msgid="8866161687358773982">"Abanye abasebenzisi"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Engeza umsebenzisi"</string>
-    <string name="user_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="user_summary_active" msgid="4740649452346004418">"Kuyasebenza"</string>
+    <string name="user_summary_inactive" msgid="3758296246095054572">"Akusebenzi"</string>
+    <string name="user_summary_not_set_up" msgid="8778205026866794909">"Akukho ukusetha"</string>
+    <string name="user_owner" msgid="3879126011135546571">"Umnikazi"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Isidlaliso"</string>
+    <string name="user_add_user_title" msgid="3961861593718285403">"Engeza umsebenzisi omusha"</string>
+    <string name="user_add_user_message_long" msgid="2278524063301283723">"Ungaba le divayisi nabanye abantu ngokudala abasebenzisi abangeziwe. Umsebenzisi ngamunye unesikhala sakhe, lapha angenza khona ngezifiso izinhlelo zakhe zokusebenza, isithombe sangemuva, nokunye. Abasebenzisi futhi balungisa izilungiselelo ze-tablet njenge-Wi-Fi ethinta wonke umuntu."\n\n"Ngemva kokudala umsebenzisi omusha, loyo muntu udinga ukwenza inqubo yokusetha."\n\n"Noma imuphi umsebenzisi angabuyekeza izimvume zohlelo lokusebenza engxenyeni yabo bonke abanye abasebenzisi."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Ngemva kokudala umsebenzisi omusha, loyo muntu udinga ukwenza inqubo yokusetha."\n\n"Noma imuphi umsebenzisi angamukela izimvume zohlelo lokusebenza ezibuyekeziwe engxenyeni yabo bonke abanye abasebenzisi."</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Setha umsebenzisi manje?"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Qiniseka ukuthi umuntu uyatholakala ukuthatha ithebulethi futhi asethe isikhala sakhe"</string>
+    <string name="user_setup_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_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_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_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_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="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="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>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 3367a57..14e1fc8 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -652,6 +652,40 @@
         <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>1280x720 tvdpi</item>
+        <item>1920x1080 xhdpi</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>1280x720/213</item>
+        <item>1920x1080/320</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 app process limit preference. [CHAR LIMIT=35] -->
     <string-array name="app_process_limit_entries">
         <item>Standard limit</item>
@@ -728,4 +762,14 @@
         <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>
 </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..e7a00c3 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>
@@ -34,4 +37,4 @@
     <color name="title_color">@android:color/holo_blue_light</color>
     <color name="setup_divider_color">#333333</color>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 9335788..91f293c 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -51,4 +51,14 @@
     <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>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 071c19d..d6abe94 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -26,6 +26,12 @@
     <!-- 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 -->
+    <string name="show_dev_countdown">You are now <xliff:g id="step_count">%1$d</xliff:g> steps away from being a developer.</string>
+    <!-- [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 +182,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 +195,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>
 
@@ -416,6 +425,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 -->
 
@@ -585,6 +596,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 -->
@@ -657,6 +672,10 @@
     <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>
     <!-- Main Settings screen setting option title for the item to take you to the location screen -->
     <string name="location_settings_title">Location access</string>
     <!-- Main Settings screen setting option title for the item to take you to the security screen -->
@@ -1142,6 +1161,52 @@
     <!-- 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-Fi 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. 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>
+
     <!-- NFC settings -->
     <!-- Used in the 1st-level settings screen to turn on NFC -->
     <string name="nfc_quick_toggle_title">NFC</string>
@@ -1206,12 +1271,18 @@
     <string name="wifi_setting_sleep_policy_title">Keep Wi-Fi on during sleep</string>
     <!-- Generic error message when the sleep policy could not be set. -->
     <string name="wifi_setting_sleep_policy_error">There was a problem changing the setting</string>
+    <!-- Checkbox title for option to toggle suspend power optimizations -->
+    <string name="wifi_suspend_optimizations">Wi-Fi optimization</string>
+    <!-- Checkbox summary for option to toggle suspend power optimizations -->
+    <string name="wifi_suspend_optimizations_summary">Minimize battery usage when Wi-Fi 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>
     <!-- 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]-->
@@ -1236,6 +1307,8 @@
     <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-Fi. After setup, you can switch between mobile data and Wi-Fi.</string>
 
     <!-- Dialog for Access Points --> <skip />
     <!-- Label to show/hide advanced options -->
@@ -1247,13 +1320,13 @@
     <!-- 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>
     <!-- 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-Fi 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>
     <!-- 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] -->
@@ -1368,6 +1441,23 @@
     <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" msgid="5205612884736051138">Skip anyway</string>
+    <!-- Button for going to the previous screen or step [CHAR LIMIT=20] -->
+    <string name="wifi_dont_skip">Don\'t skip</string>
+
+    <!-- Text warning about skipping Wi-Fi with a mobile connect (tablet) [CHAR LIMIT=NONE]-->
+    <string name="wifi_skipped_message" product="tablet" msgid="6518433975501257341">WARNING: You may incur extra carrier data charges.\n\nTablet setup can require significant network activity.</string>
+    <!-- Text warning about skipping Wi-Fi with a mobile connect (phone) [CHAR LIMIT=NONE]-->
+    <string name="wifi_skipped_message" product="default" msgid="4376150150678208848">WARNING: You may incur extra carrier data charges.\n\nPhone setup can require significant network activity.</string>
+    <!-- Text warning about skipping Wi-Fi without a mobile connect (tablet) [CHAR LIMIT=NONE] -->
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5647058314212144925">WARNING: The tablet won\'t be able to verify that your software is up to date.</string>
+    <!-- Text warning about skipping Wi-Fi without a mobile connect (phone) [CHAR LIMIT=NONE] -->
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1288483646141987070">WARNING: The phone won\'t be able to verify that your software is up to date.</string>
+    <!-- Text alerting that Wi-Fi couldn't connect (tablet) [CHAR LIMIT=NONE] -->
+    <string name="wifi_connect_failed_message" product="tablet" msgid="2006689630582761529">The tablet was unable to connect to this Wi-Fi network.</string>
+    <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
+    <string name="wifi_connect_failed_message" product="default" msgid="8220901976514642385">The phone was unable to connect to this Wi-Fi network.</string>
 
     <!-- Wi-Fi Advanced Settings --> <skip />
     <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. -->
@@ -1405,7 +1495,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,7 +1505,6 @@
     <!-- 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>
@@ -1445,10 +1534,8 @@
     <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 -->
@@ -1687,24 +1774,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 on sleep or docked -->
+    <string name="screensaver_settings_summary_either_long">When docked or asleep and charging</string>
+    <!-- Dream settings screen, dialog option, activated on sleep or docked -->
+    <string name="screensaver_settings_summary_either_short">Either</string>
+    <!-- Display settings screen, summary fragment for screen saver options, activated on sleep -->
+    <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 -->
@@ -1853,6 +1941,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 +1959,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 +1995,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 +2051,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: -->
@@ -2217,6 +2316,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>
@@ -2328,6 +2429,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>
+    <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
+    <string name="activity_not_found">Application is not installed on your phone.</string>
 
     <!-- ChooseLockPatternTutorial --> <skip />
     <!-- ChooseLockPatternTutorial, button labels: This is to cancel the tutorial -->
@@ -2372,6 +2475,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 +2519,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. -->
@@ -2481,6 +2592,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 +2652,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 +2699,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 -->
@@ -2616,6 +2738,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>
@@ -2868,6 +2994,10 @@
     <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>
+    <!-- [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  -->
@@ -2884,6 +3014,10 @@
     <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>
@@ -2955,30 +3089,48 @@
     <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] -->
     <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 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>
+    <string name="accessibility_long_press_timeout_preference_title">Touch &amp; hold delay</string>
     <!-- Title for accessibility preference to install accessibility scripts from Google. [CHAR LIMIT=35] -->
-    <string name="accessibility_script_injection_title">Enhance web accessibility</string>
+    <string name="accessibility_toggle_script_injection_preference_title">Enhance web accessibility</string>
 
     <!-- Title for accessibility menu item to lauch a settings activity. [CHAR LIMIT=15] -->
     <string name="accessibility_menu_item_settings">Settings</string>
 
-    <!-- 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 accessiblity feature. [CHAR LIMIT=10] -->
+    <string name="accessibility_feature_state_on">On</string>
+    <!-- Summary for the disabled state of an accessiblity feature. [CHAR LIMIT=10] -->
+    <string name="accessibility_feature_state_off">Off</string>
 
     <!-- Summary for the allowed state of script injection. [CHAR LIMIT=15] -->
     <string name="accessibility_script_injection_allowed">Allowed</string>
@@ -3187,6 +3339,9 @@
     <!-- 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 -->
@@ -3317,6 +3472,34 @@
     <string name="gadget_title">Power control</string>
     <string name="gadget_toggle_wifi">Updating Wi-Fi setting</string>
     <string name="gadget_toggle_bluetooth">Updating Bluetooth setting</string>
+    <!-- Template for gadget toggle button description. Populated examples are "Wi-Fi off" or "Wi-Fi turning on". -->
+    <string name="gadget_state_template"><xliff:g name="feature" example="Wi-Fi">%1$s</xliff:g> <xliff:g name="state" example="off">%2$s</xliff:g></string>
+    <!-- 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-Fi</string>
+    <!-- Spoken description for the Bluetooth power control gadget. -->
+    <string name="gadget_bluetooth">Bluetooth</string>
+    <!-- Spoken description for the GPS power control gadget. -->
+    <string name="gadget_gps">GPS</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>
@@ -3396,16 +3579,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 -->
@@ -3744,6 +3917,16 @@
     <!-- 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="show_hw_overdraw">Show GPU overdraw</string>
+    <!-- UI debug setting: Show the amount of overdraw summary [CHAR LIMIT=50] -->
+    <string name="show_hw_overdraw_summary">From best to worst: blue, green, light red, red</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] -->
@@ -3761,6 +3944,9 @@
     <!-- 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] -->
@@ -3776,6 +3962,11 @@
     <!-- 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: 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] -->
@@ -3790,6 +3981,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>
 
@@ -3923,6 +4117,10 @@
     <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>
+    <!-- Body of dialog shown before user restricts background data usage. This is for multiuser tablets. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_restrict_background_multiuser" product="tablet">If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi-Fi network.\n\nThis setting affects all users on this tablet.</string>
+    <!-- Body of dialog shown before user restricts background data usage. This is for multiuser phones. [CHAR LIMIT=NONE] -->
+    <string name="data_usage_restrict_background_multiuser" product="default">If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi-Fi network.\n\nThis setting affects all users on this phone.</string>
 
     <!-- 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 +4129,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] -->
@@ -4017,6 +4217,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>
@@ -4072,41 +4281,73 @@
     <skip/>
 
     <!-- User settings screen title [CHAR LIMIT=25] -->
-    <string name="user_settings_title">Users &amp; restrictions</string>
+    <string name="user_settings_title">Users</string>
+    <!-- User settings section title for details about you [CHAR LIMIT=25] -->
+    <string name="user_you_section">You</string>
     <!-- User settings user list section header [CHAR LIMIT=30] -->
-    <string name="user_list_title">Users</string>
+    <string name="user_list_title">Other users</string>
     <!-- User settings add user menu [CHAR LIMIT=20] -->
     <string name="user_add_user_menu">Add user</string>
+    <!-- User summary to indicate that user is currently active in the background [CHAR LIMIT=100] -->
+    <string name="user_summary_active">Active</string>
+    <!-- User summary to indicate that user is currently inactive in the background [CHAR LIMIT=100] -->
+    <string name="user_summary_inactive">Not active</string>
+    <!-- User 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 information string to represent the owner of the device [CHAR LIMIT=25] -->
+    <string name="user_owner">Owner</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 confirmation dialog [CHAR LIMIT=30] -->
+    <string name="user_add_user_title">Add new user</string>
+    <!-- Message for add user confirmation dialog - long version. [CHAR LIMIT=none] -->
+    <string name="user_add_user_message_long">You can share this device with other people by creating additional users. Each user has their own space, which they can customize with their own apps, wallpaper, and so on. Users can also adjust tablet settings like Wi-Fi that affect everyone.\n\nAfter you create a new user, that person needs to go through a setup process.\n\nAny user can accept updated app permissions on behalf of all other users.</string>
+    <!-- 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>
+    <!-- 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>
 
-    <!-- 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 (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>
+    <!-- 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>
+    <!-- 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>
+
+    <!-- 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>
 
     <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
     <string name="app_notifications_switch_label">Show notifications</string>
@@ -4136,6 +4377,19 @@
     <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>
+
+    <!-- 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>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 42f2837..dda22d9 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>
@@ -84,6 +84,7 @@
 
     <style name="setup_wizard_theme" parent="android:Theme.Holo.NoActionBar">
         <item name="android:windowSoftInputMode">adjustPan</item>
+        <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
     </style>
 
     <!-- We'd like to have this as 16dip hight including paddingTop/paddingBottom to
@@ -110,10 +111,10 @@
         <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">
@@ -190,4 +191,8 @@
         <item name="android:textAllCaps">true</item>
         <item name="android:textStyle">bold</item>
     </style>
+
+    <style name="KeyguardAppWidgetItem">
+        <item name="android:textSize">18sp</item>
+    </style>
 </resources>
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index bf93eb5..15b5b2e 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -27,14 +27,19 @@
             android:key="system_category"
             android:title="@string/accessibility_system_title">
 
+        <PreferenceScreen
+            android:fragment="com.android.settings.AccessibilitySettings$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,15 +49,20 @@
 
         <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.AccessibilitySettings$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"/>
@@ -60,7 +70,7 @@
         <!-- 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:title="@string/accessibility_toggle_script_injection_preference_title"
                 android:dialogTitle=""
                 android:dialogIcon="@android:drawable/ic_dialog_alert"
                 android:dialogMessage="@string/accessibility_script_injection_security_warning_summary"
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 47e58da..e67aad1 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"
@@ -58,6 +58,11 @@
             android:summary="@string/enable_adb_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"
             android:summary="@string/allow_mock_location_summary"/>
@@ -70,6 +75,11 @@
             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"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory android:key="debug_input_category"
@@ -101,6 +111,16 @@
             android:summary="@string/show_hw_screen_updates_summary"/>
 
         <CheckBoxPreference
+            android:key="show_hw_layers_udpates"
+            android:title="@string/show_hw_layers_updates"
+            android:summary="@string/show_hw_layers_updates_summary"/>
+
+        <CheckBoxPreference
+            android:key="show_hw_overdraw"
+            android:title="@string/show_hw_overdraw"
+            android:summary="@string/show_hw_overdraw_summary"/>
+
+        <CheckBoxPreference
             android:key="show_screen_updates"
             android:title="@string/show_screen_updates"
             android:summary="@string/show_screen_updates_summary"/>
@@ -136,6 +156,18 @@
             android:title="@string/force_hw_ui"
             android:summary="@string/force_hw_ui_summary"/>
 
+        <CheckBoxPreference
+            android:key="force_msaa"
+            android:title="@string/force_msaa"
+            android:summary="@string/force_msaa_summary"/>
+
+        <ListPreference
+            android:key="overlay_display_devices"
+            android:title="@string/overlay_display_devices_title"
+            android:persistent="false"
+            android:entries="@array/overlay_display_devices_entries"
+            android:entryValues="@array/overlay_display_devices_values" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:key="debug_monitoring_category"
@@ -156,6 +188,13 @@
             android:title="@string/track_frame_time"
             android:summary="@string/track_frame_time_summary"/>
 
+        <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" />
+
         <MultiCheckPreference
             android:key="enable_traces"
             android:title="@string/enable_traces_title"
@@ -183,6 +222,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..03f1e78 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -89,6 +89,9 @@
         </PreferenceScreen>
         -->
 
+        <com.android.settings.RegulatoryInfoPreference android:key="regulatory_info"
+                android:title="@string/regulatory_information" />
+
         <!-- Device hardware model -->
         <Preference android:key="device_model" 
                 style="?android:preferenceInformationStyle"
@@ -106,7 +109,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_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..d14446c 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -45,7 +45,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 +58,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/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml
index 6593f07..c830e6f 100644
--- a/res/xml/security_settings_biometric_weak.xml
+++ b/res/xml/security_settings_biometric_weak.xml
@@ -51,10 +51,6 @@
             android:key="power_button_instantly_locks"
             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"/>
-
         <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..06ec934 100644
--- a/res/xml/security_settings_lockscreen.xml
+++ b/res/xml/security_settings_lockscreen.xml
@@ -25,7 +25,11 @@
             android:title="@string/unlock_set_unlock_launch_picker_title"
             android:summary="@string/unlock_set_unlock_mode_off"
             android:persistent="false"/>
-
+        <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..b0313eb 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -37,7 +37,8 @@
                 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,9 +53,16 @@
                 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" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/credentials_title"
+    <PreferenceCategory android:key="credentials_management"
+            android:title="@string/credentials_title"
             android:persistent="false">
         <Preference android:title="@string/trusted_credentials"
                 android:summary="@string/trusted_credentials_summary"
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index b91b2b6..d47a99d 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -42,10 +42,6 @@
             android:key="power_button_instantly_locks"
             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"/>
-
         <PreferenceScreen
             android:fragment="com.android.settings.OwnerInfoSettings"
             android:key="owner_info_settings"
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index 4562a9a..d44200f 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -38,10 +38,6 @@
             android:key="power_button_instantly_locks"
             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"/>
-
         <PreferenceScreen
             android:fragment="com.android.settings.OwnerInfoSettings"
             android:key="owner_info_settings"
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 2089bac..05fa31f 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,8 @@
         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" />
 
     <!-- Sound -->
     <header
@@ -95,6 +97,13 @@
         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" />
+
     <!-- Manufacturer hook -->
     <header
         android:fragment="com.android.settings.WirelessSettings"
@@ -104,14 +113,8 @@
 
 
     <!-- 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
@@ -155,14 +158,8 @@
     </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
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/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/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..d97f1a6 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -19,6 +19,22 @@
         android:title="@string/user_settings_title">
 
     <PreferenceCategory
+            android:key="user_you"
+            android:title="@string/user_you_section"/>
+    <Preference
+            android:key="user_me"
+            android:summary="@string/user_owner" />
+    <com.android.settings.SelectableEditTextPreference
+            android:key="user_nickname"
+            android:title="@string/user_nickname"
+            android:icon="@drawable/empty_icon" />
+    <Preference
+            android:key="user_owner_info"
+            android:title="@string/owner_info_settings_title"
+            android:icon="@drawable/empty_icon"
+            android:fragment="com.android.settings.OwnerInfoSettings" />
+
+    <PreferenceCategory
             android:key="user_list"
             android:title="@string/user_list_title">
     </PreferenceCategory>
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..10eab29 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -47,6 +47,12 @@
             android:entries="@array/wifi_frequency_band_entries"
             android:entryValues="@array/wifi_frequency_band_values"
             />
+
+    <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/xml/wifi_display_settings.xml b/res/xml/wifi_display_settings.xml
new file mode 100644
index 0000000..2b32106
--- /dev/null
+++ b/res/xml/wifi_display_settings.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.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/wifi_display_settings_title" >
+
+</PreferenceScreen>
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index 8cb04cc..b6556a9 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -23,6 +23,7 @@
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.ComponentName;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -75,38 +76,44 @@
 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";
+            "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 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";
+            "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_LARGE_TEXT_PREFERENCE =
+            "toggle_large_text_preference";
     private static final String TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE =
-        "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";
+            "toggle_lock_screen_rotation_preference";
     private static final String TOGGLE_SPEAK_PASSWORD_PREFERENCE =
-        "toggle_speak_password_preference";
+            "toggle_speak_password_preference";
     private static final String SELECT_LONG_PRESS_TIMEOUT_PREFERENCE =
-        "select_long_press_timeout_preference";
+            "select_long_press_timeout_preference";
     private static final String TOGGLE_SCRIPT_INJECTION_PREFERENCE =
-        "toggle_script_injection_preference";
+            "toggle_script_injection_preference";
+    private static final String ENABLE_ACCESSIBILITY_GESTURE_PREFERENCE_SCREEN =
+            "enable_global_gesture_preference_screen";
+    private static final String DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN =
+            "screen_magnification_preference_screen";
 
     // Extras passed to sub-fragments.
     private static final String EXTRA_PREFERENCE_KEY = "preference_key";
@@ -119,18 +126,19 @@
     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";
+    private static final String EXTRA_SERVICE_COMPONENT_NAME = "service_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);
+            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>();
+            new HashMap<String, String>();
 
     private final Configuration mCurConfig = new Configuration();
 
@@ -145,14 +153,23 @@
         }
     };
 
-    private final RotationPolicy.RotationPolicyListener mRotationPolicyListener =
-            new RotationPolicy.RotationPolicyListener() {
+    private final SettingsContentObserver mSettingsContentObserver =
+            new SettingsContentObserver(mHandler) {
         @Override
-        public void onChange() {
-            updateLockScreenRotationCheckbox();
+        public void onChange(boolean selfChange, Uri uri) {
+            loadInstalledServices();
+            updateServicesPreferences();
         }
     };
 
+    private final RotationPolicy.RotationPolicyListener mRotationPolicyListener =
+            new RotationPolicy.RotationPolicyListener() {
+                @Override
+                public void onChange() {
+                    updateLockScreenRotationCheckbox();
+                }
+            };
+
     // Preference controls.
     private PreferenceCategory mServicesCategory;
     private PreferenceCategory mSystemsCategory;
@@ -164,6 +181,8 @@
     private ListPreference mSelectLongPressTimeoutPreference;
     private AccessibilityEnableScriptInjectionPreference mToggleScriptInjectionPreference;
     private Preference mNoServicesMessagePreference;
+    private PreferenceScreen mDisplayMagnificationPreferenceScreen;
+    private PreferenceScreen mGlobalGesturePreferenceScreen;
 
     private int mLongPressTimeoutDefault;
 
@@ -183,6 +202,7 @@
         offerInstallAccessibilitySerivceOnce();
 
         mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
+        mSettingsContentObserver.register(getContentResolver());
         RotationPolicy.registerRotationPolicyListener(getActivity(),
                 mRotationPolicyListener);
     }
@@ -192,6 +212,7 @@
         mSettingsPackageMonitor.unregister();
         RotationPolicy.unregisterRotationPolicyListener(getActivity(),
                 mRotationPolicyListener);
+        mSettingsContentObserver.unregister(getContentResolver());
         super.onPause();
     }
 
@@ -206,7 +227,7 @@
         }
         return false;
     }
-
+    
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         if (mToggleLargeTextPreference == preference) {
@@ -220,6 +241,13 @@
             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);
     }
@@ -252,17 +280,41 @@
                 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);
+                (CheckBoxPreference) findPreference(TOGGLE_LARGE_TEXT_PREFERENCE);
 
         // Power button ends calls.
         mTogglePowerButtonEndsCallPreference =
-            (CheckBoxPreference) findPreference(TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE);
+                (CheckBoxPreference) findPreference(TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE);
         if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
                 || !Utils.isVoiceCapable(getActivity())) {
             mSystemsCategory.removePreference(mTogglePowerButtonEndsCallPreference);
@@ -270,15 +322,15 @@
 
         // Lock screen rotation.
         mToggleLockScreenRotationPreference =
-            (CheckBoxPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE);
+                (CheckBoxPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE);
 
         // Speak passwords.
         mToggleSpeakPasswordPreference =
-            (CheckBoxPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE);
+                (CheckBoxPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE);
 
         // Long press timeout.
         mSelectLongPressTimeoutPreference =
-            (ListPreference) findPreference(SELECT_LONG_PRESS_TIMEOUT_PREFERENCE);
+                (ListPreference) findPreference(SELECT_LONG_PRESS_TIMEOUT_PREFERENCE);
         mSelectLongPressTimeoutPreference.setOnPreferenceChangeListener(this);
         if (mLongPressTimeoutValuetoTitleMap.size() == 0) {
             String[] timeoutValues = getResources().getStringArray(
@@ -288,13 +340,21 @@
                     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]);
+                mLongPressTimeoutValuetoTitleMap.put(timeoutValues[i], timeoutTitles[i]);
             }
         }
 
         // Script injection.
         mToggleScriptInjectionPreference = (AccessibilityEnableScriptInjectionPreference)
-            findPreference(TOGGLE_SCRIPT_INJECTION_PREFERENCE);
+                findPreference(TOGGLE_SCRIPT_INJECTION_PREFERENCE);
+
+        // Display magnification.
+        mDisplayMagnificationPreferenceScreen = (PreferenceScreen) findPreference(
+                DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN);
+
+        // Global gesture.
+        mGlobalGesturePreferenceScreen =
+                (PreferenceScreen) findPreference(ENABLE_ACCESSIBILITY_GESTURE_PREFERENCE_SCREEN);
     }
 
     private void updateAllPreferences() {
@@ -313,7 +373,7 @@
         AccessibilityManager accessibilityManager = AccessibilityManager.getInstance(getActivity());
 
         List<AccessibilityServiceInfo> installedServices =
-            accessibilityManager.getInstalledAccessibilityServiceList();
+                accessibilityManager.getInstalledAccessibilityServiceList();
         Set<ComponentName> enabledServices = getEnabledServicesFromSettings(getActivity());
 
         final boolean accessibilityEnabled = Settings.Secure.getInt(getContentResolver(),
@@ -334,11 +394,11 @@
 
             preference.setTitle(title);
             final boolean serviceEnabled = accessibilityEnabled
-                && enabledServices.contains(componentName);
+                    && enabledServices.contains(componentName);
             if (serviceEnabled) {
-                preference.setSummary(getString(R.string.accessibility_service_state_on));
+                preference.setSummary(getString(R.string.accessibility_feature_state_on));
             } else {
-                preference.setSummary(getString(R.string.accessibility_service_state_off));
+                preference.setSummary(getString(R.string.accessibility_feature_state_off));
             }
 
             preference.setOrder(i);
@@ -379,6 +439,8 @@
                                 settingsClassName).flattenToString());
             }
 
+            extras.putString(EXTRA_SERVICE_COMPONENT_NAME, componentName.flattenToString());
+
             mServicesCategory.addPreference(preference);
         }
 
@@ -390,7 +452,7 @@
                         super.onBindView(view);
 
                         LinearLayout containerView =
-                            (LinearLayout) view.findViewById(R.id.message_container);
+                                (LinearLayout) view.findViewById(R.id.message_container);
                         containerView.setGravity(Gravity.CENTER);
 
                         TextView summaryView = (TextView) view.findViewById(R.id.summary);
@@ -423,7 +485,7 @@
                     Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
                     Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT);
             final boolean powerButtonEndsCall =
-                (incallPowerBehavior == Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP);
+                    (incallPowerBehavior == Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP);
             mTogglePowerButtonEndsCallPreference.setChecked(powerButtonEndsCall);
         }
 
@@ -443,9 +505,31 @@
         mSelectLongPressTimeoutPreference.setSummary(mLongPressTimeoutValuetoTitleMap.get(value));
 
         // Script injection.
-        final boolean  scriptInjectionAllowed = (Settings.Secure.getInt(getContentResolver(),
+        final boolean scriptInjectionAllowed = (Settings.Secure.getInt(getContentResolver(),
                 Settings.Secure.ACCESSIBILITY_SCRIPT_INJECTION, 0) == 1);
         mToggleScriptInjectionPreference.setInjectionAllowed(scriptInjectionAllowed);
+
+        // Screen magnification.
+        final boolean magnificationEnabled = Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1;
+        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() {
@@ -489,25 +573,28 @@
         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();
+                        .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;
         }
@@ -515,8 +602,8 @@
 
     private void loadInstalledServices() {
         List<AccessibilityServiceInfo> installedServiceInfos =
-            AccessibilityManager.getInstance(getActivity())
-                .getInstalledAccessibilityServiceList();
+                AccessibilityManager.getInstance(getActivity())
+                        .getInstalledAccessibilityServiceList();
         Set<ComponentName> installedServices = sInstalledServices;
         installedServices.clear();
         final int installedServiceInfoCount = installedServiceInfos.size();
@@ -576,20 +663,6 @@
         }
     }
 
-    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;
@@ -621,87 +694,46 @@
     }
 
     public static class ToggleAccessibilityServicePreferenceFragment
-            extends SettingsPreferenceFragment implements DialogInterface.OnClickListener {
+            extends ToggleFeaturePreferenceFragment 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 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);
+                mToggleSwitch.setCheckedInternal(enabled);
+            }
+        };
 
         private CharSequence mEnableWarningTitle;
         private CharSequence mEnableWarningMessage;
         private CharSequence mDisableWarningTitle;
         private CharSequence mDisableWarningMessage;
 
-        private Preference mSummaryPreference;
-
-        private CharSequence mSettingsTitle;
-        private Intent mSettingsIntent;
+        private String mComponentName;
 
         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);
+        public void onResume() {
+            mSettingsContentObserver.register(getContentResolver());
+            super.onResume();
         }
 
         @Override
-        public void onViewCreated(View view, Bundle savedInstanceState) {
-            super.onViewCreated(view, savedInstanceState);
-            installActionBarToggleSwitch();
-            processArguments();
-            getListView().setDivider(null);
-            getListView().setEnabled(false);
+        public void onPause() {
+            mSettingsContentObserver.unregister(getContentResolver());
+            super.onPause();
         }
 
         @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.
+            // Parse the enabled services.
             Set<ComponentName> enabledServices = getEnabledServicesFromSettings(getActivity());
 
             // Determine enabled services and accessibility state.
@@ -722,16 +754,17 @@
                 }
                 // Disabling the last service disables accessibility.
                 accessibilityEnabled = enabledAndInstalledServiceCount > 1
-                    || (enabledAndInstalledServiceCount == 1
-                            && !installedServices.contains(toggledService));
+                        || (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.
+            // 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);
@@ -750,14 +783,6 @@
         }
 
         @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;
@@ -776,13 +801,13 @@
                     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();
+                    .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
@@ -806,8 +831,9 @@
             }
         }
 
-        private void installActionBarToggleSwitch() {
-            mToggleSwitch = createAndAddActionBarToggleSwitch(getActivity());
+        @Override
+        protected void onInstallActionBarToggleSwitch() {
+            super.onInstallActionBarToggleSwitch();
             mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
                 @Override
                 public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
@@ -833,28 +859,9 @@
             });
         }
 
-        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);
-
+        @Override
+        protected void onProcessArguments(Bundle arguments) {
+            super.onProcessArguments(arguments);
             // Settings title and intent.
             String settingsTitle = arguments.getString(EXTRA_SETTINGS_TITLE);
             String settingsComponentName = arguments.getString(EXTRA_SETTINGS_COMPONENT_NAME);
@@ -867,22 +874,203 @@
                     setHasOptionsMenu(true);
                 }
             }
-
             // Enable warning title.
             mEnableWarningTitle = arguments.getCharSequence(
                     AccessibilitySettings.EXTRA_ENABLE_WARNING_TITLE);
-
             // Enable warning message.
             mEnableWarningMessage = arguments.getCharSequence(
                     AccessibilitySettings.EXTRA_ENABLE_WARNING_MESSAGE);
-
             // Disable warning title.
             mDisableWarningTitle = arguments.getString(
                     AccessibilitySettings.EXTRA_DISABLE_WARNING_TITLE);
-
             // Disable warning message.
             mDisableWarningMessage = arguments.getString(
                     AccessibilitySettings.EXTRA_DISABLE_WARNING_MESSAGE);
+            // Component name.
+            mComponentName = arguments.getString(EXTRA_SERVICE_COMPONENT_NAME);
         }
     }
+
+    public static 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(EXTRA_CHECKED, checked);
+                    onPreferenceToggled(mPreferenceKey, checked);
+                    return false;
+                }
+            });
+        }
+    }
+
+    public static 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(EXTRA_CHECKED, checked);
+                    onPreferenceToggled(mPreferenceKey, checked);
+                    return false;
+                }
+            });
+        }
+    }
+
+    public static abstract class ToggleFeaturePreferenceFragment
+            extends SettingsPreferenceFragment {
+
+        protected ToggleSwitch mToggleSwitch;
+
+        protected String mPreferenceKey;
+        protected Preference mSummaryPreference;
+
+        protected CharSequence mSettingsTitle;
+        protected Intent mSettingsIntent;
+
+        // 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);
+            onInstallActionBarToggleSwitch();
+            onProcessArguments(getArguments());
+            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();
+        }
+
+        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.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.END));
+            return toggleSwitch;
+        }
+
+        protected void onProcessArguments(Bundle arguments) {
+            // 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.
+            CharSequence summary = arguments.getCharSequence(EXTRA_SUMMARY);
+            mSummaryPreference.setSummary(summary);
+        }
+    }
+
+    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.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/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/AppWidgetLoader.java b/src/com/android/settings/AppWidgetLoader.java
new file mode 100644
index 0000000..9155e60
--- /dev/null
+++ b/src/com/android/settings/AppWidgetLoader.java
@@ -0,0 +1,182 @@
+/*
+ * 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();
+        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..ccad236 100644
--- a/src/com/android/settings/BatteryInfo.java
+++ b/src/com/android/settings/BatteryInfo.java
@@ -102,6 +102,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;
diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java
index eff5c50..2cf6b43 100644
--- a/src/com/android/settings/BrightnessPreference.java
+++ b/src/com/android/settings/BrightnessPreference.java
@@ -24,6 +24,7 @@
 import android.os.IPowerManager;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.os.PowerManager;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.preference.SeekBarDialogPreference;
@@ -37,6 +38,12 @@
 
 public class BrightnessPreference extends SeekBarDialogPreference implements
         SeekBar.OnSeekBarChangeListener, CheckBox.OnCheckedChangeListener {
+    // If true, enables the use of the screen auto-brightness adjustment setting.
+    private static final boolean USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT =
+            PowerManager.useScreenAutoBrightnessAdjustmentFeature();
+
+    private final int mScreenBrightnessMinimum;
+    private final int mScreenBrightnessMaximum;
 
     private SeekBar mSeekBar;
     private CheckBox mCheckBox;
@@ -51,12 +58,6 @@
 
     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()) {
@@ -77,6 +78,10 @@
     public BrightnessPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
 
+        PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
+        mScreenBrightnessMinimum = pm.getMinimumScreenBrightnessSetting();
+        mScreenBrightnessMaximum = pm.getMaximumScreenBrightnessSetting();
+
         mAutomaticAvailable = context.getResources().getBoolean(
                 com.android.internal.R.bool.config_automatic_brightness_available);
 
@@ -113,7 +118,7 @@
             mOldAutomatic = getBrightnessMode(0);
             mAutomaticMode = mOldAutomatic == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
             mCheckBox.setChecked(mAutomaticMode);
-            mSeekBar.setEnabled(!mAutomaticMode);
+            mSeekBar.setEnabled(!mAutomaticMode || USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT);
         } else {
             mSeekBar.setEnabled(true);
         }
@@ -137,14 +142,15 @@
         setMode(isChecked ? Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC
                 : Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL);
         mSeekBar.setProgress(getBrightness());
-        mSeekBar.setEnabled(!mAutomaticMode);
+        mSeekBar.setEnabled(!mAutomaticMode || USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT);
         setBrightness(mSeekBar.getProgress(), false);
     }
 
     private int getBrightness() {
         int mode = getBrightnessMode(0);
         float brightness = 0;
-        if (false && mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
+        if (USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT
+                && mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
             brightness = Settings.System.getFloat(getContext().getContentResolver(),
                     Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, 0);
             brightness = (brightness+1)/2;
@@ -155,8 +161,8 @@
             } else {
                 brightness = mCurBrightness;
             }
-            brightness = (brightness - mScreenBrightnessDim)
-                    / (MAXIMUM_BACKLIGHT - mScreenBrightnessDim);
+            brightness = (brightness - mScreenBrightnessMinimum)
+                    / (mScreenBrightnessMaximum - mScreenBrightnessMinimum);
         }
         return (int)(brightness*SEEK_BAR_RANGE);
     }
@@ -180,7 +186,7 @@
                 == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
         mCheckBox.setChecked(checked);
         mSeekBar.setProgress(getBrightness());
-        mSeekBar.setEnabled(!checked);
+        mSeekBar.setEnabled(!checked || USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT);
     }
 
     @Override
@@ -212,13 +218,13 @@
 
     private void setBrightness(int brightness, boolean write) {
         if (mAutomaticMode) {
-            if (false) {
+            if (USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT) {
                 float valf = (((float)brightness*2)/SEEK_BAR_RANGE) - 1.0f;
                 try {
                     IPowerManager power = IPowerManager.Stub.asInterface(
                             ServiceManager.getService("power"));
                     if (power != null) {
-                        power.setAutoBrightnessAdjustment(valf);
+                        power.setTemporaryScreenAutoBrightnessAdjustmentSettingOverride(valf);
                     }
                     if (write) {
                         final ContentResolver resolver = getContext().getContentResolver();
@@ -229,13 +235,13 @@
                 }
             }
         } else {
-            int range = (MAXIMUM_BACKLIGHT - mScreenBrightnessDim);
-            brightness = (brightness*range)/SEEK_BAR_RANGE + mScreenBrightnessDim;
+            int range = (mScreenBrightnessMaximum - mScreenBrightnessMinimum);
+            brightness = (brightness * range)/SEEK_BAR_RANGE + mScreenBrightnessMinimum;
             try {
                 IPowerManager power = IPowerManager.Stub.asInterface(
                         ServiceManager.getService("power"));
                 if (power != null) {
-                    power.setBacklightBrightness(brightness);
+                    power.setTemporaryScreenBrightnessSettingOverride(brightness);
                 }
                 if (write) {
                     mCurBrightness = -1;
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..6854305 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -21,7 +21,9 @@
 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.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
@@ -33,6 +35,8 @@
 
 import com.android.internal.widget.LockPatternUtils;
 
+import java.util.List;
+
 import libcore.util.MutableBoolean;
 
 public class ChooseLockGeneric extends PreferenceActivity {
@@ -59,6 +63,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 +73,7 @@
         private KeyStore mKeyStore;
         private boolean mPasswordConfirmed = false;
         private boolean mWaitingForConfirmation = false;
+        private boolean mFinishPending = false;
 
         @Override
         public void onCreate(Bundle savedInstanceState) {
@@ -85,6 +91,7 @@
             if (savedInstanceState != null) {
                 mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED);
                 mWaitingForConfirmation = savedInstanceState.getBoolean(WAITING_FOR_CONFIRMATION);
+                mFinishPending = savedInstanceState.getBoolean(FINISH_PENDING);
             }
 
             if (mPasswordConfirmed) {
@@ -101,7 +108,14 @@
             }
         }
 
-
+        @Override
+        public void onResume() {
+            super.onResume();
+            if (mFinishPending) {
+                mFinishPending = false;
+                finish();
+            }
+        }
 
         @Override
         public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
@@ -170,6 +184,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() {
@@ -259,6 +274,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 +288,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)) {
@@ -352,10 +374,11 @@
                 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);
                 }
@@ -369,22 +392,26 @@
                 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..aab4ba6 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -40,6 +40,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;
@@ -272,8 +273,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 +308,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 +386,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)) {
@@ -389,11 +397,11 @@
                     mLockPatternUtils.saveLockPassword(pin, mRequestedQuality, isFallback);
                     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 +423,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..f9c01b6 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -429,6 +429,7 @@
          * @param stage
          */
         protected void updateStage(Stage stage) {
+            final Stage previousStage = mUiStage;
 
             mUiStage = stage;
 
@@ -493,6 +494,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 +521,6 @@
 
             if (lockVirgin) {
                 utils.setVisiblePatternEnabled(true);
-                utils.setTactileFeedbackEnabled(false);
             }
 
             getActivity().setResult(RESULT_FINISHED);
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index 1229046..96839ba 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -35,6 +35,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;
@@ -173,6 +174,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..dd375cc 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -180,7 +180,6 @@
         }
 
         private void updateStage(Stage stage) {
-
             switch (stage) {
                 case NeedToUnlock:
                     if (mHeaderText != null) {
@@ -220,6 +219,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/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 07b1776..c737c7d 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.UserHandle;
 import android.security.Credentials;
 import android.security.KeyChain.KeyChainConnection;
 import android.security.KeyChain;
@@ -104,17 +105,24 @@
      */
     private int mRetriesRemaining = -1;
 
-    @Override protected void onResume() {
+    @Override
+    protected void onResume() {
         super.onResume();
 
+        if (UserHandle.myUserId() != UserHandle.USER_OWNER) {
+            Log.i(TAG, "Cannot install to CredentialStorage as non-primary user");
+            finish();
+            return;
+        }
+
         Intent intent = getIntent();
         String action = intent.getAction();
 
         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
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 4cab767..f07d6fa 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;
@@ -244,10 +245,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
@@ -641,10 +640,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 +722,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/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..8dc3d53 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;
@@ -85,7 +86,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 +128,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;
@@ -447,6 +447,7 @@
     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);
@@ -455,12 +456,14 @@
         mMenuRestrictBackground = menu.findItem(R.id.data_usage_menu_restrict_background);
         mMenuRestrictBackground.setVisible(hasReadyMobileRadio(context) && !appDetailMode);
         mMenuRestrictBackground.setChecked(mPolicyManager.getRestrictBackground());
+        mMenuRestrictBackground.setVisible(isOwner);
 
         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);
@@ -550,7 +553,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 +688,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 +703,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 +782,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 +796,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 +821,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 +870,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 +885,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 +902,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 +1096,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);
         }
     };
@@ -1224,9 +1240,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 +1424,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 +1445,7 @@
 
         @Override
         public void writeToParcel(Parcel dest, int flags) {
-            dest.writeInt(appId);
+            dest.writeInt(key);
             dest.writeSparseBooleanArray(uids);
             dest.writeLong(total);
         }
@@ -1475,49 +1491,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 +1558,7 @@
 
         @Override
         public long getItemId(int position) {
-            return mItems.get(position).appId;
+            return mItems.get(position).key;
         }
 
         @Override
@@ -1899,7 +1922,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 +1939,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 +1979,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 +2157,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 +2186,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 30d4f0a..53f25a2 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -81,8 +81,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);
@@ -214,14 +214,14 @@
             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);
         }
     }
@@ -331,7 +331,7 @@
 
     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;
         }
diff --git a/src/com/android/settings/DateTimeSettingsSetupWizard.java b/src/com/android/settings/DateTimeSettingsSetupWizard.java
index 977d6c6..87b1cae 100644
--- a/src/com/android/settings/DateTimeSettingsSetupWizard.java
+++ b/src/com/android/settings/DateTimeSettingsSetupWizard.java
@@ -185,7 +185,7 @@
                 }
             }
             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(),
@@ -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);
@@ -296,7 +296,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 +305,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..aeedb0c 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -34,6 +34,7 @@
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.os.AsyncTask;
 import android.os.BatteryManager;
 import android.os.Build;
@@ -51,9 +52,11 @@
 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;
@@ -63,6 +66,7 @@
 
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 
 /*
  * Displays preferences for application developers.
@@ -71,6 +75,16 @@
         implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener,
                 OnPreferenceChangeListener, CompoundButton.OnCheckedChangeListener {
 
+    /**
+     * 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 KEEP_SCREEN_ON = "keep_screen_on";
     private static final String ALLOW_MOCK_LOCATION = "allow_mock_location";
@@ -79,9 +93,14 @@
     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,12 +108,18 @@
     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_HW_SCREEN_UPDATES_KEY = "show_hw_screen_udpates";
+    private static final String SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_udpates";
+    private static final String SHOW_HW_OVERDRAW_KEY = "show_hw_overdraw";
     private static final String DEBUG_LAYOUT_KEY = "debug_layout";
     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 OPENGL_TRACES_KEY = "enable_opengl_traces";
 
     private static final String ENABLE_TRACES_KEY = "enable_traces";
 
@@ -106,6 +131,8 @@
 
     private static final String TAG_CONFIRM_ENFORCE = "confirm_enforce";
 
+    private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
+
     private static final int RESULT_DEBUG_APP = 1000;
 
     private IWindowManager mWindowManager;
@@ -118,6 +145,8 @@
     private boolean mDontPokeProperties;
 
     private CheckBoxPreference mEnableAdb;
+    private Preference mBugreport;
+    private CheckBoxPreference mBugreportInPower;
     private CheckBoxPreference mKeepScreenOn;
     private CheckBoxPreference mEnforceReadExternal;
     private CheckBoxPreference mAllowMockLocation;
@@ -126,6 +155,7 @@
     private String mDebugApp;
     private Preference mDebugAppPref;
     private CheckBoxPreference mWaitForDebugger;
+    private CheckBoxPreference mVerifyAppsOverUsb;
 
     private CheckBoxPreference mStrictMode;
     private CheckBoxPreference mPointerLocation;
@@ -134,12 +164,17 @@
     private CheckBoxPreference mDisableOverlays;
     private CheckBoxPreference mShowCpuUsage;
     private CheckBoxPreference mForceHardwareUi;
+    private CheckBoxPreference mForceMsaa;
     private CheckBoxPreference mTrackFrameTime;
     private CheckBoxPreference mShowHwScreenUpdates;
+    private CheckBoxPreference mShowHwLayersUpdates;
+    private CheckBoxPreference mShowHwOverdraw;
     private CheckBoxPreference mDebugLayout;
     private ListPreference mWindowAnimationScale;
     private ListPreference mTransitionAnimationScale;
     private ListPreference mAnimatorDurationScale;
+    private ListPreference mOverlayDisplayDevices;
+    private ListPreference mOpenGLTraces;
     private MultiCheckPreference mEnableTracesPref;
 
     private CheckBoxPreference mImmediatelyDestroyActivities;
@@ -170,6 +205,8 @@
         addPreferencesFromResource(R.xml.development_prefs);
 
         mEnableAdb = findAndInitCheckboxPref(ENABLE_ADB);
+        mBugreport = findPreference(BUGREPORT);
+        mBugreportInPower = findAndInitCheckboxPref(BUGREPORT_IN_POWER_KEY);
         mKeepScreenOn = findAndInitCheckboxPref(KEEP_SCREEN_ON);
         mEnforceReadExternal = findAndInitCheckboxPref(ENFORCE_READ_EXTERNAL);
         mAllowMockLocation = findAndInitCheckboxPref(ALLOW_MOCK_LOCATION);
@@ -179,6 +216,16 @@
         mDebugAppPref = findPreference(DEBUG_APP_KEY);
         mAllPrefs.add(mDebugAppPref);
         mWaitForDebugger = findAndInitCheckboxPref(WAIT_FOR_DEBUGGER_KEY);
+        mVerifyAppsOverUsb = findAndInitCheckboxPref(VERIFY_APPS_OVER_USB_KEY);
+        if (!showVerifierSetting()) {
+            PreferenceGroup debugDebuggingCategory = (PreferenceGroup)
+                    findPreference(DEBUG_DEBUGGING_CATEGORY_KEY);
+            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,8 +233,11 @@
         mDisableOverlays = findAndInitCheckboxPref(DISABLE_OVERLAYS_KEY);
         mShowCpuUsage = findAndInitCheckboxPref(SHOW_CPU_USAGE_KEY);
         mForceHardwareUi = findAndInitCheckboxPref(FORCE_HARDWARE_UI_KEY);
+        mForceMsaa = findAndInitCheckboxPref(FORCE_MSAA_KEY);
         mTrackFrameTime = findAndInitCheckboxPref(TRACK_FRAME_TIME_KEY);
         mShowHwScreenUpdates = findAndInitCheckboxPref(SHOW_HW_SCREEN_UPDATES_KEY);
+        mShowHwLayersUpdates = findAndInitCheckboxPref(SHOW_HW_LAYERS_UPDATES_KEY);
+        mShowHwOverdraw = findAndInitCheckboxPref(SHOW_HW_OVERDRAW_KEY);
         mDebugLayout = findAndInitCheckboxPref(DEBUG_LAYOUT_KEY);
         mWindowAnimationScale = (ListPreference) findPreference(WINDOW_ANIMATION_SCALE_KEY);
         mAllPrefs.add(mWindowAnimationScale);
@@ -198,6 +248,12 @@
         mAnimatorDurationScale = (ListPreference) findPreference(ANIMATOR_DURATION_SCALE_KEY);
         mAllPrefs.add(mAnimatorDurationScale);
         mAnimatorDurationScale.setOnPreferenceChangeListener(this);
+        mOverlayDisplayDevices = (ListPreference) findPreference(OVERLAY_DISPLAY_DEVICES_KEY);
+        mAllPrefs.add(mOverlayDisplayDevices);
+        mOverlayDisplayDevices.setOnPreferenceChangeListener(this);
+        mOpenGLTraces = (ListPreference) findPreference(OPENGL_TRACES_KEY);
+        mAllPrefs.add(mOpenGLTraces);
+        mOpenGLTraces.setOnPreferenceChangeListener(this);
         mEnableTracesPref = (MultiCheckPreference)findPreference(ENABLE_TRACES_KEY);
         String[] traceValues = new String[Trace.TRACE_TAGS.length];
         for (int i=Trace.TRACE_FLAGS_START_BIT; i<traceValues.length; i++) {
@@ -260,7 +316,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
@@ -305,8 +361,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 +371,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,11 +388,13 @@
         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);
+        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(mEnforceReadExternal, isPermissionEnforced(READ_EXTERNAL_STORAGE));
         updateCheckBox(mAllowMockLocation, Settings.Secure.getInt(cr,
                 Settings.Secure.ALLOW_MOCK_LOCATION, 0) != 0);
         updateHdcpValues();
@@ -347,14 +406,21 @@
         updateFlingerOptions();
         updateCpuUsageOptions();
         updateHardwareUiOptions();
+        updateMsaaOptions();
         updateTrackFrameTimeOptions();
         updateShowHwScreenUpdatesOptions();
+        updateShowHwLayersUpdatesOptions();
+        updateShowHwOverdrawOptions();
         updateDebugLayoutOptions();
         updateAnimationScaleOptions();
+        updateOverlayDisplayDevicesOptions();
+        updateOpenGLTracesOptions();
         updateEnableTracesOptions();
         updateImmediatelyDestroyActivitiesOptions();
         updateAppProcessLimitOptions();
         updateShowAllANRsOptions();
+        updateVerifyAppsOverUsbOptions();
+        updateBugreportOptions();
     }
 
     private void resetDangerousOptions() {
@@ -370,6 +436,7 @@
         writeAnimationScaleOption(0, mWindowAnimationScale, null);
         writeAnimationScaleOption(1, mTransitionAnimationScale, null);
         writeAnimationScaleOption(2, mAnimatorDurationScale, null);
+        writeOverlayDisplayDevicesOptions(null);
         writeEnableTracesOptions(0);
         writeAppProcessLimitOptions(null);
         mHaveDebugSettings = false;
@@ -426,10 +493,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 +516,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
@@ -563,6 +685,15 @@
         pokeSystemProperties();
     }
 
+    private void updateMsaaOptions() {
+        updateCheckBox(mForceMsaa, SystemProperties.getBoolean(MSAA_PROPERTY, false));
+    }
+
+    private void writeMsaaOptions() {
+        SystemProperties.set(MSAA_PROPERTY, mForceMsaa.isChecked() ? "true" : "false");
+        pokeSystemProperties();
+    }
+
     private void updateTrackFrameTimeOptions() {
         updateCheckBox(mTrackFrameTime,
                 SystemProperties.getBoolean(HardwareRenderer.PROFILE_PROPERTY, false));
@@ -581,7 +712,29 @@
 
     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 updateShowHwOverdrawOptions() {
+        updateCheckBox(mShowHwOverdraw, SystemProperties.getBoolean(
+                HardwareRenderer.DEBUG_SHOW_OVERDRAW_PROPERTY, false));
+    }
+
+    private void writeShowHwOverdrawOptions() {
+        SystemProperties.set(HardwareRenderer.DEBUG_SHOW_OVERDRAW_PROPERTY,
+                mShowHwOverdraw.isChecked() ? "true" : null);
         pokeSystemProperties();
     }
 
@@ -597,14 +750,14 @@
     }
 
     private void updateCpuUsageOptions() {
-        updateCheckBox(mShowCpuUsage, Settings.System.getInt(getActivity().getContentResolver(),
-                Settings.System.SHOW_PROCESSES, 0) != 0);
+        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 +776,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 +816,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();
@@ -705,7 +907,6 @@
     }
 
     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;
@@ -764,8 +965,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);
                 }
@@ -806,12 +1007,19 @@
                         .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 == 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, 
+            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) {
@@ -828,6 +1036,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,10 +1056,16 @@
             writeShowAllANRsOptions();
         } else if (preference == mForceHardwareUi) {
             writeHardwareUiOptions();
+        } else if (preference == mForceMsaa) {
+            writeMsaaOptions();
         } else if (preference == mTrackFrameTime) {
             writeTrackFrameTimeOptions();
         } else if (preference == mShowHwScreenUpdates) {
             writeShowHwScreenUpdatesOptions();
+        } else if (preference == mShowHwLayersUpdates) {
+            writeShowHwLayersUpdatesOptions();
+        } else if (preference == mShowHwOverdraw) {
+            writeShowHwOverdrawOptions();
         } else if (preference == mDebugLayout) {
             writeDebugLayoutOptions();
         }
@@ -873,6 +1089,12 @@
         } else if (preference == mAnimatorDurationScale) {
             writeAnimationScaleOption(2, mAnimatorDurationScale, newValue);
             return true;
+        } else if (preference == mOverlayDisplayDevices) {
+            writeOverlayDisplayDevicesOptions(newValue);
+            return true;
+        } else if (preference == mOpenGLTraces) {
+            writeOpenGLTracesOptions(newValue);
+            return true;
         } else if (preference == mEnableTracesPref) {
             writeEnableTracesOptions();
             return true;
@@ -898,8 +1120,11 @@
         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);
@@ -907,8 +1132,8 @@
         } 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 +1166,7 @@
 
     void pokeSystemProperties() {
         if (!mDontPokeProperties) {
+            //noinspection unchecked
             (new SystemPropPoker()).execute();
         }
     }
@@ -961,6 +1187,9 @@
                     try {
                         obj.transact(IBinder.SYSPROPS_TRANSACTION, data, null, 0);
                     } catch (RemoteException e) {
+                    } catch (Exception e) {
+                        Log.i("DevSettings", "Somone wrote a bad service '" + service
+                                + "' that doesn't like to be poked: " + e);
                     }
                     data.recycle();
                 }
@@ -970,7 +1199,7 @@
     }
 
     /**
-     * Dialog to confirm enforcement of {@link #READ_EXTERNAL_STORAGE}.
+     * Dialog to confirm enforcement of {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}.
      */
     public static class ConfirmEnforceFragment extends DialogFragment {
         public static void show(DevelopmentSettings parent) {
@@ -1005,9 +1234,9 @@
         }
     }
 
-    private static boolean isPermissionEnforced(Context context, String permission) {
+    private static boolean isPermissionEnforced(String permission) {
         try {
-            return ActivityThread.getPackageManager().isPermissionEnforced(READ_EXTERNAL_STORAGE);
+            return ActivityThread.getPackageManager().isPermissionEnforced(permission);
         } catch (RemoteException e) {
             throw new RuntimeException("Problem talking with PackageManager", e);
         }
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 8254233..a4abfea 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -17,25 +17,23 @@
 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;
 
@@ -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,11 @@
     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;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -80,6 +83,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 +129,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 +173,44 @@
                     Log.e(LOG_TAG, "Unable to start activity " + intent.toString());
                 }
             }
+        } else if (preference.getKey().equals(KEY_BUILD_NUMBER)) {
+            if (mDevHitCountdown > 0) {
+                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().getString(
+                            R.string.show_dev_countdown, 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 +221,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..fb839a7 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,9 +60,14 @@
     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();
@@ -61,6 +75,9 @@
     private ListPreference mScreenTimeoutPreference;
     private Preference mScreenSaverPreference;
 
+    private WifiDisplayStatus mWifiDisplayStatus;
+    private Preference mWifiDisplayPreference;
+
     private final RotationPolicy.RotationPolicyListener mRotationPolicyListener =
             new RotationPolicy.RotationPolicyListener() {
         @Override
@@ -87,7 +104,7 @@
         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);
         }
         
@@ -99,8 +116,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 +134,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 +154,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);
     }
@@ -211,10 +242,16 @@
     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 +260,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() {
@@ -284,4 +357,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..70124ef
--- /dev/null
+++ b/src/com/android/settings/DreamBackend.java
@@ -0,0 +1,307 @@
+/*
+ * 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;
+        }
+        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..32328d9 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,353 @@
 
 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.setPadding(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);
+        TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
+        emptyView.setText(R.string.screensaver_settings_disabled_prompt);
+        listView.setEmptyView(emptyView);
 
-        final Activity activity = getActivity();
-
-        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 : 0.33f);
+            settingsButton.setEnabled(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);
+            row.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/KeyguardAppWidgetPickActivity.java b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
new file mode 100644
index 0000000..80dbc0c
--- /dev/null
+++ b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
@@ -0,0 +1,627 @@
+/*
+ * 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.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;
+                    mAppWidgetId = AppWidgetHost.allocateAppWidgetIdForSystem(KEYGUARD_HOST_ID);
+                }
+                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) {
+                    AppWidgetHost.deleteAppWidgetIdForSystem(mAppWidgetId);
+                }
+                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..9bfa07e 100644
--- a/src/com/android/settings/LocalePicker.java
+++ b/src/com/android/settings/LocalePicker.java
@@ -16,18 +16,87 @@
 
 package com.android.settings;
 
+import android.app.Dialog;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
+
 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);
+    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 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
index d5c4d9f..cfbbe26 100644
--- a/src/com/android/settings/LocationSettings.java
+++ b/src/com/android/settings/LocationSettings.java
@@ -129,7 +129,7 @@
                 mAssistedGps.setEnabled(enabled);
             }
         } else if (preference == mAssistedGps) {
-            Settings.Secure.putInt(cr, Settings.Secure.ASSISTED_GPS_ENABLED,
+            Settings.Global.putInt(cr, Settings.Global.ASSISTED_GPS_ENABLED,
                     mAssistedGps.isChecked() ? 1 : 0);
         } else {
             // If we didn't handle it, let preferences handle it.
@@ -152,8 +152,8 @@
         mNetwork.setChecked(networkEnabled);
         mLocationAccess.setChecked(gpsEnabled || networkEnabled);
         if (mAssistedGps != null) {
-            mAssistedGps.setChecked(Settings.Secure.getInt(res,
-                    Settings.Secure.ASSISTED_GPS_ENABLED, 2) == 1);
+            mAssistedGps.setChecked(Settings.Global.getInt(res,
+                    Settings.Global.ASSISTED_GPS_ENABLED, 2) == 1);
             mAssistedGps.setEnabled(gpsEnabled);
         }
     }
@@ -185,6 +185,10 @@
         return true;
     }
 
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_location_access;
+    }
 }
 
 class WrappingSwitchPreference extends SwitchPreference {
diff --git a/src/com/android/settings/OwnerInfoSettings.java b/src/com/android/settings/OwnerInfoSettings.java
index 77484e4..2d44921 100644
--- a/src/com/android/settings/OwnerInfoSettings.java
+++ b/src/com/android/settings/OwnerInfoSettings.java
@@ -19,6 +19,7 @@
 import android.app.Fragment;
 import android.content.ContentResolver;
 import android.os.Bundle;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -51,6 +52,9 @@
         mEditText.setText(info);
         mEditText.setEnabled(enabled != 0);
         mCheckbox.setChecked(enabled != 0);
+        if (UserHandle.myUserId() != UserHandle.USER_OWNER) {
+            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,
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..f521d6d 100644
--- a/src/com/android/settings/ProxySelector.java
+++ b/src/com/android/settings/ProxySelector.java
@@ -63,7 +63,7 @@
             "^$|^[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*$";
     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]+)*)*)+$";
+            "$|^[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*$";
     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..d72508a 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -33,6 +33,7 @@
 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;
@@ -111,6 +112,7 @@
     private TextView mCfi;
     private TextView mLocation;
     private TextView mNeighboringCids;
+    private TextView mCellInfo;
     private TextView resets;
     private TextView attempts;
     private TextView successes;
@@ -140,6 +142,7 @@
     private String mHttpClientTestResult;
     private boolean mMwiValue = false;
     private boolean mCfiValue = false;
+    private List<CellInfo> mCellInfoValue;
 
     private PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
         @Override
@@ -171,6 +174,13 @@
             mCfiValue = cfi;
             updateCallRedirect();
         }
+
+        @Override
+        public void onCellInfoChanged(List<CellInfo> arrayCi) {
+            Log.d(TAG, "[RadioInfo] onCellInfoChanged: arrayCi=" + arrayCi);
+            mCellInfoValue = arrayCi;
+            updateCellInfoTv();
+        }
     };
 
     private Handler mHandler = new Handler() {
@@ -263,6 +273,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);
@@ -326,6 +337,10 @@
                 mHandler.obtainMessage(EVENT_QUERY_NEIGHBORING_CIDS_DONE));
 
         CellLocation.requestLocationUpdate();
+
+        // Get current cell info
+        mCellInfoValue = mTelephonyManager.getAllCellInfo();
+        Log.d(TAG, "[RadioInfo] onCreate: mCellInfoValue=" + mCellInfoValue);
     }
 
     @Override
@@ -356,7 +371,8 @@
                 | 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
@@ -508,6 +524,23 @@
         mNeighboringCids.setText(sb.toString());
     }
 
+    private final void updateCellInfoTv() {
+        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));
diff --git a/src/com/android/settings/RegulatoryInfoPreference.java b/src/com/android/settings/RegulatoryInfoPreference.java
new file mode 100644
index 0000000..f1a6b77
--- /dev/null
+++ b/src/com/android/settings/RegulatoryInfoPreference.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;
+
+import android.content.Context;
+import android.preference.DialogPreference;
+import android.util.AttributeSet;
+
+/**
+ * {@link DialogPreference} that displays regulatory information. "About phone"
+ * will show a "Regulatory information" preference if
+ * R.bool.config_show_regulatory_info is true.
+ */
+public class RegulatoryInfoPreference extends DialogPreference {
+
+    public RegulatoryInfoPreference(Context context, AttributeSet attrs) {
+        super(context, attrs, com.android.internal.R.attr.preferenceStyle);
+        setDialogLayoutResource(R.layout.regulatory_info);
+    }
+}
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index a12da3e..59cd110 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -25,9 +25,12 @@
 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,10 +42,10 @@
 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.
@@ -50,6 +53,8 @@
 public class SecuritySettings extends SettingsPreferenceFragment
         implements OnPreferenceChangeListener, DialogInterface.OnClickListener {
 
+    static final String TAG = "SecuritySettings";
+
     // Lock Settings
     private static final String KEY_UNLOCK_SET_OR_CHANGE = "unlock_set_or_change";
     private static final String KEY_BIOMETRIC_WEAK_IMPROVE_MATCHING =
@@ -57,9 +62,10 @@
     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 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;
@@ -69,7 +75,10 @@
     private static final String KEY_SHOW_PASSWORD = "show_password";
     private static final String KEY_RESET_CREDENTIALS = "reset_credentials";
     private static final String KEY_TOGGLE_INSTALL_APPLICATIONS = "toggle_install_applications";
+    private static final String KEY_TOGGLE_VERIFY_APPLICATIONS = "toggle_verify_applications";
     private static final String KEY_POWER_INSTANTLY_LOCKS = "power_button_instantly_locks";
+    private static final String KEY_CREDENTIALS_MANAGER = "credentials_management";
+    private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
 
     DevicePolicyManager mDPM;
 
@@ -79,7 +88,6 @@
 
     private CheckBoxPreference mBiometricWeakLiveliness;
     private CheckBoxPreference mVisiblePattern;
-    private CheckBoxPreference mTactileFeedback;
 
     private CheckBoxPreference mShowPassword;
 
@@ -87,8 +95,11 @@
 
     private CheckBoxPreference mToggleAppInstallation;
     private DialogInterface mWarnInstallApps;
+    private CheckBoxPreference mToggleVerifyApps;
     private CheckBoxPreference mPowerButtonInstantlyLocks;
 
+    private boolean mIsPrimary;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -111,7 +122,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;
@@ -141,7 +157,17 @@
         DevicePolicyManager dpm =
                 (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
 
-        if (UserId.myUserId() == 0) {
+        mIsPrimary = UserHandle.myUserId() == UserHandle.USER_OWNER;
+
+        if (!mIsPrimary) {
+            // Rename owner info settings
+            Preference ownerInfoPref = findPreference(KEY_OWNER_INFO_SETTINGS);
+            if (ownerInfoPref != null) {
+                ownerInfoPref.setTitle(R.string.user_info_settings_title);
+            }
+        }
+
+        if (mIsPrimary) {
             switch (dpm.getStorageEncryptionStatus()) {
             case DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE:
                 // The device is currently encrypted.
@@ -183,27 +209,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
@@ -218,27 +229,69 @@
         // Show password
         mShowPassword = (CheckBoxPreference) root.findPreference(KEY_SHOW_PASSWORD);
 
-        // Credential storage
-        mResetCredentials = root.findPreference(KEY_RESET_CREDENTIALS);
+        // Credential storage, only for primary user
+        if (mIsPrimary) {
+            mResetCredentials = root.findPreference(KEY_RESET_CREDENTIALS);
+        } else {
+            removePreference(KEY_CREDENTIALS_MANAGER);
+        }
 
         mToggleAppInstallation = (CheckBoxPreference) findPreference(
                 KEY_TOGGLE_INSTALL_APPLICATIONS);
         mToggleAppInstallation.setChecked(isNonMarketAppsAllowed());
 
+        // 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 {
+            PreferenceGroup deviceAdminCategory= (PreferenceGroup)
+                    root.findPreference(KEY_DEVICE_ADMIN_CATEGORY);
+            if (deviceAdminCategory != null) {
+                deviceAdminCategory.removePreference(mToggleVerifyApps);
+            } else {
+                mToggleVerifyApps.setEnabled(false);
+            }
+        }
+
         return root;
     }
 
     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) {
         // 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(
@@ -345,9 +398,6 @@
         if (mVisiblePattern != null) {
             mVisiblePattern.setChecked(lockPatternUtils.isVisiblePatternEnabled());
         }
-        if (mTactileFeedback != null) {
-            mTactileFeedback.setChecked(lockPatternUtils.isTactileFeedbackEnabled());
-        }
         if (mPowerButtonInstantlyLocks != null) {
             mPowerButtonInstantlyLocks.setChecked(lockPatternUtils.getPowerButtonInstantlyLocks());
         }
@@ -406,8 +456,6 @@
             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 (preference == mShowPassword) {
@@ -420,6 +468,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,7 +497,9 @@
                 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();
@@ -466,6 +519,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..f045db0 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -17,13 +17,16 @@
 package com.android.settings;
 
 import com.android.internal.util.ArrayUtils;
+import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
 import com.android.settings.accounts.AccountSyncSettings;
 import com.android.settings.accounts.AuthenticatorHelper;
 import com.android.settings.accounts.ManageAccountsSettings;
+import com.android.settings.applications.InstalledAppDetails;
 import com.android.settings.applications.ManageApplications;
 import com.android.settings.bluetooth.BluetoothEnabler;
 import com.android.settings.deviceinfo.Memory;
 import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settings.vpn2.VpnSettings;
 import com.android.settings.wifi.WifiEnabler;
 
 import android.accounts.Account;
@@ -32,6 +35,7 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -40,10 +44,10 @@
 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,7 +56,6 @@
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.ListAdapter;
@@ -96,16 +99,32 @@
 
     // 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
     };
 
-    private boolean mEnableUserManagement = false;
+    private SharedPreferences mDevelopmentPreferences;
+    private SharedPreferences.OnSharedPreferenceChangeListener mDevelopmentPreferencesListener;
 
     // TODO: Update Call Settings based on airplane mode state.
 
@@ -121,15 +140,13 @@
             getWindow().setUiOptions(0);
         }
 
-        if (android.provider.Settings.Secure.getInt(getContentResolver(), "multiuser_enabled", -1)
-                > 0) {
-            mEnableUserManagement = true;
-        }
-
         mAuthenticatorHelper = new AuthenticatorHelper();
         mAuthenticatorHelper.updateAuthDescriptions(this);
         mAuthenticatorHelper.onAccountsUpdated(this, null);
 
+        mDevelopmentPreferences = getSharedPreferences(DevelopmentSettings.PREF_FILE,
+                Context.MODE_PRIVATE);
+
         getMetaData();
         mInLocalHeaderSwitch = true;
         super.onCreate(savedInstanceState);
@@ -186,6 +203,15 @@
     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();
@@ -201,6 +227,10 @@
         if (listAdapter instanceof HeaderAdapter) {
             ((HeaderAdapter) listAdapter).pause();
         }
+
+        mDevelopmentPreferences.unregisterOnSharedPreferenceChangeListener(
+                mDevelopmentPreferencesListener);
+        mDevelopmentPreferencesListener = null;
     }
 
     @Override
@@ -262,9 +292,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 +305,9 @@
             Integer index = mHeaderIndexMap.get(id);
             if (index != null) {
                 getListView().setItemChecked(index, true);
-                getListView().smoothScrollToPosition(index);
+                if (isMultiPane()) {
+                    getListView().smoothScrollToPosition(index);
+                }
             }
         }
     }
@@ -355,7 +389,11 @@
                 WirelessSettings.class.getName().equals(fragmentName) ||
                 SoundSettings.class.getName().equals(fragmentName) ||
                 PrivacySettings.class.getName().equals(fragmentName) ||
-                ManageAccountsSettings.class.getName().equals(fragmentName)) {
+                ManageAccountsSettings.class.getName().equals(fragmentName) ||
+                VpnSettings.class.getName().equals(fragmentName) ||
+                SecuritySettings.class.getName().equals(fragmentName) ||
+                InstalledAppDetails.class.getName().equals(fragmentName) ||
+                ChooseLockGenericFragment.class.getName().equals(fragmentName)) {
             intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true);
         }
 
@@ -374,25 +412,27 @@
     }
 
     private void updateHeaderList(List<Header> target) {
+        final boolean showDev = mDevelopmentPreferences.getBoolean(
+                DevelopmentSettings.PREF_SHOW,
+                android.os.Build.TYPE.equals("eng"));
         int i = 0;
+
+        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,7 +440,7 @@
                         .asInterface(ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE));
                 try {
                     if (!netManager.isBandwidthControlEnabled()) {
-                        target.remove(header);
+                        target.remove(i);
                     }
                 } catch (RemoteException e) {
                     // ignored
@@ -409,16 +449,21 @@
                 int headerIndex = i + 1;
                 i = insertAccountsHeaders(target, headerIndex);
             } 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.development_settings) {
+                if (!showDev) {
+                    target.remove(i);
                 }
             }
-            if (UserId.MU_ENABLED && UserId.myUserId() != 0
+
+            if (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.
@@ -495,10 +540,6 @@
         return headerIndex;
     }
 
-    private boolean needsDockSettings() {
-        return getResources().getBoolean(R.bool.has_dock_settings);
-    }
-
     private void getMetaData() {
         try {
             ActivityInfo ai = getPackageManager().getActivityInfo(getComponentName(),
@@ -722,6 +763,9 @@
         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) {
+            titleRes = R.string.user_info_settings_title;
         }
         startPreferencePanel(pref.getFragment(), pref.getExtras(), titleRes, pref.getTitle(),
                 null, 0);
@@ -743,6 +787,8 @@
 
     @Override
     public void onAccountsUpdated(Account[] accounts) {
+        // TODO: watch for package upgrades to invalidate cache; see 7206643
+        mAuthenticatorHelper.updateAuthDescriptions(this);
         mAuthenticatorHelper.onAccountsUpdated(this, accounts);
         invalidateHeaders();
     }
@@ -775,7 +821,6 @@
     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 +832,5 @@
     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 */ }
 }
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..c0440c8 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -25,6 +25,7 @@
 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;
@@ -66,6 +67,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
@@ -174,6 +182,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 +220,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);
diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index 67557b9..7e461711 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,6 +71,10 @@
     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,
@@ -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
@@ -145,15 +172,18 @@
 
         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 (!Utils.isVoiceCapable(getActivity())) {
+            removePreference(KEY_VIBRATE);
         }
 
         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 +223,8 @@
                 }
             }
         };
+
+        initDockSettings();
     }
 
     @Override
@@ -200,6 +232,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 +304,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 +343,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 +357,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/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 4a79eca..df44e91 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -48,6 +48,7 @@
 
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.Locale;
 
 /*
@@ -55,6 +56,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 +79,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 +152,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 +190,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 +237,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 +377,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) {
@@ -392,24 +392,31 @@
         } 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 +484,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 +537,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 {
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index a029342..6d76bed 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;
@@ -371,11 +396,15 @@
         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);
@@ -441,4 +470,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..10d9214 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -26,6 +26,7 @@
 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.PreferenceScreen;
@@ -85,8 +86,8 @@
             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);
     }
 
@@ -96,6 +97,8 @@
 
         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);
@@ -109,35 +112,38 @@
         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);
             }
         }
         // 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);
+        }
 
         // 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);
         }
@@ -151,8 +157,8 @@
         }
 
         // Remove Mobile Network Settings if it's a wifi-only device.
-        if (Utils.isWifiOnly(getActivity())) {
-            getPreferenceScreen().removePreference(findPreference(KEY_MOBILE_NETWORK_SETTINGS));
+        if (isSecondaryUser || Utils.isWifiOnly(getActivity())) {
+            removePreference(KEY_MOBILE_NETWORK_SETTINGS);
         }
 
         // Enable Proxy selector settings if allowed.
@@ -166,7 +172,7 @@
         // 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);
@@ -187,7 +193,7 @@
         } 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);
diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
index 382481e..6f7e29a 100644
--- a/src/com/android/settings/accounts/AddAccountSettings.java
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
@@ -27,6 +27,8 @@
 import android.os.Bundle;
 import android.util.Log;
 
+import com.android.settings.Utils;
+
 import java.io.IOException;
 
 /**
@@ -46,7 +48,7 @@
  */
 public class AddAccountSettings extends Activity {
     /**
-     * 
+     *
      */
     private static final String KEY_ADD_CALLED = "AddAccountCalled";
 
@@ -61,19 +63,35 @@
 
     /* 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>() {
         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 +102,9 @@
             } catch (AuthenticatorException e) {
                 if (Log.isLoggable(TAG, Log.VERBOSE)) Log.v(TAG, "addAccount failed: " + e);
             } finally {
-                finish();
+                if (done) {
+                    finish();
+                }
             }
         }
     };
@@ -131,6 +151,14 @@
             // 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;
         }
     }
 
@@ -144,12 +172,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/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/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/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java
index 3256fb2..e87d7cf 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);
         }
@@ -234,6 +239,7 @@
 
     final Context mContext;
     final PackageManager mPm;
+    final int mRetrieveFlags;
     PackageIntentReceiver mPackageIntentReceiver;
 
     boolean mResumed;
@@ -397,7 +403,15 @@
                 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;
+        } else {
+            mRetrieveFlags = PackageManager.GET_DISABLED_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 +601,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>();
         }
@@ -719,9 +731,7 @@
                     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);
                 mApplications.add(info);
                 if (!mBackgroundHandler.hasMessages(BackgroundHandler.MSG_LOAD_ENTRIES)) {
                     mBackgroundHandler.sendEmptyMessage(BackgroundHandler.MSG_LOAD_ENTRIES);
@@ -786,7 +796,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 +835,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..7241fdc 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;
@@ -64,14 +68,20 @@
 import java.util.ArrayList;
 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 +97,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 +142,9 @@
     private CompoundButton mNotificationSwitch;
 
     private PackageMoveObserver mPackageMoveObserver;
-    
+
+    private boolean mDisableAfterUninstall;
+
     private boolean mHaveSizes = false;
     private long mLastCodeSize = -1;
     private long mLastDataSize = -1;
@@ -161,7 +178,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.
@@ -289,39 +314,56 @@
         }
     }
 
+    private boolean handleDisableable(Button button) {
+        boolean disableable = false;
+        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.
+                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;
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.w(TAG, "Unable to get package info", e);
+        }
+        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);
             }
@@ -360,16 +402,25 @@
     @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
@@ -384,7 +435,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 +448,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,6 +475,65 @@
         return view;
     }
 
+    @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 applicaiton label and icon.
     private void setAppLabelAndIcon(PackageInfo pkgInfo) {
         View appSnippet = mRootView.findViewById(R.id.app_snippet);
@@ -478,10 +599,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 +610,38 @@
             }
         }
         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 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 preferred activities
         List<ComponentName> prefActList = new ArrayList<ComponentName>();
         
@@ -518,7 +652,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,8 +721,43 @@
         // 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);
@@ -634,16 +803,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 +901,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 +934,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 +976,7 @@
             mMoveAppButton.setText(R.string.moving);
             mMoveAppButton.setEnabled(false);
             mUninstallButton.setEnabled(false);
+            mSpecialDisableButton.setEnabled(false);
         }
     }
 
@@ -835,7 +1068,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 +1160,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,6 +1226,7 @@
                     Uri.fromParts("package", mAppEntry.info.packageName, null));
             intent.putExtra(Intent.EXTRA_PACKAGES, new String[] { mAppEntry.info.packageName });
             intent.putExtra(Intent.EXTRA_UID, mAppEntry.info.uid);
+            intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.getUserId(mAppEntry.info.uid));
             getActivity().sendOrderedBroadcast(intent, null, mCheckKillProcessesReceiver, null,
                     Activity.RESULT_CANCELED, null, null);
         }
@@ -1013,6 +1264,17 @@
         }
     }
 
+    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 +1293,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 +1319,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/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 1cc9dcc..b94d944 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -20,6 +20,7 @@
 import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
 
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.Fragment;
 import android.app.INotificationManager;
@@ -41,6 +42,7 @@
 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;
@@ -341,7 +343,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 {
@@ -771,8 +774,12 @@
                     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);
                 }
@@ -994,7 +1001,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.
@@ -1118,11 +1124,15 @@
                                 + prefActivities.get(i).getPackageName());
                         pm.clearPackagePreferredActivities(prefActivities.get(i).getPackageName());
                     }
-                    final int[] restrictedAppIds = npm.getAppsWithPolicy(
+                    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/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java
index 7c3ebb0..67221ae 100644
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -26,6 +26,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 +43,7 @@
 import android.widget.AbsListView.RecyclerListener;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 
@@ -49,10 +51,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 +171,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 +190,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 +208,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 +237,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);
+                    }
+                }
             }
         }
         
@@ -374,8 +387,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 +406,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..02fbecc 100644
--- a/src/com/android/settings/applications/RunningServiceDetails.java
+++ b/src/com/android/settings/applications/RunningServiceDetails.java
@@ -26,6 +26,7 @@
 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;
@@ -39,35 +40,38 @@
 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 +199,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 +219,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 +228,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 +262,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 +339,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 +385,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 +433,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 +495,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);
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index 1b5310d..5797dfa 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,16 @@
 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.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 +55,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 +74,8 @@
     final Context mApplicationContext;
     final ActivityManager mAm;
     final PackageManager mPm;
+    final UserManager mUm;
+    final int mMyUserId;
 
     OnRefreshUiListener mRefreshUiListener;
 
@@ -100,6 +111,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 +136,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 +207,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 +291,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 +335,8 @@
         
         MergedItem mMergedItem;
         
-        public ServiceItem() {
-            super(false);
+        public ServiceItem(int userId) {
+            super(false, userId);
         }
     }
 
@@ -271,7 +366,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 +379,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 +397,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 +429,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 +439,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 +448,21 @@
             } 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));
+                } catch (RemoteException e) {
                 }
                 si.mDisplayLabel = makeLabel(pm,
                         si.mRunningService.service.getClassName(), si.mServiceInfo);
@@ -456,55 +556,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 +659,26 @@
             }
             return false;
         }
+
+        public Drawable loadIcon(Context context, RunningState state) {
+            if (mUser == null) {
+                return super.loadIcon(context, state);
+            }
+            if (mUser.mIcon != null) {
+                return mUser.mIcon.getConstantState().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 +727,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 +805,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(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 +1132,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 +1168,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 +1181,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 +1195,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 +1259,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 +1280,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 +1317,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 +1370,7 @@
             mServiceProcessMemory = serviceProcessMemory;
             if (newBackgroundItems != null) {
                 mBackgroundItems = newBackgroundItems;
+                mUserBackgroundItems = newUserBackgroundItems;
                 if (mWatchingBackgroundItems) {
                     changed = true;
                 }
@@ -1150,7 +1404,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..fbf24c9
--- a/src/com/android/settings/bluetooth/A2dpProfile.java
+++ b/src/com/android/settings/bluetooth/A2dpProfile.java
@@ -24,17 +24,19 @@
 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;
 
     static final ParcelUuid[] SINK_UUIDS = {
         BluetoothUuid.AudioSink,
@@ -42,6 +44,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,15 +54,22 @@
             implements BluetoothProfile.ServiceListener {
 
         public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            if (V) Log.d(TAG,"Bluetooth service connected");
             mService = (BluetoothA2dp) proxy;
+            mIsProfileReady=true;
         }
 
         public void onServiceDisconnected(int profile) {
-            mService = null;
+            if (V) Log.d(TAG,"Bluetooth service disconnected");
+            mIsProfileReady=false;
         }
     }
 
-    A2dpProfile(Context context) {
+    public boolean isProfileReady() {
+        return mIsProfileReady;
+    }
+    A2dpProfile(Context context, LocalBluetoothProfileManager profileManager) {
+        mProfileManager = profileManager;
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
         adapter.getProfileProxy(context, new A2dpServiceListener(),
                 BluetoothProfile.A2DP);
@@ -73,7 +83,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 +92,7 @@
     }
 
     public boolean connect(BluetoothDevice device) {
+        if (mService == null) return false;
         List<BluetoothDevice> sinks = getConnectedDevices();
         if (sinks != null) {
             for (BluetoothDevice sink : sinks) {
@@ -91,22 +103,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 +138,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 +149,6 @@
         return false;
     }
 
-    public boolean isProfileReady() {
-        return mService != null;
-    }
-
     public String toString() {
         return NAME;
     }
@@ -143,7 +162,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 +178,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/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/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
old mode 100644
new mode 100755
index 4fd6cee..16476fa
--- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
@@ -251,6 +251,13 @@
         CachedBluetoothDeviceManager cachedDeviceManager =
             bluetoothManager.getCachedDeviceManager();
         CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
-        cachedDevice.setPhonebookPermissionChoice(permissionChoice);
+        if (cachedDevice != null ) {
+            cachedDevice.setPhonebookPermissionChoice(permissionChoice);
+        } else {
+            cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(),
+                                                         bluetoothManager.getProfileManager(),
+                                                         mDevice);
+            cachedDevice.setPhonebookPermissionChoice(permissionChoice);
+        }
     }
 }
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..e9ba39d 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -125,7 +125,7 @@
                 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));
             }
         }
 
@@ -282,7 +282,7 @@
 
                 // Available devices category
                 if (mAvailableDevicesCategory == null) {
-                    mAvailableDevicesCategory = new ProgressCategory(getActivity(), null);
+                    mAvailableDevicesCategory = new BluetoothProgressCategory(getActivity(), null);
                 } else {
                     mAvailableDevicesCategory.removeAll();
                 }
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..4b19b9c
--- 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;
@@ -118,7 +119,11 @@
             Log.d(TAG, "onProfileStateChanged: profile " + profile +
                     " newProfileState " + newProfileState);
         }
-
+        if (mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_TURNING_OFF)
+        {
+            if (Utils.D) Log.d(TAG, " BT Turninig Off...Profile conn state change ignored...");
+            return;
+        }
         mProfileConnectionState.put(profile, newProfileState);
         if (newProfileState == BluetoothProfile.STATE_CONNECTED) {
             if (!mProfiles.contains(profile)) {
@@ -156,6 +161,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 +197,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 +252,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 +301,6 @@
     }
 
     void unpair() {
-        disconnect();
-
         int state = getBondState();
 
         if (state == BluetoothDevice.BOND_BONDING) {
@@ -317,6 +333,16 @@
         return mProfileConnectionState.get(profile);
     }
 
+    public void clearProfileConnectionState ()
+    {
+        if (Utils.D) {
+            Log.d(TAG," Clearing all connection state for dev:" + mDevice.getName());
+        }
+        for (LocalBluetoothProfile profile :getProfiles()) {
+            mProfileConnectionState.put(profile, BluetoothProfile.STATE_DISCONNECTED);
+        }
+    }
+
     // TODO: do any of these need to run async on a background thread?
     private void fillData() {
         fetchName();
@@ -436,7 +462,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());
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..7fc1b65 100644
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -193,8 +193,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/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..ab0e7c7 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;
@@ -267,7 +268,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 +328,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 +372,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 +444,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 +495,53 @@
 
         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);
+        if (device != null) {
+            // Device in a new dock.
+            boolean firstTime =
+                    !LocalBluetoothPreferences.hasDockAutoConnectSetting(this, device.getAddress());
 
-        // Remember this settings
-        LayoutInflater inflater = (LayoutInflater)
-                getSystemService(LAYOUT_INFLATER_SERVICE);
+            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);
+            CheckBox audioMediaCheckbox =
+                    (CheckBox) view.findViewById(R.id.dock_audio_media_enable_cb);
+
+            boolean checked = Settings.Global.getInt(getContentResolver(),
+                                    Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, 0) == 1;
+
+            audioMediaCheckbox.setChecked(checked);
+            audioMediaCheckbox.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 +575,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);
                     }
                 }
             };
@@ -823,7 +865,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 +884,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..83c8e8e
--- 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.
             List<BluetoothDevice> deviceList = mService.getConnectedDevices();
-            if (deviceList.isEmpty()) {
-                return;
+            if (!deviceList.isEmpty()) {
+                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);
             }
-            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..c502850
--- 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,11 @@
  * 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;
 
     static final String NAME = "HID";
 
@@ -43,16 +48,21 @@
             implements BluetoothProfile.ServiceListener {
 
         public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            if (V) Log.d(TAG,"Bluetooth service connected");
             mService = (BluetoothInputDevice) proxy;
-            mProfileReady = true;
+            mIsProfileReady=true;
         }
 
         public void onServiceDisconnected(int profile) {
-            mProfileReady = false;
-            mService = null;
+            if (V) Log.d(TAG,"Bluetooth service disconnected");
+            mIsProfileReady=false;
         }
     }
 
+    public boolean isProfileReady() {
+        return mIsProfileReady;
+    }
+
     HidProfile(Context context, LocalBluetoothAdapter adapter) {
         adapter.getProfileProxy(context, new InputDeviceServiceListener(),
                 BluetoothProfile.INPUT_DEVICE);
@@ -67,14 +77,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 +98,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 +118,6 @@
         }
     }
 
-    public boolean isProfileReady() {
-        return mProfileReady;
-    }
-
     public String toString() {
         return NAME;
     }
@@ -118,7 +132,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 +163,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..6f4a765 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
@@ -19,6 +19,7 @@
 import android.app.QueuedWork;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.res.Configuration;
 
 /**
  * LocalBluetoothPreferences provides an interface to the preferences
@@ -68,6 +69,12 @@
             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) {
+            return false;
+        }
+
         long currentTimeMillis = System.currentTimeMillis();
         SharedPreferences sharedPreferences = getSharedPreferences(context);
 
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
old mode 100644
new mode 100755
index f3143f0..916ef9e
--- a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
@@ -21,17 +21,22 @@
 import android.bluetooth.BluetoothHeadset;
 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
@@ -77,6 +82,7 @@
     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.
@@ -113,6 +119,10 @@
         addPanProfile(mPanProfile, PanProfile.NAME,
                 BluetoothPan.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);
+
         Log.d(TAG, "LocalBluetoothProfileManager construction complete");
     }
 
@@ -128,7 +138,7 @@
         if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.AudioSource)) {
             if (mA2dpProfile == null) {
                 Log.d(TAG, "Adding local A2DP profile");
-                mA2dpProfile = new A2dpProfile(mContext);
+                mA2dpProfile = new A2dpProfile(mContext, this);
                 addProfile(mA2dpProfile, A2dpProfile.NAME,
                         BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);
             }
@@ -287,6 +297,11 @@
         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 +313,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);
@@ -336,10 +352,13 @@
             removedProfiles.remove(mHidProfile);
         }
 
-        if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.NAP) &&
-            mPanProfile != null) {
+        if(isPanNapConnected)
+            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/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..08c10fb 100644
--- a/src/com/android/settings/bluetooth/RequestPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
@@ -228,8 +228,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/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..825a7be 100644
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -18,12 +18,15 @@
 
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.app.DialogFragment;
 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;
@@ -46,74 +49,72 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.google.common.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 +129,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 +139,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 +153,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();
         }
     }
 
@@ -214,9 +209,13 @@
 
     @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()) {
@@ -225,11 +224,11 @@
                 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 +249,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 +288,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 +305,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 +343,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 +351,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..1e0cc46 100644
--- a/src/com/android/settings/deviceinfo/MiscFilesHandler.java
+++ b/src/com/android/settings/deviceinfo/MiscFilesHandler.java
@@ -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) {
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..8017af3 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -33,6 +33,7 @@
 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;
@@ -190,13 +191,14 @@
 
         mRes = getResources();
         sUnknown = mRes.getString(R.string.device_info_default);
-
-        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);
             }
@@ -267,7 +269,7 @@
     protected void onResume() {
         super.onResume();
 
-        if (!Utils.isWifiOnly(getApplicationContext())) {
+        if (mPhone != null && !Utils.isWifiOnly(getApplicationContext())) {
             mPhoneStateReceiver.registerIntent();
 
             updateSignalStrength();
@@ -285,7 +287,7 @@
     public void onPause() {
         super.onPause();
 
-        if (!Utils.isWifiOnly(getApplicationContext())) {
+        if (mPhone != null && !Utils.isWifiOnly(getApplicationContext())) {
             mPhoneStateReceiver.unregisterIntent();
             mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
         }
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..772ac0d 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.common.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.bindService(service, mDefContainerConn, Context.BIND_AUTO_CREATE,
+                                    UserHandle.USER_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 (mIsInternal || mIsPrimary) {
+                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..1599ec7 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
@@ -16,20 +16,20 @@
 
 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;
@@ -37,189 +37,190 @@
 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);
+        final UserInfo currentUser;
+        try {
+            currentUser = ActivityManagerNative.getDefault().getCurrentUser();
+        } catch (RemoteException e) {
+            throw new RuntimeException("Failed to get current user");
+        }
 
-        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 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;
+        if (isRemovable) {
+            mMountTogglePreference = new Preference(context);
+            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 +228,28 @@
     }
 
     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);
+            mItemAvailable.setSummary(R.string.memory_available_read_only);
             if (mFormatPreference != null) {
                 removePreference(mFormatPreference);
             }
+        } else {
+            mItemAvailable.setSummary(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,8 +266,8 @@
             }
 
             removePreference(mUsageBarPreference);
-            removePreference(mPreferences[TOTAL_SIZE]);
-            removePreference(mPreferences[AVAILABLE]);
+            removePreference(mItemTotal);
+            removePreference(mItemAvailable);
             if (mFormatPreference != null) {
                 removePreference(mFormatPreference);
             }
@@ -313,8 +276,10 @@
         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,71 +290,83 @@
             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) {
+            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();
     }
 
@@ -402,77 +379,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]) {
+        } 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..2f3fd03 100644
--- a/src/com/android/settings/deviceinfo/UsageBarPreference.java
+++ b/src/com/android/settings/deviceinfo/UsageBarPreference.java
@@ -17,6 +17,7 @@
 package com.android.settings.deviceinfo;
 
 import com.android.settings.R;
+import com.google.common.collect.Lists;
 
 import android.content.Context;
 import android.preference.Preference;
@@ -25,6 +26,8 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Creates a percentage bar chart inside a preference.
@@ -32,7 +35,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 +52,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 +62,6 @@
         super.onBindView(view);
 
         mChart = (PercentageBarChart) view.findViewById(R.id.percentage_bar_chart);
-
         mChart.setEntries(mEntries);
     }
 
diff --git a/src/com/android/settings/fuelgauge/BatterySipper.java b/src/com/android/settings/fuelgauge/BatterySipper.java
index dbd664a..f11d6ca 100644
--- a/src/com/android/settings/fuelgauge/BatterySipper.java
+++ b/src/com/android/settings/fuelgauge/BatterySipper.java
@@ -107,7 +107,6 @@
             return;
         }
         PackageManager pm = mContext.getPackageManager();
-        final Drawable defaultActivityIcon = pm.getDefaultActivityIcon();
         String[] packages = pm.getPackagesForUid(uid);
         icon = pm.getDefaultActivityIcon();
         if (packages == null) {
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..4f98163 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -34,6 +34,7 @@
 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;
@@ -62,7 +63,8 @@
         WIFI,
         BLUETOOTH,
         SCREEN,
-        APP
+        APP,
+        USER
     }
 
     // Note: Must match the sequence of the DrainType
@@ -73,7 +75,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;
@@ -225,8 +228,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 {
@@ -453,6 +456,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, 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..4a79d9d 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -20,6 +20,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.UserInfo;
+import android.graphics.drawable.Drawable;
 import android.hardware.SensorManager;
 import android.net.Uri;
 import android.os.BatteryStats;
@@ -32,6 +34,8 @@
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemClock;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
@@ -50,6 +54,7 @@
 import com.android.internal.os.PowerProfile;
 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;
@@ -79,10 +84,14 @@
     private static BatteryStatsImpl sStatsXfer;
 
     IBatteryStats mBatteryInfo;
+    UserManager mUm;
     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 final SparseArray<List<BatterySipper>> mUserSippers
+            = new SparseArray<List<BatterySipper>>();
+    private final SparseArray<Double> mUserPower = new SparseArray<Double>();
 
     private PreferenceGroup mAppListGroup;
     private Preference mBatteryStatusPref;
@@ -134,6 +143,7 @@
         addPreferencesFromResource(R.xml.power_usage_summary);
         mBatteryInfo = IBatteryStats.Stub.asInterface(
                 ServiceManager.getService("batteryinfo"));
+        mUm = (UserManager)getActivity().getSystemService(Context.USER_SERVICE);
         mAppListGroup = (PreferenceGroup) findPreference(KEY_APP_LIST);
         mBatteryStatusPref = mAppListGroup.findPreference(KEY_BATTERY_STATUS);
         mPowerProfile = new PowerProfile(getActivity());
@@ -204,6 +214,7 @@
         double[] values;
         switch (sipper.drainType) {
             case APP:
+            case USER:
             {
                 Uid uid = sipper.uidObj;
                 types = new int[] {
@@ -229,15 +240,18 @@
                     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());
+                if (sipper.drainType == DrainType.APP) {
+                    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:
@@ -373,6 +387,8 @@
         mUsageList.clear();
         mWifiSippers.clear();
         mBluetoothSippers.clear();
+        mUserSippers.clear();
+        mUserPower.clear();
         mAppListGroup.setOrderingAsAdded(false);
 
         mBatteryStatusPref.setOrder(-2);
@@ -436,6 +452,7 @@
         final int NU = uidStats.size();
         for (int iu = 0; iu < NU; iu++) {
             Uid u = uidStats.valueAt(iu);
+            double p;
             double power = 0;
             double highestDrain = 0;
             String packageWithHighestDrain = null;
@@ -445,11 +462,11 @@
             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()) {
-                    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);
@@ -470,6 +487,10 @@
                         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("*")) {
@@ -481,8 +502,6 @@
                         packageWithHighestDrain = ent.getKey();
                     }
                 }
-                if (DEBUG) Log.i(TAG, "Max drain of " + highestDrain 
-                        + " by " + packageWithHighestDrain);
             }
             if (cpuFgTime > cpuTime) {
                 if (DEBUG && cpuFgTime > cpuTime + 10000) {
@@ -491,6 +510,7 @@
                 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();
@@ -508,19 +528,32 @@
             appWakelockTime += wakelockTime;
 
             // Add cost of holding a wake lock
-            power += (wakelockTime
+            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 data traffic
             long tcpBytesReceived = u.getTcpBytesReceived(mStatsType);
             long tcpBytesSent = u.getTcpBytesSent(mStatsType);
-            power += (tcpBytesReceived+tcpBytesSent) * averageCostPerByte;
+            p = (tcpBytesReceived+tcpBytesSent) * averageCostPerByte;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("tcp power=%.2f", p));
 
             // Add cost of keeping WIFI running.
             long wifiRunningTimeMs = u.getWifiRunningTime(uSecTime, which) / 1000;
             mAppWifiRunning += wifiRunningTimeMs;
-            power += (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();
@@ -541,18 +574,20 @@
                                 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;
+                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, "UID " + u.getUid() + ": power=" + power);
+            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 || u.getUid() == 0) {
                 BatterySipper app = new BatterySipper(getActivity(), mRequestQueue, mHandler,
                         packageWithHighestDrain, DrainType.APP, 0, u,
@@ -568,6 +603,15 @@
                     mWifiSippers.add(app);
                 } else if (u.getUid() == Process.BLUETOOTH_GID) {
                     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);
                 }
@@ -575,15 +619,24 @@
                     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 (power != 0) {
+                if (u.getUid() == Process.WIFI_UID) {
+                    mWifiPower += power;
+                } else if (u.getUid() == Process.BLUETOOTH_GID) {
+                    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;
+                }
             }
-            if (DEBUG) Log.i(TAG, "Added power = " + power);
         }
 
         // The device has probably been awake for longer than the screen on
@@ -709,6 +762,33 @@
         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(mUm, info, getResources());
+                name = info != null ? info.name : null;
+                if (name == null) {
+                    name = Integer.toString(info.id);
+                }
+                name = getActivity().getResources().getString(
+                        R.string.running_process_item_user_label, name);
+            } else {
+                icon = null;
+                name = getActivity().getResources().getString(
+                        R.string.running_process_item_removed_user_label);
+            }
+            double power = mUserPower.get(userId);
+            BatterySipper bs = addEntry(name, DrainType.USER, 0, 0, power);
+            bs.icon = icon;
+            aggregateSippers(bs, sippers, "User");
+        }
+    }
+
     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
@@ -744,6 +824,7 @@
             Log.i(TAG, "Uptime since last unplugged = " + (timeSinceUnplugged / 1000));
         }
 
+        addUserUsage();
         addPhoneUsage(uSecNow);
         addScreenUsage(uSecNow);
         addWiFiUsage(uSecNow);
diff --git a/src/com/android/settings/net/UidDetailProvider.java b/src/com/android/settings/net/UidDetailProvider.java
index dd2b8c0..63672b7 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(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..032681a 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -38,6 +38,7 @@
     private ImageView mImageView;
     private NfcAdapter mNfcAdapter;
     private Switch mActionBarSwitch;
+    private CharSequence mOldActivityTitle;
 
 
     @Override
@@ -49,7 +50,6 @@
 
         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);
@@ -58,9 +58,11 @@
                 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);
-            }
+                        Gravity.CENTER_VERTICAL | Gravity.END));
+                if (!preferenceActivity.onIsMultiPane() || preferenceActivity.onIsHidingHeaders()) {
+                    mOldActivityTitle = getActivity().getTitle();
+                    activity.getActionBar().setTitle(R.string.android_beam_settings_title);
+                }
         }
 
         mActionBarSwitch.setOnCheckedChangeListener(this);
@@ -76,6 +78,14 @@
         initView(mView);
         return mView;
     }
+    @Override
+    public void onDestroyView() {
+        getActivity().getActionBar().setCustomView(null);
+        if (mOldActivityTitle != null) {
+            getActivity().getActionBar().setTitle(mOldActivityTitle);
+        }
+        super.onDestroyView();
+    }
 
     private void initView(View view) {
         mActionBarSwitch.setOnCheckedChangeListener(this);
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index 603d028..6718ab0 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -149,14 +149,6 @@
         }
     }
 
-    @Override
-    public void onPause() {
-        super.onPause();
-        if ((mDefaultRatePref != null) && (mDefaultRatePref.getDialog() != null)) {
-            mDefaultRatePref.getDialog().dismiss();
-        }
-    }
-
     private void initSettings() {
         final ContentResolver resolver = getContentResolver();
 
@@ -288,6 +280,7 @@
         }
     }
 
+    @Override
     public boolean onPreferenceChange(Preference preference, Object objValue) {
         if (KEY_DEFAULT_RATE.equals(preference.getKey())) {
             // Default rate
@@ -309,6 +302,7 @@
     /**
      * 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
@@ -335,6 +329,7 @@
         builder.setCancelable(true);
         builder.setPositiveButton(android.R.string.ok,
                 new DialogInterface.OnClickListener() {
+                    @Override
                     public void onClick(DialogInterface dialog, int which) {
                        updateDefaultEngine(key);
                     }
diff --git a/src/com/android/settings/tts/TtsEnginePreference.java b/src/com/android/settings/tts/TtsEnginePreference.java
index 196882f..3d612f0 100644
--- a/src/com/android/settings/tts/TtsEnginePreference.java
+++ b/src/com/android/settings/tts/TtsEnginePreference.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.tts;
 
-import com.android.settings.R;
-
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -31,6 +29,9 @@
 import android.widget.RadioButton;
 
 
+import com.android.settings.R;
+
+
 public class TtsEnginePreference extends Preference {
 
     /**
@@ -173,7 +174,8 @@
     }
 
     private void onRadioButtonClicked(CompoundButton buttonView, boolean isChecked) {
-        if (mPreventRadioButtonCallbacks) {
+        if (mPreventRadioButtonCallbacks ||
+                (mSharedState.getCurrentChecked() == buttonView)) {
             return;
         }
 
diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
index fcc2f2e..0c98819 100644
--- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java
+++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
@@ -16,11 +16,11 @@
 
 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.ListPreference;
 import android.preference.Preference;
@@ -31,8 +31,15 @@
 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 com.google.common.collect.Lists;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Locale;
 
 
@@ -45,11 +52,14 @@
     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;
 
@@ -63,13 +73,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();
     }
@@ -89,7 +108,8 @@
         mInstallVoicesPreference.setOnPreferenceClickListener(this);
         // Remove this preference unless voices are indeed available to install.
         root.removePreference(mInstallVoicesPreference);
-
+        // Remove this preference unless locales are indeed available.
+        root.removePreference(mLocalePreference);
 
         root.setTitle(getEngineLabel());
         root.setKey(getEngineName());
@@ -103,30 +123,60 @@
         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 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() {
-        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(
+        if (DBG) Log.d(TAG, "Parsing voice data details, data: " + mVoiceDataDetails.toUri(0));
+
+        final ArrayList<String> available = mVoiceDataDetails.getStringArrayListExtra(
                 TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES);
-        ArrayList<String> unavailable = voiceDataDetails.getStringArrayListExtra(
+        final ArrayList<String> unavailable = mVoiceDataDetails.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);
+            mLocalePreference.setEnabled(false);
+            getPreferenceScreen().removePreference(mLocalePreference);
             return;
         }
 
@@ -138,11 +188,12 @@
         }
 
         if (available.size() > 0) {
+            mLocalePreference.setEnabled(true);
+            getPreferenceScreen().addPreference(mLocalePreference);
             updateDefaultLocalePref(available);
         } else {
-            final CharSequence[] empty = new CharSequence[0];
-            mLocalePreference.setEntries(empty);
-            mLocalePreference.setEntryValues(empty);
+            mLocalePreference.setEnabled(false);
+            getPreferenceScreen().removePreference(mLocalePreference);
         }
     }
 
@@ -150,10 +201,8 @@
         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 =
+                Lists.newArrayListWithCapacity(availableLangs.size());
         for (int i = 0; i < availableLangs.size(); i++) {
             String[] langCountryVariant = availableLangs.get(i).split("-");
             Locale loc = null;
@@ -166,14 +215,32 @@
                                  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);
+            }
+        });
+
+        // Get two arrays out of one of pairs
+        int selectedLanguageIndex = -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)) {
+                selectedLanguageIndex = i;
+            }
+            entries[i] = entry.first;
+            entryValues[i++] = entry.second;
+        }
+
         mLocalePreference.setEntries(entries);
         mLocalePreference.setEntryValues(entryValues);
         if (selectedLanguageIndex > -1) {
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/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..23cca73
--- /dev/null
+++ b/src/com/android/settings/users/UserPreference.java
@@ -0,0 +1,83 @@
+/*
+ * 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.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 int mSerialNumber = -1;
+    private int mUserId = USERID_UNKNOWN;
+
+    public UserPreference(Context context, AttributeSet attrs) {
+        this(context, attrs, USERID_UNKNOWN, false, null);
+    }
+
+    UserPreference(Context context, AttributeSet attrs, int userId, boolean showDelete,
+            OnClickListener deleteListener) {
+        super(context, attrs);
+        if (showDelete) {
+            setWidgetLayoutResource(R.layout.preference_user_delete_widget);
+            mDeleteClickListener = deleteListener;
+        }
+        mUserId = userId;
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        View deleteView = view.findViewById(R.id.trash_user);
+        if (deleteView != null) {
+            deleteView.setOnClickListener(mDeleteClickListener);
+            deleteView.setTag(this);
+        }
+        super.onBindView(view);
+    }
+
+    public int getSerialNumber() {
+        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..632dfe5 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -16,49 +16,209 @@
 
 package com.android.settings.users;
 
+import android.app.ActivityManagerNative;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
 import android.content.pm.UserInfo;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
 import android.os.Bundle;
+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.PreferenceScreen;
 import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceActivity;
 import android.preference.PreferenceGroup;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.Contacts;
+import android.text.InputType;
+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 com.android.settings.R;
+import com.android.settings.SelectableEditTextPreference;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
+import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class UserSettings extends SettingsPreferenceFragment
-        implements OnPreferenceClickListener {
+        implements OnPreferenceClickListener, OnClickListener, DialogInterface.OnDismissListener,
+        Preference.OnPreferenceChangeListener {
 
+    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_NICKNAME = "user_nickname";
     private static final String KEY_USER_LIST = "user_list";
+    private static final String KEY_USER_ME = "user_me";
+
     private static final int MENU_ADD_USER = Menu.FIRST;
+    private static final int MENU_REMOVE_USER = Menu.FIRST+1;
+
+    private static final int DIALOG_CONFIRM_REMOVE = 1;
+    private static final int DIALOG_ADD_USER = 2;
+    private static final int DIALOG_SETUP_USER = 3;
+    private static final int DIALOG_USER_CANNOT_MANAGE = 4;
+
+    private static final int MESSAGE_UPDATE_LIST = 1;
+    private static final int MESSAGE_SETUP_USER = 2;
+
+    private static final String KEY_ADD_USER_LONG_MESSAGE_DISPLAYED =
+            "key_add_user_long_message_displayed";
+
+    private 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 PreferenceGroup mUserListCategory;
+    private Preference mMePreference;
+    private SelectableEditTextPreference mNicknamePreference;
+    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<Drawable> mUserIcons = new SparseArray<Drawable>();
+    private boolean mIsOwner = UserHandle.myUserId() == UserHandle.USER_OWNER;
+
+
+    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;
+            }
+        }
+    };
+
+    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 = (Preference) findPreference(KEY_USER_ME);
+        mMePreference.setOnPreferenceClickListener(this);
+        if (!mIsOwner) {
+            mMePreference.setSummary(null);
+        }
+        Preference ownerInfo = findPreference("user_owner_info");
+        if (ownerInfo != null && !mIsOwner) {
+            ownerInfo.setTitle(R.string.user_info_settings_title);
+        }
+        mNicknamePreference = (SelectableEditTextPreference) findPreference(KEY_USER_NICKNAME);
+        mNicknamePreference.setOnPreferenceChangeListener(this);
+        mNicknamePreference.getEditText().setInputType(
+                InputType.TYPE_TEXT_VARIATION_NORMAL | InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+        mNicknamePreference.setInitialSelectionMode(
+                SelectableEditTextPreference.SELECTION_SELECT_ALL);
+        loadProfile();
         setHasOptionsMenu(true);
+        IntentFilter filter = new IntentFilter(Intent.ACTION_USER_REMOVED);
+        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);
+        if (mIsOwner) {
+            if (UserManager.getMaxSupportedUsers() > mUserManager.getUsers(false).size()) {
+                MenuItem addUserItem = menu.add(0, MENU_ADD_USER, 0, R.string.user_add_user_menu);
+                addUserItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
+                        | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+            }
+        } else {
+            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
@@ -67,43 +227,375 @@
         if (itemId == MENU_ADD_USER) {
             onAddUserClicked();
             return true;
+        } else if (itemId == MENU_REMOVE_USER) {
+            onRemoveUserClicked(UserHandle.myUserId());
+            return true;
         } else {
             return super.onOptionsItemSelected(item);
         }
     }
 
+    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();
+                return profileName;
+            }
+        }.execute();
+    }
+
+    private void finishLoadProfile(String profileName) {
+        mMePreference.setTitle(profileName);
+        int myUserId = UserHandle.myUserId();
+        Bitmap b = mUserManager.getUserIcon(myUserId);
+        if (b != null) {
+            Drawable d = new BitmapDrawable(b);
+            mMePreference.setIcon(d);
+            mUserIcons.put(myUserId, d);
+        }
+    }
+
     private void onAddUserClicked() {
-        ((PreferenceActivity) getActivity()).startPreferencePanel(
-                UserDetailsSettings.class.getName(), null, R.string.user_details_title,
-                null, this, 0);
+        synchronized (mUserLock) {
+            if (mRemovingUserId == -1 && !mAddingUser) {
+                showDialog(DIALOG_ADD_USER);
+            }
+        }
+    }
+
+    private void onRemoveUserClicked(int userId) {
+        synchronized (mUserLock) {
+            if (mRemovingUserId == -1 && !mAddingUser) {
+                mRemovingUserId = userId;
+                showDialog(DIALOG_CONFIRM_REMOVE);
+            }
+        }
+    }
+
+    private void onUserCreated(int userId) {
+        mAddedUserId = userId;
+        showDialog(DIALOG_SETUP_USER);
+    }
+
+    @Override
+    public void onDialogShowing() {
+        super.onDialogShowing();
+
+        setOnDismissListener(this);
+    }
+
+    @Override
+    public Dialog onCreateDialog(int dialogId) {
+        switch (dialogId) {
+            case DIALOG_CONFIRM_REMOVE: {
+                Dialog dlg = new AlertDialog.Builder(getActivity())
+                    .setTitle(UserHandle.myUserId() == mRemovingUserId
+                            ? R.string.user_confirm_remove_self_title
+                            : R.string.user_confirm_remove_title)
+                    .setMessage(UserHandle.myUserId() == mRemovingUserId
+                            ? R.string.user_confirm_remove_self_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(getActivity())
+                    .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;
+                Dialog dlg = new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.user_add_user_title)
+                .setMessage(messageResId)
+                .setPositiveButton(android.R.string.ok,
+                    new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            addUserNow();
+                            if (!longMessageDisplayed) {
+                                preferences.edit().putBoolean(KEY_ADD_USER_LONG_MESSAGE_DISPLAYED,
+                                        true).commit();
+                            }
+                        }
+                })
+                .setNegativeButton(android.R.string.cancel, null)
+                .create();
+                return dlg;
+            }
+            case DIALOG_SETUP_USER: {
+                Dialog dlg = new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.user_setup_dialog_title)
+                .setMessage(R.string.user_setup_dialog_message)
+                .setPositiveButton(R.string.user_setup_button_setup_now,
+                    new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            switchUserNow(mAddedUserId);
+                        }
+                })
+                .setNegativeButton(R.string.user_setup_button_setup_later, null)
+                .create();
+                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() {
+        synchronized (mUserLock) {
+            mAddingUser = true;
+            updateUserList();
+            new Thread() {
+                public void run() {
+                    // Could take a few seconds
+                    UserInfo user = mUserManager.createUser(
+                            getActivity().getResources().getString(R.string.user_new_user_name), 0);
+                    if (user != null) {
+                        assignDefaultPhoto(user);
+                    }
+                    synchronized (mUserLock) {
+                        mAddingUser = false;
+                        mHandler.sendEmptyMessage(MESSAGE_UPDATE_LIST);
+                        mHandler.sendMessage(mHandler.obtainMessage(
+                                MESSAGE_SETUP_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() {
-        List<UserInfo> users = getActivity().getPackageManager().getUsers();
+        if (getActivity() == null) return;
+        List<UserInfo> users = mUserManager.getUsers(true);
 
         mUserListCategory.removeAll();
+        mUserListCategory.setOrderingAsAdded(false);
+
+        final ArrayList<Integer> missingIcons = new ArrayList<Integer>();
         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);
+            Preference pref;
+            if (user.id == UserHandle.myUserId()) {
+                pref = mMePreference;
+                mNicknamePreference.setText(user.name);
+                mNicknamePreference.setSummary(user.name);
+            } else {
+                pref = new UserPreference(getActivity(), null, user.id,
+                        UserHandle.myUserId() == UserHandle.USER_OWNER, this);
+                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(R.string.user_summary_not_set_up);
+                }
+            }
+            if (user.iconPath != null) {
+                if (mUserIcons.get(user.id) == null) {
+                    missingIcons.add(user.id);
+                    pref.setIcon(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,
+                    false, null);
+            pref.setEnabled(false);
+            pref.setTitle(R.string.user_new_user_name);
+            pref.setSummary(R.string.user_adding_new_user);
+            pref.setIcon(R.drawable.avatar_default_1);
             mUserListCategory.addPreference(pref);
         }
+        getActivity().invalidateOptionsMenu();
+
+        // Load the icons
+        if (missingIcons.size() > 0) {
+            loadIconsAsync(missingIcons);
+        }
+    }
+
+    private void loadIconsAsync(List<Integer> missingIcons) {
+        new AsyncTask<List<Integer>, Void, Void>() {
+            @Override
+            protected void onPostExecute(Void result) {
+                updateUserList();
+            }
+
+            @Override
+            protected Void doInBackground(List<Integer>... values) {
+                if (getActivity() == null) return null;
+                for (int userId : values[0]) {
+                    Bitmap bitmap = mUserManager.getUserIcon(userId);
+                    Drawable d = new BitmapDrawable(getResources(), bitmap);
+                    mUserIcons.append(userId, d);
+                }
+                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) {
+        Drawable d = mUserIcons.get(user.id); // UserUtils.getUserIcon(mUserManager, user);
+        if (d != null) {
+            pref.setIcon(d);
+        }
+    }
+
+    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);
+            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));
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean isInitialized(UserInfo user) {
+        return (user.flags & UserInfo.FLAG_INITIALIZED) != 0;
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getTag() instanceof UserPreference) {
+            int userId = ((UserPreference) v.getTag()).getUserId();
+            onRemoveUserClicked(userId);
+        }
+    }
+
+    @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..1d16bcf
--- /dev/null
+++ b/src/com/android/settings/users/UserUtils.java
@@ -0,0 +1,33 @@
+/*
+ * 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.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(UserManager um, UserInfo user, Resources res) {
+        if (user.iconPath == null) return null;
+        Bitmap icon = um.getUserIcon(user.id);
+        if (icon == null) return null;
+        return new BitmapDrawable(res, 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..9d15435 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -16,51 +16,64 @@
 
 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";
+
+    // 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 +85,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 +100,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) {
@@ -120,28 +173,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.
@@ -196,6 +238,7 @@
                 preference.update(profile);
             } else {
                 preference = new VpnPreference(getActivity(), profile);
+                preference.setOnPreferenceClickListener(this);
                 mPreferences.put(profile.key, preference);
                 getPreferenceScreen().addPreference(preference);
             }
@@ -322,136 +365,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 +388,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 +396,6 @@
             super(context);
             setPersistent(false);
             setOrder(0);
-            setOnPreferenceClickListener(VpnSettings.this);
 
             mProfile = profile;
             update();
@@ -525,4 +443,109 @@
             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());
+                    }
+
+                    // 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..f1d0e70
--- /dev/null
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -0,0 +1,405 @@
+/*
+ * 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.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.os.Bundle;
+import android.os.Handler;
+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.TypedValue;
+import android.view.Gravity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+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 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;
+
+    public WifiDisplaySettings() {
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mDisplayManager = (DisplayManager)getActivity().getSystemService(Context.DISPLAY_SERVICE);
+
+        addPreferencesFromResource(R.xml.wifi_display_settings);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        Activity activity = getActivity();
+        mActionBarSwitch = new Switch(activity);
+        if (activity instanceof PreferenceActivity) {
+            PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
+            if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
+                final int padding = activity.getResources().getDimensionPixelSize(
+                        R.dimen.action_bar_switch_padding);
+                mActionBarSwitch.setPadding(0, 0, padding, 0);
+                activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                        ActionBar.DISPLAY_SHOW_CUSTOM);
+                activity.getActionBar().setCustomView(mActionBarSwitch,
+                        new ActionBar.LayoutParams(
+                                ActionBar.LayoutParams.WRAP_CONTENT,
+                                ActionBar.LayoutParams.WRAP_CONTENT,
+                                Gravity.CENTER_VERTICAL | Gravity.END));
+            }
+        }
+
+        mActionBarSwitch.setOnCheckedChangeListener(mSwitchOnCheckedChangedListener);
+
+        mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
+        getListView().setEmptyView(mEmptyView);
+
+        update();
+
+        if (mWifiDisplayStatus.getFeatureState() == WifiDisplayStatus.FEATURE_STATE_UNAVAILABLE) {
+            activity.finish();
+        }
+    }
+
+    @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.Secure.getUriFor(
+                Settings.Global.WIFI_DISPLAY_ON), 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 {
+                mDisplayManager.connectWifiDisplay(display.getDeviceAddress());
+            }
+        }
+
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    }
+
+    private void update() {
+        mWifiDisplayOnSetting = Settings.Global.getInt(getContentResolver(),
+                Settings.Global.WIFI_DISPLAY_ON, 0) != 0;
+        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[] pairedDisplays = mWifiDisplayStatus.getRememberedDisplays();
+            final WifiDisplay[] availableDisplays = mWifiDisplayStatus.getAvailableDisplays();
+
+            if (mPairedDevicesCategory == null) {
+                mPairedDevicesCategory = new PreferenceCategory(getActivity());
+                mPairedDevicesCategory.setTitle(R.string.wifi_display_paired_devices);
+            } else {
+                mPairedDevicesCategory.removeAll();
+            }
+            preferenceScreen.addPreference(mPairedDevicesCategory);
+
+            for (WifiDisplay d : pairedDisplays) {
+                mPairedDevicesCategory.addPreference(createWifiDisplayPreference(d, true));
+            }
+            if (mPairedDevicesCategory.getPreferenceCount() == 0) {
+                preferenceScreen.removePreference(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 : availableDisplays) {
+                if (!contains(pairedDisplays, d.getDeviceAddress())) {
+                    mAvailableDevicesCategory.addPreference(createWifiDisplayPreference(d, false));
+                }
+            }
+            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 Preference createWifiDisplayPreference(final WifiDisplay d, boolean paired) {
+        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 (paired && contains(mWifiDisplayStatus.getAvailableDisplays(),
+                d.getDeviceAddress())) {
+            p.setSummary(R.string.wifi_display_status_available);
+        }
+        if (paired) {
+            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/ChartView.java b/src/com/android/settings/widget/ChartView.java
index f410d57..6441612 100644
--- a/src/com/android/settings/widget/ChartView.java
+++ b/src/com/android/settings/widget/ChartView.java
@@ -38,7 +38,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;
diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index 1d411f7..a722818 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -34,6 +34,7 @@
 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.provider.Settings;
@@ -94,16 +95,10 @@
         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();
@@ -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;
@@ -481,8 +509,10 @@
      * Subclass of StateTracker for GPS state.
      */
     private static final class GpsStateTracker extends StateTracker {
+        public int getContainerId() { return R.id.btn_gps; }
         public int getButtonId() { return R.id.img_gps; }
         public int getIndicatorId() { return R.id.ind_gps; }
+        public int getButtonDescription() { return R.string.gadget_gps; }
         public int getButtonImageId(boolean on) {
             return on ? R.drawable.ic_appwidget_settings_gps_on_holo
                     : R.drawable.ic_appwidget_settings_gps_off_holo;
@@ -531,8 +561,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 +637,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;
@@ -678,25 +698,42 @@
         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 {
@@ -775,13 +812,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 +828,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 +847,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 +863,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 +885,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..f6581a5 100644
--- a/src/com/android/settings/wifi/AccessPoint.java
+++ b/src/com/android/settings/wifi/AccessPoint.java
@@ -224,17 +224,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 +246,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) {
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index bb50d2a..809496a 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -19,13 +19,14 @@
 import android.content.Context;
 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.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
@@ -44,6 +45,7 @@
     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_SUSPEND_OPTIMIZATIONS = "suspend_optimizations";
 
     private WifiManager mWifiManager;
 
@@ -69,8 +71,8 @@
     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 +81,18 @@
             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 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()) {
@@ -107,9 +116,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);
@@ -141,12 +150,16 @@
         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 {
             return super.onPreferenceTreeClick(screen, preference);
@@ -171,7 +184,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/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index 987294b..641a7ab 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -104,7 +104,7 @@
             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);
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index de42f2a..aedb79e 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -20,6 +20,8 @@
 
 import android.app.ActionBar;
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
 import android.app.Dialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -45,6 +47,7 @@
 import android.preference.PreferenceScreen;
 import android.security.Credentials;
 import android.security.KeyStore;
+import android.telephony.TelephonyManager;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.ContextMenu;
@@ -58,6 +61,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;
@@ -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;
@@ -114,7 +120,6 @@
     private final Scanner mScanner;
 
     private WifiManager mWifiManager;
-    private WifiManager.Channel mChannel;
     private WifiManager.ActionListener mConnectListener;
     private WifiManager.ActionListener mSaveListener;
     private WifiManager.ActionListener mForgetListener;
@@ -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";
 
@@ -229,6 +240,32 @@
                     }
                 });
             }
+
+            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) {
+                        if (isPhone() && !hasSimProblem()) {
+                            showDialog(WIFI_SKIPPED_DIALOG_ID);
+                        } else {
+                            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,21 +274,21 @@
 
     @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() {
                                    public void onSuccess() {
                                    }
                                    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();
+                                       }
                                    }
                                };
 
@@ -259,9 +296,12 @@
                                 public void onSuccess() {
                                 }
                                 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();
+                                    }
                                 }
                             };
 
@@ -269,9 +309,12 @@
                                    public void onSuccess() {
                                    }
                                    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 +337,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 +353,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);
@@ -344,7 +388,7 @@
                     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 +402,6 @@
             registerForContextMenu(getListView());
         }
         setHasOptionsMenu(true);
-
-        // After confirming PreferenceScreen is available, we call super.
-        super.onActivityCreated(savedInstanceState);
     }
 
     @Override
@@ -373,7 +414,7 @@
         getActivity().registerReceiver(mReceiver, mFilter);
         if (mKeyStoreNetworkId != INVALID_NETWORK_ID &&
                 KeyStore.getInstance().state() == KeyStore.State.UNLOCKED) {
-            mWifiManager.connect(mChannel, mKeyStoreNetworkId, mConnectListener);
+            mWifiManager.connect(mKeyStoreNetworkId, mConnectListener);
         }
         mKeyStoreNetworkId = INVALID_NETWORK_ID;
 
@@ -520,13 +561,13 @@
             case MENU_ID_CONNECT: {
                 if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
                     if (!requireKeyStore(mSelectedAccessPoint.getConfig())) {
-                        mWifiManager.connect(mChannel, mSelectedAccessPoint.networkId,
+                        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 +575,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 +594,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);
             }
@@ -596,10 +637,69 @@
                 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(Activity.RESULT_CANCELED);
+                                    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(Activity.RESULT_CANCELED);
+                                    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 isPhone() {
+        final TelephonyManager telephonyManager = (TelephonyManager)this.getSystemService(
+                Context.TELEPHONY_SERVICE);
+        return telephonyManager != null
+                && telephonyManager.getPhoneType() != TelephonyManager.PHONE_TYPE_NONE;
+    }
+
+    /**
+    * Return true if there's any SIM related impediment to connectivity.
+    * Treats Unknown as OK. (Only returns true if we're sure of a SIM problem.)
+    */
+   protected boolean hasSimProblem() {
+       final TelephonyManager telephonyManager = (TelephonyManager)this.getSystemService(
+               Context.TELEPHONY_SERVICE);
+       return telephonyManager != null
+               && telephonyManager.getCurrentPhoneType() == TelephonyManager.PHONE_TYPE_GSM
+               && telephonyManager.getSimState() != TelephonyManager.SIM_STATE_READY
+               && telephonyManager.getSimState() != TelephonyManager.SIM_STATE_UNKNOWN;
+   }
+
     private boolean requireKeyStore(WifiConfiguration config) {
         if (WifiConfigController.requireKeyStore(config) &&
                 KeyStore.getInstance().state() != KeyStore.State.UNLOCKED) {
@@ -744,7 +844,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 +885,10 @@
     }
 
     private void updateWifiState(int state) {
-        getActivity().invalidateOptionsMenu();
+        Activity activity = getActivity();
+        if (activity != null) {
+            activity.invalidateOptionsMenu();
+        }
 
         switch (state) {
             case WifiManager.WIFI_STATE_ENABLED:
@@ -827,8 +934,11 @@
                 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);
@@ -863,18 +973,18 @@
             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);
+                mWifiManager.save(config, mSaveListener);
             } else {
-                mWifiManager.connect(mChannel, config, mConnectListener);
+                mWifiManager.connect(config, mConnectListener);
             }
         }
 
@@ -891,7 +1001,7 @@
             return;
         }
 
-        mWifiManager.forget(mChannel, mSelectedAccessPoint.networkId, mForgetListener);
+        mWifiManager.forget(mSelectedAccessPoint.networkId, mForgetListener);
 
         if (mWifiManager.isWifiEnabled()) {
             mScanner.resume();
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/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/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 1bb253a..2496d8e 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -444,8 +444,7 @@
             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();
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>